proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-14 13:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

code cleanup

Browse Source 
Use new helper methods.
This commit is contained in:
Dietmar Maurer 2013-12-10 10:46:50 +01:00
parent cd339d1fe9
commit dd25eecf62
3 changed files with 10 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
PVE/API2/Qemu.pm
View File

@ -1360,24 +1360,10 @@ __PACKAGE__->register_method({
properties => { properties => {
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
vmid => get_standard_option('pve-vmid'), vmid => get_standard_option('pve-vmid'),
proxy => { proxy => get_standard_option('spice-proxy', { optional => 1 }),
description => "This can be used by the client to specify the proxy server. All nodes in a cluster runs 'spiceproxy', so it is up to the client to choose one. By default, we return the node where the VM is currently running. As resonable setting is to use same node you use to connect to the API (This is window.location.hostname for the JS GUI).",
type => 'string', format => 'dns-name',
optional => 1,
},
},
},
returns => {
description => "Returned values can be directly passed to the 'remote-viewer' application.",
additionalProperties => 1,
properties => {
type => { type => 'string' },
password => { type => 'string' },
proxy => { type => 'string' },
host => { type => 'string' },
'tls-port' => { type => 'integer' },
}, },
}, },
returns => get_standard_option('remote-viewer-config'),
code => sub { code => sub {
my ($param) = @_; my ($param) = @_;
@ -1389,37 +1375,17 @@ __PACKAGE__->register_method({
my $node = $param->{node}; my $node = $param->{node};
my $proxy = $param->{proxy}; my $proxy = $param->{proxy};
my ($ticket, $proxyticket) = PVE::AccessControl::assemble_spice_ticket($authuser, $vmid, $node); my $title = "VM $vmid";
my $timeout = 10;
my $port = PVE::QemuServer::spice_port($vmid); my $port = PVE::QemuServer::spice_port($vmid);
my ($ticket, undef, $remote_viewer_config) =
PVE::AccessControl::remote_viewer_config($authuser, $vmid, $node, $proxy, $title, $port);
PVE::QemuServer::vm_mon_cmd($vmid, "set_password", protocol => 'spice', password => $ticket); PVE::QemuServer::vm_mon_cmd($vmid, "set_password", protocol => 'spice', password => $ticket);
PVE::QemuServer::vm_mon_cmd($vmid, "expire_password", protocol => 'spice', time => "+30"); PVE::QemuServer::vm_mon_cmd($vmid, "expire_password", protocol => 'spice', time => "+30");
if (!$proxy) { return $remote_viewer_config;
my $host = `hostname -f` || PVE::INotify::nodename();
chomp $host;
$proxy = $host;
}
my $filename = "/etc/pve/local/pve-ssl.pem";
my $subject = PVE::QemuServer::read_x509_subject_spice($filename);
my $cacert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192);
$cacert =~ s/\n/\\n/g;
return {
type => 'spice',
title => "VM $vmid",
host => $proxyticket, # this break tls hostname verification, so we need to use 'host-subject'
proxy => "http://$proxy:3128",
'tls-port' => $port,
'host-subject' => $subject,
ca => $cacert,
password => $ticket,
'delete-this-file' => 1,
};
}}); }});
__PACKAGE__->register_method({ __PACKAGE__->register_method({

2
PVE/QemuMigrate.pm
View File

@ -406,7 +406,7 @@ sub phase2 {
my (undef, $proxyticket) = PVE::AccessControl::assemble_spice_ticket($authuser, $vmid, $self->{node}); my (undef, $proxyticket) = PVE::AccessControl::assemble_spice_ticket($authuser, $vmid, $self->{node});
my $filename = "/etc/pve/nodes/$self->{node}/pve-ssl.pem"; my $filename = "/etc/pve/nodes/$self->{node}/pve-ssl.pem";
my $subject = PVE::QemuServer::read_x509_subject_spice($filename); my $subject = PVE::AccessControl::read_x509_subject_spice($filename);
$self->log('info', "spice client_migrate_info"); $self->log('info', "spice client_migrate_info");

17
PVE/QemuServer.pm
View File

@ -4919,21 +4919,4 @@ sub get_current_qemu_machine {
return $current || $default || 'pc'; return $current || $default || 'pc';
} }
sub read_x509_subject_spice {
my ($filename) = @_;
# read x509 subject
my $bio = Net::SSLeay::BIO_new_file($filename, 'r');
my $x509 = Net::SSLeay::PEM_read_bio_X509($bio);
Net::SSLeay::BIO_free($bio);
my $nameobj = Net::SSLeay::X509_get_subject_name($x509);
my $subject = Net::SSLeay::X509_NAME_oneline($nameobj);
Net::SSLeay::X509_free($x509);
# remote-viewer wants comma as seperator (not '/')
$subject =~ s!^/!!;
$subject =~ s!/(\w+=)!,$1!g;
return $subject;
}
1; 1;