Skip to content

VMware import - logs sanitation #10433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into from
May 16, 2025
Merged

VMware import - logs sanitation #10433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ec3cd5
VMware import - logs sanitation
sureshanaparti Feb 20, 2025
51af846
fix for tests
sureshanaparti Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .../java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtConvertInstanceCommandWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
27 changes: 9 additions & 18 deletions utils/src/main/java/com/cloud/utils/script/Script.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -155,25 +156,15 @@
boolean obscureParam = false;
for (int i = 0; i < command.length; i++) {
String cmd = command[i];
if (obscureParam) {
builder.append("******").append(" ");
obscureParam = false;
} else {
builder.append(command[i]).append(" ");
}

if ("-y".equals(cmd) || "-z".equals(cmd)) {
obscureParam = true;
_passwordCommand = true;
if (StringUtils.isNotEmpty(cmd) && cmd.startsWith("vi://")) {
String[] tokens = cmd.split("@");

Check warning on line 160 in utils/src/main/java/com/cloud/utils/script/Script.java

View check run for this annotation

Codecov / codecov/patch

utils/src/main/java/com/cloud/utils/script/Script.java#L160 

Added line #L160 was not covered by tests
if (tokens.length >= 2) {
builder.append("vi://").append("******@").append(tokens[1]).append(" ");

Check warning on line 162 in utils/src/main/java/com/cloud/utils/script/Script.java

View check run for this annotation

Codecov / codecov/patch

utils/src/main/java/com/cloud/utils/script/Script.java#L162 

Added line #L162 was not covered by tests
} else {
builder.append("vi://").append("******").append(" ");

Check warning on line 164 in utils/src/main/java/com/cloud/utils/script/Script.java

View check run for this annotation

Codecov / codecov/patch

utils/src/main/java/com/cloud/utils/script/Script.java#L164 

Added line #L164 was not covered by tests
}
continue;

Check warning on line 166 in utils/src/main/java/com/cloud/utils/script/Script.java

View check run for this annotation

Codecov / codecov/patch

utils/src/main/java/com/cloud/utils/script/Script.java#L166 

Added line #L166 was not covered by tests
}
}
return builder.toString();
}

protected String buildCommandLine(List<String> command) {
StringBuilder builder = new StringBuilder();
boolean obscureParam = false;
for (String cmd : command) {
if (obscureParam) {
builder.append("******").append(" ");
obscureParam = false;
Expand Down
Loading