[pve-devel] r5535 - in pve-manager/pve2/lib/PVE: . API2

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-02-15 14:12:07 +0100 (Tue, 15 Feb 2011)
New Revision: 5535

Modified:
   pve-manager/pve2/lib/PVE/API2/Nodes.pm
   pve-manager/pve2/lib/PVE/REST.pm
Log:
pass correct -authpath to vncterm


Modified: pve-manager/pve2/lib/PVE/API2/Nodes.pm
===================================================================
--- pve-manager/pve2/lib/PVE/API2/Nodes.pm	2011-02-15 13:05:38 UTC (rev 5534)
+++ pve-manager/pve2/lib/PVE/API2/Nodes.pm	2011-02-15 13:12:07 UTC (rev 5535)
@@ -260,7 +260,8 @@
 	# fixme: do we want to require special auth permissions?
 	# example "-perm Shell"
 	my @cmd = ('/usr/bin/vncterm', '-rfbport', $port,
-		   '-timeout', $timeout, '-c', @$remcmd, @$shcmd);
+		   '-timeout', $timeout, '-authpath', "/nodes/$node", 
+		   '-perm', 'Sys.Console', '-c', @$remcmd, @$shcmd);
 
 	my $realcmd = sub {
 	    my $upid = shift;

Modified: pve-manager/pve2/lib/PVE/REST.pm
===================================================================
--- pve-manager/pve2/lib/PVE/REST.pm	2011-02-15 13:05:38 UTC (rev 5534)
+++ pve-manager/pve2/lib/PVE/REST.pm	2011-02-15 13:12:07 UTC (rev 5535)
@@ -316,7 +316,6 @@
 	    if (!($params->{path} && $params->{permissions} &&
 		  $aclcache->check($user, $params->{path}, \@privs))) {
 
-		syslog("info", "TEST 5");
 		return { 
 		    status => HTTP_FORBIDDEN,
 		    message => "permission check failed ($params->{path}, $params->{permissions})",