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 5122872ADC for ; Tue, 13 Apr 2021 14:17:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7A8152A6A7 for ; Tue, 13 Apr 2021 14:16:48 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 9D80A2A660 for ; Tue, 13 Apr 2021 14:16:46 +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 6A5B945A73 for ; Tue, 13 Apr 2021 14:16:46 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 13 Apr 2021 14:16:23 +0200 Message-Id: <20210413121640.3602975-6-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210413121640.3602975-1-f.gruenbichler@proxmox.com> References: <20210413121640.3602975-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.027 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [accesscontrol.pm] Subject: [pve-devel] [PATCH access-control 1/2] tickets: add tunnel ticket 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: Tue, 13 Apr 2021 12:17:19 -0000 just like VNC ticket, but different prefix to prevent confusion. Signed-off-by: Fabian Grünbichler --- PVE/AccessControl.pm | 50 +++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm index 8b5be1e..9d9a4bd 100644 --- a/PVE/AccessControl.pm +++ b/PVE/AccessControl.pm @@ -445,12 +445,8 @@ sub verify_token { return wantarray ? ($tokenid) : $tokenid; } - -# VNC tickets -# - they do not contain the username in plain text -# - they are restricted to a specific resource path (example: '/vms/100') -sub assemble_vnc_ticket { - my ($username, $path) = @_; +my $assemble_short_lived_ticket = sub { + my ($prefix, $username, $path) = @_; my $rsa_priv = get_privkey(); @@ -459,11 +455,11 @@ sub assemble_vnc_ticket { my $secret_data = "$username:$path"; return PVE::Ticket::assemble_rsa_ticket( - $rsa_priv, 'PVEVNC', undef, $secret_data); -} + $rsa_priv, $prefix, undef, $secret_data); +}; -sub verify_vnc_ticket { - my ($ticket, $username, $path, $noerr) = @_; +my $verify_short_lived_ticket = sub { + my ($ticket, $prefix, $username, $path, $noerr) = @_; my $secret_data = "$username:$path"; @@ -473,12 +469,42 @@ sub verify_vnc_ticket { return undef; } else { # raise error via undef ticket - PVE::Ticket::verify_rsa_ticket($rsa_pub, 'PVEVNC'); + PVE::Ticket::verify_rsa_ticket($rsa_pub, $prefix); } } return PVE::Ticket::verify_rsa_ticket( - $rsa_pub, 'PVEVNC', $ticket, $secret_data, -20, 40, $noerr); + $rsa_pub, $prefix, $ticket, $secret_data, -20, 40, $noerr); +}; + +# VNC tickets +# - they do not contain the username in plain text +# - they are restricted to a specific resource path (example: '/vms/100') +sub assemble_vnc_ticket { + my ($username, $path) = @_; + + return $assemble_short_lived_ticket->('PVEVNC', $username, $path); +} + +sub verify_vnc_ticket { + my ($ticket, $username, $path, $noerr) = @_; + + return $verify_short_lived_ticket->($ticket, 'PVEVNC', $username, $path, $noerr); +} + +# Tunnel tickets +# - they do not contain the username in plain text +# - they are restricted to a specific resource path (example: '/vms/100', '/socket/run/qemu-server/123.storage') +sub assemble_tunnel_ticket { + my ($username, $path) = @_; + + return $assemble_short_lived_ticket->('PVETUNNEL', $username, $path); +} + +sub verify_tunnel_ticket { + my ($ticket, $username, $path, $noerr) = @_; + + return $verify_short_lived_ticket->($ticket, 'PVETUNNEL', $username, $path, $noerr); } sub assemble_spice_ticket { -- 2.20.1