From 8f91f4520f8fb3ad0876899c3d8d1c06eb1fe676 Mon Sep 17 00:00:00 2001 From: Ortiga Date: Thu, 9 Apr 2026 12:45:02 -0300 Subject: [PATCH] uncensor port on IPMI logs --- .../driver/ipmitool/IpmitoolOutOfBandManagementDriver.java | 2 +- .../driver/ipmitool/IpmitoolWrapper.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java b/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java index 6c5288634846..eefc355784f8 100644 --- a/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java +++ b/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolOutOfBandManagementDriver.java @@ -120,7 +120,7 @@ private OutOfBandManagementDriverResponse execute(final OutOfBandManagementDrive final OutOfBandManagementDriverResponse response = IPMITOOL.executeCommands(ipmiToolCommands, cmd.getTimeout()); - String oneLineCommand = StringUtils.join(IPMITOOL.getSanatisedCommandStrings(ipmiToolCommands), " "); + String oneLineCommand = StringUtils.join(IPMITOOL.getSanitisedCommandStrings(ipmiToolCommands), " "); String result = response.getResult().trim(); if (response.isSuccess()) { diff --git a/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java b/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java index b0ded5350a33..568848d14992 100644 --- a/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java +++ b/plugins/outofbandmanagement-drivers/ipmitool/src/main/java/org/apache/cloudstack/outofbandmanagement/driver/ipmitool/IpmitoolWrapper.java @@ -158,7 +158,7 @@ public OutOfBandManagementDriverResponse executeCommands(final List comm public OutOfBandManagementDriverResponse executeCommands(final List commands, final Duration timeOut) { final ProcessResult result = RUNNER.executeCommands(commands, timeOut); if (logger.isTraceEnabled()) { - List cleanedCommands = getSanatisedCommandStrings(commands); + List cleanedCommands = getSanitisedCommandStrings(commands); logger.trace("Executed ipmitool process with commands: {}\nIpmitool execution standard output: {}\nIpmitool execution error output: {}", StringUtils.join(cleanedCommands, ", "), result.getStdOutput(), @@ -167,7 +167,7 @@ public OutOfBandManagementDriverResponse executeCommands(final List comm return new OutOfBandManagementDriverResponse(result.getStdOutput(), result.getStdError(), result.isSuccess()); } - List getSanatisedCommandStrings(List commands) { + List getSanitisedCommandStrings(List commands) { List cleanedCommands = new ArrayList<>(); int maskNextCommand = 0; for (String command : commands) { @@ -176,7 +176,7 @@ List getSanatisedCommandStrings(List commands) { maskNextCommand--; continue; } - if (command.equalsIgnoreCase("-P")) { + if (command.equals("-P")) { maskNextCommand = 1; } else if (command.toLowerCase().endsWith("password")) { maskNextCommand = 2;