From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id CCBE4A1387 for ; Wed, 14 Jun 2023 12:43:00 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 495B61AA92 for ; Wed, 14 Jun 2023 12:42:30 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 14 Jun 2023 12:42:29 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 7EAE445554 for ; Wed, 14 Jun 2023 12:42:29 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Wed, 14 Jun 2023 12:42:14 +0200 Message-Id: <20230614104215.359768-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230614104215.359768-1-f.gruenbichler@proxmox.com> References: <20230614104215.359768-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.072 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager 2/3] node console: allow usage for non-pam realms X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jun 2023 10:43:00 -0000 non-login commands are still restricted to root@pam if they where before. Signed-off-by: Fabian Grünbichler --- PVE/API2/Nodes.pm | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 81c7f3788..649735115 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -939,7 +939,6 @@ __PACKAGE__->register_method ({ method => 'POST', protected => 1, permissions => { - description => "Restricted to users on realm 'pam'", check => ['perm', '/nodes/{node}', [ 'Sys.Console' ]], }, description => "Creates a VNC Shell proxy.", @@ -998,7 +997,6 @@ __PACKAGE__->register_method ({ my $rpcenv = PVE::RPCEnvironment::get(); my ($user, undef, $realm) = PVE::AccessControl::verify_username($rpcenv->get_user()); - raise_perm_exc("realm != pam") if $realm ne 'pam'; if (defined($param->{cmd}) && $param->{cmd} ne 'login' && $user ne 'root@pam') { raise_perm_exc('user != root@pam'); @@ -1079,7 +1077,6 @@ __PACKAGE__->register_method ({ method => 'POST', protected => 1, permissions => { - description => "Restricted to users on realm 'pam'", check => ['perm', '/nodes/{node}', [ 'Sys.Console' ]], }, description => "Creates a VNC Shell proxy.", @@ -1117,7 +1114,6 @@ __PACKAGE__->register_method ({ my $rpcenv = PVE::RPCEnvironment::get(); my ($user, undef, $realm) = PVE::AccessControl::verify_username($rpcenv->get_user()); - raise_perm_exc("realm $realm != pam") if $realm ne 'pam'; my $node = $param->{node}; my $authpath = "/nodes/$node"; @@ -1160,7 +1156,7 @@ __PACKAGE__->register_method({ path => 'vncwebsocket', method => 'GET', permissions => { - description => "Restricted to users on realm 'pam'. You also need to pass a valid ticket (vncticket).", + description => "You also need to pass a valid ticket (vncticket).", check => ['perm', '/nodes/{node}', [ 'Sys.Console' ]], }, description => "Opens a websocket for VNC traffic.", @@ -1194,8 +1190,6 @@ __PACKAGE__->register_method({ my ($user, undef, $realm) = PVE::AccessControl::verify_username($rpcenv->get_user()); - raise_perm_exc("realm != pam") if $realm ne 'pam'; - my $authpath = "/nodes/$param->{node}"; PVE::AccessControl::verify_vnc_ticket($param->{vncticket}, $user, $authpath); @@ -1212,7 +1206,6 @@ __PACKAGE__->register_method ({ protected => 1, proxyto => 'node', permissions => { - description => "Restricted to users on realm 'pam'", check => ['perm', '/nodes/{node}', [ 'Sys.Console' ]], }, description => "Creates a SPICE shell.", @@ -1246,7 +1239,6 @@ __PACKAGE__->register_method ({ my ($user, undef, $realm) = PVE::AccessControl::verify_username($authuser); - raise_perm_exc("realm != pam") if $realm ne 'pam'; if (defined($param->{cmd}) && $param->{cmd} ne 'login' && $user ne 'root@pam') { raise_perm_exc('user != root@pam'); -- 2.39.2