Skip to content

kvm: truncate vnc password to 8 chars#6244

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
yadvr merged 3 commits into from
Apr 15, 2022
Merged

kvm: truncate vnc password to 8 chars #6244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4e7348f
kvm: truncate vnc password to 8 chars
weizhouapache Apr 11, 2022
0c21b71
Merge remote-tracking branch 'apache/main' into 4.16-kvm-truncate-vnc…
weizhouapache Apr 12, 2022
020b614
Update #6244: fix unit tests
weizhouapache Apr 12, 2022
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
2 changes: 1 addition & 1 deletion plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1764,7 +1764,7 @@ public String toString() {
graphicBuilder.append(" listen=''");
}
if (_passwd != null) {
graphicBuilder.append(" passwd='" + _passwd + "'");
graphicBuilder.append(" passwd='" + StringUtils.truncate(_passwd, 8) + "'");

@yadvryadvrApr 12, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is that @weizhouapache ? Does this fix/address any libvirt limitation or user reported issue?

@weizhouapacheweizhouapacheApr 12, 2022

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rohityadavcloud
this aims to fix an issue with ubuntu 22.04 (to be released soon) and libvirt 8.
the issue is raised in mailing list: https://lists.apache.org/thread/zk4fyggjqk1zphk4dfg1m596yrd15d9b

from many years ago, libvirt accepts vnc password with more than 8 chars. but only the first 8 chars in vnc password are used in vnc console verification (the other chars are dropped).
In recent libvirt, only vnc password with 8 chars is permitted.

@yadvryadvrApr 12, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

} else if (_keyMap != null) {
graphicBuilder.append(" _keymap='" + _keyMap + "'");
}
Expand Down
3 changes: 2 additions & 1 deletion ...ors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
Expand DownExpand Up@@ -774,7 +775,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) {
Expand Down