From 3ec3cd5e736823fb882bc89db940c537c938a286 Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Thu, 20 Feb 2025 10:59:59 +0530 Subject: [PATCH 1/2] VMware import - logs sanitation --- .../wrapper/LibvirtConvertInstanceCommandWrapper.java | 1 - utils/src/main/java/com/cloud/utils/script/Script.java | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java index 504edb9d8882..9442907f3564 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java @@ -57,7 +57,6 @@ public Answer execute(ConvertInstanceCommand cmd, LibvirtComputingResource serve RemoteInstanceTO sourceInstance = cmd.getSourceInstance(); Hypervisor.HypervisorType sourceHypervisorType = sourceInstance.getHypervisorType(); String sourceInstanceName = sourceInstance.getInstanceName(); - String sourceInstancePath = sourceInstance.getInstancePath(); Hypervisor.HypervisorType destinationHypervisorType = cmd.getDestinationHypervisorType(); DataStoreTO conversionTemporaryLocation = cmd.getConversionTemporaryLocation(); long timeout = (long) cmd.getWait() * 1000; diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java index 6cd622582be5..f6b5388c80d9 100644 --- a/utils/src/main/java/com/cloud/utils/script/Script.java +++ b/utils/src/main/java/com/cloud/utils/script/Script.java @@ -155,6 +155,15 @@ protected String buildCommandLine(String[] command) { boolean obscureParam = false; for (int i = 0; i < command.length; i++) { String cmd = command[i]; + if (cmd.startsWith("vi://")) { + String[] tokens = cmd.split("@"); + if (tokens.length >= 2) { + builder.append("vi://").append("******@").append(tokens[1]).append(" "); + } else { + builder.append("vi://").append("******").append(" "); + } + continue; + } if (obscureParam) { builder.append("******").append(" "); obscureParam = false; From 51af846632aee95d68b27a7f3cf3845d5930821b Mon Sep 17 00:00:00 2001 From: Suresh Kumar Anaparti Date: Thu, 20 Feb 2025 12:51:36 +0530 Subject: [PATCH 2/2] fix for tests --- .../java/com/cloud/utils/script/Script.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/utils/src/main/java/com/cloud/utils/script/Script.java b/utils/src/main/java/com/cloud/utils/script/Script.java index f6b5388c80d9..79c9511b0238 100644 --- a/utils/src/main/java/com/cloud/utils/script/Script.java +++ b/utils/src/main/java/com/cloud/utils/script/Script.java @@ -48,6 +48,7 @@ import com.cloud.utils.Pair; import com.cloud.utils.PropertiesUtil; +import com.cloud.utils.StringUtils; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.script.OutputInterpreter.TimedOutLogger; @@ -155,7 +156,7 @@ protected String buildCommandLine(String[] command) { boolean obscureParam = false; for (int i = 0; i < command.length; i++) { String cmd = command[i]; - if (cmd.startsWith("vi://")) { + if (StringUtils.isNotEmpty(cmd) && cmd.startsWith("vi://")) { String[] tokens = cmd.split("@"); if (tokens.length >= 2) { builder.append("vi://").append("******@").append(tokens[1]).append(" "); @@ -164,25 +165,6 @@ protected String buildCommandLine(String[] command) { } continue; } - if (obscureParam) { - builder.append("******").append(" "); - obscureParam = false; - } else { - builder.append(command[i]).append(" "); - } - - if ("-y".equals(cmd) || "-z".equals(cmd)) { - obscureParam = true; - _passwordCommand = true; - } - } - return builder.toString(); - } - - protected String buildCommandLine(List command) { - StringBuilder builder = new StringBuilder(); - boolean obscureParam = false; - for (String cmd : command) { if (obscureParam) { builder.append("******").append(" "); obscureParam = false;