apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

VMware import - logs sanitation (#10433)

Browse Source
This commit is contained in:
Suresh Kumar Anaparti 2025-05-16 12:51:19 +05:30 committed by GitHub
parent 005afde24e
commit f199783c75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
View File

@ -57,7 +57,6 @@ public class LibvirtConvertInstanceCommandWrapper extends CommandWrapper<Convert
RemoteInstanceTO sourceInstance = cmd.getSourceInstance(); RemoteInstanceTO sourceInstance = cmd.getSourceInstance();
Hypervisor.HypervisorType sourceHypervisorType = sourceInstance.getHypervisorType(); Hypervisor.HypervisorType sourceHypervisorType = sourceInstance.getHypervisorType();
String sourceInstanceName = sourceInstance.getInstanceName(); String sourceInstanceName = sourceInstance.getInstanceName();
String sourceInstancePath = sourceInstance.getInstancePath();
Hypervisor.HypervisorType destinationHypervisorType = cmd.getDestinationHypervisorType(); Hypervisor.HypervisorType destinationHypervisorType = cmd.getDestinationHypervisorType();
DataStoreTO conversionTemporaryLocation = cmd.getConversionTemporaryLocation(); DataStoreTO conversionTemporaryLocation = cmd.getConversionTemporaryLocation();
long timeout = (long) cmd.getWait() * 1000; long timeout = (long) cmd.getWait() * 1000;

23
utils/src/main/java/com/cloud/utils/script/Script.java
View File

@ -48,6 +48,7 @@ import org.joda.time.Duration;
import com.cloud.utils.Pair; import com.cloud.utils.Pair;
import com.cloud.utils.PropertiesUtil; import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.StringUtils;
import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.concurrency.NamedThreadFactory;
import com.cloud.utils.script.OutputInterpreter.TimedOutLogger; import com.cloud.utils.script.OutputInterpreter.TimedOutLogger;
@ -155,25 +156,15 @@ public class Script implements Callable<String> {
boolean obscureParam = false; boolean obscureParam = false;
for (int i = 0; i < command.length; i++) { for (int i = 0; i < command.length; i++) {
String cmd = command[i]; String cmd = command[i];
if (obscureParam) { if (StringUtils.isNotEmpty(cmd) && cmd.startsWith("vi://")) {
builder.append("******").append(" "); String[] tokens = cmd.split("@");
obscureParam = false; if (tokens.length >= 2) {
builder.append("vi://").append("******@").append(tokens[1]).append(" ");
} else { } else {
builder.append(command[i]).append(" "); builder.append("vi://").append("******").append(" ");
} }
continue;
if ("-y".equals(cmd) || "-z".equals(cmd)) {
obscureParam = true;
_passwordCommand = true;
} }
}
return builder.toString();
}
protected String buildCommandLine(List<String> command) {
StringBuilder builder = new StringBuilder();
boolean obscureParam = false;
for (String cmd : command) {
if (obscureParam) { if (obscureParam) {
builder.append("******").append(" "); builder.append("******").append(" ");
obscureParam = false; obscureParam = false;