proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-05 02:27:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #2787: properly parse 'vga' for vncproxy

Browse Source 
'vga' is a property string, we can't just assume it starts with the
default key's value.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2020-06-17 10:41:16 +02:00 committed by Thomas Lamprecht
parent 121e340094
commit d3efae29f5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/API2/Qemu.pm
View File

@ -1634,7 +1634,12 @@ __PACKAGE__->register_method({
my $websocket = $param->{websocket}; my $websocket = $param->{websocket};
my $conf = PVE::QemuConfig->load_config($vmid, $node); # check if VM exists my $conf = PVE::QemuConfig->load_config($vmid, $node); # check if VM exists
my $use_serial = ($conf->{vga} && ($conf->{vga} =~ m/^serial\d+$/));
my $serial;
if ($conf->{vga}) {
my $vga = PVE::QemuServer::parse_vga($conf->{vga});
$serial = $vga->{type} if $vga->{type} =~ m/^serial\d+$/;
}
my $authpath = "/vms/$vmid"; my $authpath = "/vms/$vmid";
@ -1650,7 +1655,7 @@ __PACKAGE__->register_method({
(undef, $family) = PVE::Cluster::remote_node_ip($node); (undef, $family) = PVE::Cluster::remote_node_ip($node);
my $sshinfo = PVE::SSHInfo::get_ssh_info($node); my $sshinfo = PVE::SSHInfo::get_ssh_info($node);
# NOTE: kvm VNC traffic is already TLS encrypted or is known unsecure # NOTE: kvm VNC traffic is already TLS encrypted or is known unsecure
$remcmd = PVE::SSHInfo::ssh_info_to_command($sshinfo, $use_serial ? '-t' : '-T'); $remcmd = PVE::SSHInfo::ssh_info_to_command($sshinfo, defined($serial) ? '-t' : '-T');
} else { } else {
$family = PVE::Tools::get_host_address_family($node); $family = PVE::Tools::get_host_address_family($node);
} }
@ -1666,9 +1671,9 @@ __PACKAGE__->register_method({
my $cmd; my $cmd;
if ($use_serial) { if (defined($serial)) {
my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-iface', $conf->{vga}, '-escape', '0' ]; my $termcmd = [ '/usr/sbin/qm', 'terminal', $vmid, '-iface', $serial, '-escape', '0' ];
$cmd = ['/usr/bin/vncterm', '-rfbport', $port, $cmd = ['/usr/bin/vncterm', '-rfbport', $port,
'-timeout', $timeout, '-authpath', $authpath, '-timeout', $timeout, '-authpath', $authpath,