From 99c69a4feff736d4f8441d99f31f80dce7715c39 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 15 Apr 2022 16:56:42 +0200 Subject: [PATCH 1/2] kvm: truncate vnc password to 8 chars (#6244) This PR truncates the vnc password of kvm vms to 8 chars to support latest versions of libvirt. --- .../java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- .../hypervisor/kvm/resource/LibvirtComputingResourceTest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index d8b1d4e289ac..34af1e2fa767 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -1764,7 +1764,7 @@ public String toString() { graphicBuilder.append(" listen=''"); } if (_passwd != null) { - graphicBuilder.append(" passwd='" + _passwd + "'"); + graphicBuilder.append(" passwd='" + StringUtils.truncate(_passwd, 8) + "'"); } else if (_keyMap != null) { graphicBuilder.append(" _keymap='" + _keyMap + "'"); } diff --git a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java index 4106cc05799b..3632cf299d3c 100644 --- a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java +++ b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java @@ -60,6 +60,7 @@ import org.apache.cloudstack.utils.linux.MemStat; import org.apache.cloudstack.utils.qemu.QemuImg.PhysicalDiskFormat; import org.apache.commons.lang.SystemUtils; +import org.apache.commons.lang3.StringUtils; import org.joda.time.Duration; import org.junit.Assert; import org.junit.Before; @@ -773,7 +774,7 @@ private void verifyGraphicsDevices(VirtualMachineTO to, Document domainDoc, Stri assertXpath(domainDoc, prefix + "/graphics/@type", "vnc"); assertXpath(domainDoc, prefix + "/graphics/@listen", to.getVncAddr()); assertXpath(domainDoc, prefix + "/graphics/@autoport", "yes"); - assertXpath(domainDoc, prefix + "/graphics/@passwd", to.getVncPassword()); + assertXpath(domainDoc, prefix + "/graphics/@passwd", StringUtils.truncate(to.getVncPassword(), 8)); } private void verifySerialDevices(Document domainDoc, String prefix) { From 5e1d8329a6fd399477f521537f7fd28c93508cdb Mon Sep 17 00:00:00 2001 From: nvazquez Date: Fri, 20 May 2022 09:21:08 -0300 Subject: [PATCH 2/2] Use lang3 string utils --- .../java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java index 34af1e2fa767..7c65f7970adc 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java @@ -23,7 +23,7 @@ import java.util.Map; import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; public class LibvirtVMDef {