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 B8276751F3 for ; Fri, 4 Jun 2021 15:50:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F0A7E1E075 for ; Fri, 4 Jun 2021 15:50:05 +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 id B102C1DDA3 for ; Fri, 4 Jun 2021 15:49:51 +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 8BA3346723 for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:41 +0200 Message-Id: <20210604134946.152720-18-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 Adjusted score from AWL reputation of From: address 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [nodes.pm] Subject: [pve-devel] [PATCH manager 07/12] api: nodes: remove deprecated upgrade parameter for vncshell 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: Fri, 04 Jun 2021 13:50:38 -0000 Signed-off-by: Fabian Ebner --- Depends on novnc-pve patch (and clearing the browser cache ;) PVE/API2/Nodes.pm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm index 7feb5662..369c911c 100644 --- a/PVE/API2/Nodes.pm +++ b/PVE/API2/Nodes.pm @@ -906,12 +906,6 @@ __PACKAGE__->register_method ({ additionalProperties => 0, properties => { node => get_standard_option('pve-node'), - upgrade => { - type => 'boolean', - description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.", - optional => 1, - default => 0, - }, cmd => { type => 'string', description => "Run specific command or default to login.", @@ -964,7 +958,10 @@ __PACKAGE__->register_method ({ my ($user, undef, $realm) = PVE::AccessControl::verify_username($rpcenv->get_user()); raise_perm_exc("realm != pam") if $realm ne 'pam'; - raise_perm_exc('user != root@pam') if $param->{upgrade} && $user ne 'root@pam'; + + if (defined($param->{cmd}) && $param->{cmd} eq 'upgrade' && $user ne 'root@pam') { + raise_perm_exc('user != root@pam'); + } my $node = $param->{node}; @@ -976,10 +973,6 @@ __PACKAGE__->register_method ({ my ($port, $remcmd) = $get_vnc_connection_info->($node); - # FIXME: remove with 6.0 - if ($param->{upgrade}) { - $param->{cmd} = 'upgrade'; - } my $shcmd = get_shell_command($user, $param->{cmd}, $param->{'cmd-opts'}); my $timeout = 10; -- 2.30.2