proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-11 21:47:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use new assemble_vnc_ticket

Browse Source
This commit is contained in:
Dietmar Maurer 2012-01-19 09:32:58 +01:00
parent 5e4e479896
commit 57ebda0841
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/API2/Nodes.pm
View File

@ -523,10 +523,12 @@ __PACKAGE__->register_method ({
my $user = $rpcenv->get_user();
my $ticket = PVE::AccessControl::assemble_ticket($user);
my $node = $param->{node};
my $authpath = "/nodes/$node";
my $ticket = PVE::AccessControl::assemble_vnc_ticket($user, $authpath);
$sslcert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192)
if !$sslcert;
@ -547,10 +549,8 @@ __PACKAGE__->register_method ({
my $timeout = 10;
# fixme: do we want to require special auth permissions?
# example "-perm Shell"
my @cmd = ('/usr/bin/vncterm', '-rfbport', $port,
'-timeout', $timeout, '-authpath', "/nodes/$node",
'-timeout', $timeout, '-authpath', $authpath,
'-perm', 'Sys.Console', '-c', @$remcmd, @$shcmd);
my $realcmd = sub {

7
PVE/API2/OpenVZ.pm
View File

@ -741,11 +741,14 @@ __PACKAGE__->register_method ({
my $rpcenv = PVE::RPCEnvironment::get();
my $user = $rpcenv->get_user();
my $ticket = PVE::AccessControl::assemble_ticket($user);
my $vmid = $param->{vmid};
my $node = $param->{node};
my $authpath = "/vms/$vmid";
my $ticket = PVE::AccessControl::assemble_vnc_ticket($user, $authpath);
$sslcert = PVE::Tools::file_get_contents("/etc/pve/pve-root-ca.pem", 8192)
if !$sslcert;
@ -772,7 +775,7 @@ __PACKAGE__->register_method ({
my $timeout = 10;
my $cmd = ['/usr/bin/vncterm', '-rfbport', $port,
'-timeout', $timeout, '-authpath', "/vms/$vmid",
'-timeout', $timeout, '-authpath', $authpath,
'-perm', 'VM.Console', '-c', @$remcmd, @$shcmd];
run_command($cmd);