[pve-devel] r5536 - qemu-server/pve2/PVE/API2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-15 14:17:35 +0100 (Tue, 15 Feb 2011)
New Revision: 5536

Modified:
   qemu-server/pve2/PVE/API2/Qemu.pm
Log:
pass correct auth path to vncterm


Modified: qemu-server/pve2/PVE/API2/Qemu.pm
===================================================================
--- qemu-server/pve2/PVE/API2/Qemu.pm	2011-02-15 13:12:07 UTC (rev 5535)
+++ qemu-server/pve2/PVE/API2/Qemu.pm	2011-02-15 13:17:35 UTC (rev 5536)
@@ -442,6 +442,10 @@
     path => '{vmid}/vncproxy', 
     method => 'POST',
     protected => 1,
+    permissions => {
+	path => '/vms/{vmid}',
+	privs => [ 'VM.Console' ],
+    },
     description => "Creates a TCP VNC proxy connections.",
     parameters => {
     	additionalProperties => 0,
@@ -485,6 +489,7 @@
 	# NOTE: kvm VNC traffic is already TLS encrypted,
 	# so we select the fastest chipher here (or 'none'?)
 	my $remcmd = $remip ? ['/usr/bin/ssh', '-T', '-o', 'BatchMode=yes',
+			       '-authpath', "/vms/$vmid", '-perm', 'VM.Console',
 			       '-c', 'blowfish-cbc', $remip] : [];
 
 	my $timeout = 10;