Skip to content

fix: percent-encode vCenter datacenter/cluster/host names in virt-v2v URIs #13932

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

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
+28 −7
Open

fix: percent-encode vCenter datacenter/cluster/host names in virt-v2v URIs #13932

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 28 additions & 7 deletions .../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 @@ -19,7 +19,7 @@
package com.cloud.hypervisor.kvm.resource.wrapper;

import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.attribute.PosixFilePermission;
Expand Down Expand Up @@ -214,10 +214,10 @@ private String getExportOVAUrlFromRemoteInstance(RemoteInstanceTO vmwareInstance
if (StringUtils.isNotBlank(path)) {
logger.info("({}) VM path: {}", originalVMName, path);
return String.format("vi://%s:%s@%s/%s/%s/%s",
encodedUsername, encodedPassword, vcenter, datacenter, path, vm);
encodedUsername, encodedPassword, vcenter, encodePathSegments(datacenter), encodePathSegments(path), encodePathSegment(vm));
}
return String.format("vi://%s:%s@%s/%s/vm/%s",
encodedUsername, encodedPassword, vcenter, datacenter, vm);
encodedUsername, encodedPassword, vcenter, encodePathSegments(datacenter), encodePathSegment(vm));
}

protected void sanitizeDisksPath(List<LibvirtVMDef.DiskDef> disks) {
Expand Down Expand Up @@ -296,7 +296,28 @@ protected void addExtraParamsToScript(String extraParams, Script script) {
}

protected String encodeUsername(String username) {
return URLEncoder.encode(username, Charset.defaultCharset());
return URLEncoder.encode(username, StandardCharsets.UTF_8).replace("+", "%20");
}

private String encodePathSegment(String value) {
if (StringUtils.isBlank(value)) {
return value;
}
return URLEncoder.encode(value, StandardCharsets.UTF_8).replace("+", "%20");
}

private String encodePathSegments(String value) {
if (StringUtils.isBlank(value)) {
return value;
}
StringBuilder encoded = new StringBuilder();
for (String seg : value.split("/", -1)) {
if (encoded.length() > 0) {
encoded.append("/");
}
encoded.append(encodePathSegment(seg));
}
return encoded.toString();
}

private String resolveVddkSetting(String commandValue, String agentValue) {
Expand Down Expand Up @@ -477,14 +498,14 @@ private String buildVpxUrl(RemoteInstanceTO vmwareInstance) {
.append("@")
.append(vcenter)
.append("/")
.append(datacenter);
.append(encodePathSegments(datacenter));

if (StringUtils.isNotBlank(cluster)) {
url.append("/").append(cluster);
url.append("/").append(encodePathSegments(cluster));
}

if (StringUtils.isNotBlank(host)) {
url.append("/").append(host);
url.append("/").append(encodePathSegment(host));
}

url.append("?no_verify=1");
Expand Down