External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemu: vnc: switch to tls-creds-x509

Browse Source 
The tls, x509 and x509verify options were deprecated in QEMU v2.5.0:

commit 3e305e4a4752f70c0b5c3cf5b43ec957881714f7
Author:     Daniel P. Berrange <berrange@redhat.com>

    ui: convert VNC server to use QCryptoTLSSession

Use the tls-creds-x509 object when available.

https://bugzilla.redhat.com/show_bug.cgi?id=1598167

Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-07-17 15:10:23 +02:00
parent 11b5396cea
commit 17f50c8260
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_command.c
View File

@ -7917,13 +7917,27 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
virBufferAddLit(&opt, ",password"); virBufferAddLit(&opt, ",password");
if (cfg->vncTLS) { if (cfg->vncTLS) {
virBufferAddLit(&opt, ",tls"); if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_TLS_CREDS_X509)) {
if (cfg->vncTLSx509verify) { const char *alias = "vnc-tls-creds0";
virBufferAddLit(&opt, ",x509verify="); if (qemuBuildTLSx509CommandLine(cmd,
virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir); cfg->vncTLSx509certdir,
true,
cfg->vncTLSx509verify,
NULL,
alias,
qemuCaps) < 0)
goto error;
virBufferAsprintf(&opt, ",tls-creds=%s", alias);
} else { } else {
virBufferAddLit(&opt, ",x509="); virBufferAddLit(&opt, ",tls");
virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir); if (cfg->vncTLSx509verify) {
virBufferAddLit(&opt, ",x509verify=");
virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
} else {
virBufferAddLit(&opt, ",x509=");
virQEMUBuildBufferEscapeComma(&opt, cfg->vncTLSx509certdir);
}
} }
} }

4
tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
View File

@ -24,7 +24,9 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-no-acpi \ -no-acpi \
-boot strict=on \ -boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \ -object tls-creds-x509,id=vnc-tls-creds0,dir=/etc/pki/libvirt-vnc,\
endpoint=server,verify-peer=yes \
-vnc 127.0.0.1:3,tls-creds=vnc-tls-creds0,sasl \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \ -device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \ resourcecontrol=deny \