Skip to content

Commit 8f91f45

Browse files
author
Ortiga
committed
uncensor port on IPMI logs
1 parent c361409 commit 8f91f45

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ private OutOfBandManagementDriverResponse execute(final OutOfBandManagementDrive
120120

121121
final OutOfBandManagementDriverResponse response = IPMITOOL.executeCommands(ipmiToolCommands, cmd.getTimeout());
122122

123-
String oneLineCommand = StringUtils.join(IPMITOOL.getSanatisedCommandStrings(ipmiToolCommands), " ");
123+
String oneLineCommand = StringUtils.join(IPMITOOL.getSanitisedCommandStrings(ipmiToolCommands), " ");
124124
String result = response.getResult().trim();
125125

126126
if (response.isSuccess()) {

plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public OutOfBandManagementDriverResponse executeCommands(final List<String> comm
158158
public OutOfBandManagementDriverResponse executeCommands(final List<String> commands, final Duration timeOut) {
159159
final ProcessResult result = RUNNER.executeCommands(commands, timeOut);
160160
if (logger.isTraceEnabled()) {
161-
List<String> cleanedCommands = getSanatisedCommandStrings(commands);
161+
List<String> cleanedCommands = getSanitisedCommandStrings(commands);
162162
logger.trace("Executed ipmitool process with commands: {}\nIpmitool execution standard output: {}\nIpmitool execution error output: {}",
163163
StringUtils.join(cleanedCommands, ", "),
164164
result.getStdOutput(),
@@ -167,7 +167,7 @@ public OutOfBandManagementDriverResponse executeCommands(final List<String> comm
167167
return new OutOfBandManagementDriverResponse(result.getStdOutput(), result.getStdError(), result.isSuccess());
168168
}
169169

170-
List<String> getSanatisedCommandStrings(List<String> commands) {
170+
List<String> getSanitisedCommandStrings(List<String> commands) {
171171
List<String> cleanedCommands = new ArrayList<>();
172172
int maskNextCommand = 0;
173173
for (String command : commands) {
@@ -176,7 +176,7 @@ List<String> getSanatisedCommandStrings(List<String> commands) {
176176
maskNextCommand--;
177177
continue;
178178
}
179-
if (command.equalsIgnoreCase("-P")) {
179+
if (command.equals("-P")) {
180180
maskNextCommand = 1;
181181
} else if (command.toLowerCase().endsWith("password")) {
182182
maskNextCommand = 2;

0 commit comments

Comments
 (0)