From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 043201FF0B7 for ; Fri, 13 Nov 2026 04:36:31 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id B2FE221DF5; Fri, 13 Nov 2026 04:22:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfssl-com.20260707.gappssmtp.com; s=20260707; t=1794539218; x=1795144018; darn=lists.proxmox.com; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=S6bBudHzw5jRB2bWlToIGjgVPD7RU3tgyKdAXBL616U=; b=elSLIETshnsKG38jM4Y9Wa/HZfL+JLOElPEF3cBKP/jjAocfPEm+be497eY/y3fOR3 V4sQJTU/gtCphpdg4WeIVsqrD1ib/a23h7SJGbTQeynwVuKOCLNPKYn4Qq73v3f+Yn+c dn/LuguvCWLnd9hv6hK6MZxxo7y67gcDlJnMyz3Q3hKvKqXoJF9dUTJ7xzjU4r7Mc4Lt 5cOsV/asQclgqvSWITJ9oJSJWd6VbMpPBlgq67bHm2UbX/+tcdnz0zeRd3rw+zXv9xtJ pvxnZ3YY8ce/ZUfSVRUwrrzUfXpivRYBQdAPRDr/Bd3jlfppCrsGRObSeUyGg1CjCM7n B65g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794539218; x=1795144018; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=S6bBudHzw5jRB2bWlToIGjgVPD7RU3tgyKdAXBL616U=; b=BMuQlzzux2+5ljw7A/exMh4vQNiFGwbfgCjFn5/aMh47RjW3UNU4hxqavFj11YaeNH 2u2Nk2TQovaUWb+OiVVAniEDqmQ/t7IscpEAoZ63QJrCPghJJ6JIuqP2Cvz/CRoX2g8W e8ezgFHZRTjTV6woho4Xw1ecepAgRYqT71Q5D3dXE167yJAGVLXn8HhxAKM3OpM8sEhf VrNZsgtKkiJYEwOEkC6zVqaMIDwIzn3775ooC2YqK/LFPdWdwgNXO7bvBqv5C8/3+uB5 w4henvjOJGJfLm6WZK/vyRN9NIrd4Eu/U7twRTx86TCWQSOKZmPth998RPudnM0u8Xp0 JxBg== X-Gm-Message-State: APuU4Z9CWv4g9cAZDfylLLHYIRU21IzpD2e5Fze7gx8cFXoVbSrNfNxF 32pPMZ/gl59kTjtSpQMppmMvi1TaEyfA3zws1OVZxEByMY95Ehz7izTsFDsuoOLIpUn7JlvFBPE OADxx X-Gm-Gg: AYBFou2bkbaM8/2cxNZ7a+zMah59PmVR4WfBiga5+Vh40CXC7ElUQU8OGyIRGzFbxZw 8wUaYLsSa3HK4qK5kMIx3IVqP4YJitY2P9PSSL4/pw+W5U/K2Jl1zdNsDa8+X9tqhFdwjEBL6Xx ASJrWDSxJSzr0KGTeAFgZel4vec0DXk1yPwglaOey+bLrPI0ll5t0zO7sPPOZYXsdhMGhZ9QGPd qLezxxxOLe+DZW1n8nG8PpWQAkIBNFIyQAmK0kk7oJhlLyBD7p5qDZlZy1RFcFHb1kgHNGNhPJA OK6c1IbyUXp2fphccCbVbzXEXzxEtONUjJgl0ePxff7TtKCnuwqvGTeTsC32/dS3LFbzX6OOgiH t5HBfO3QnUdSjKmcwlYp1at50vhl6qf5Ycg4gSpI0uwtLmNSeT0txj5QFNqRIOdfohzPdEGToyc HomXSZs7sfIJ9fXoFPVhc/GXHa4l3+UErckZbNl2zbgYH9lfyD+dqrlkD8XOeo+fhYHKbkEmpFz IT4pbc2jzafVEOXGqOz/JBPS/sCnzAs2VPDnOSjxmq6e3A6GPjeP0XkdOVGoQtGHpOVmV4HiEOs po4VtZOQ09ubYlzhi7EH5ujUcLGwrg0EMdgqgmosE6bVlTJSP9D6JSwUsCLQ4Gy3aAmD/sAsRbo 9JCPnAJb9f5kVR3EzDG/5YI4Lv+jJwJYZCFqrGV4HcuCpnw7zpy95z2muG3AK7eBeX44AxdiDy1 j8fAbwj5zqiI6rGFYK7WPfYMenBjPfi+3MYjGS3HD9G15nSjlZLjzID+Dg1nAE337ZsvywXmM1M b9bqGDZzZs= X-Received: by 2002:a05:6808:508f:b0:4e5:c2b4:33a4 with SMTP id 5614622812f47-56e650131b0mr1129646b6e.50.1794539218456; Thu, 12 Nov 2026 19:06:58 -0800 (PST) From: Mark Atwood To: pve-devel@lists.proxmox.com Subject: [PATCH access-control v2 1/1] tickets: sign with the hash from the datacenter configuration Date: Fri, 13 Nov 2026 03:06:52 +0000 Message-ID: <20261113030652.3550-2-mark@wolfssl.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113030652.3550-1-mark@wolfssl.com> References: <20261113030652.3550-1-mark@wolfssl.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature DMARC_PASS -0.1 DMARC pass policy RCVD_IN_DNSWL_NONE -0.0001 Sender listed at https://www.dnswl.org/, no trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: JH6UUXDMT2NI4VMZMXVUMVIMBBBTORIE X-Message-ID-Hash: JH6UUXDMT2NI4VMZMXVUMVIMBBBTORIE X-MailFrom: mark@wolfssl.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Read the new 'ticket-signature-hash' option of datacenter.cfg and pass it to PVE::Ticket::assemble_rsa_ticket() for all tickets that are signed here: login and TFA tickets, as well as the short-lived VNC and tunnel tickets. Without the option, tickets are signed with SHA-1 as before. This lets setups where SHA-1 signatures are not acceptable, like running in FIPS mode, create tickets. It depends on the option in pve-cluster and on the changes to PVE::Ticket in pve-common, which should be applied first. With older versions of those, the option is not set and the parameter is ignored, so tickets are still signed with SHA-1. Tickets that nodes verify are accepted with either hash, as long as those nodes have the PVE::Ticket changes. Tunnel tickets are verified on the target node, so the option must only be set to 'sha256' once all nodes of the cluster have them. The datacenter configuration is the same on all nodes, so the same hash is used on all of them. The tests check the hash of the signature for each kind of ticket and that tickets of both hashes verify with either setting. Signed-off-by: Mark Atwood --- src/PVE/AccessControl.pm | 23 +++++- src/test/Makefile | 1 + src/test/ticket-signature-hash-test.pl | 100 +++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 src/test/ticket-signature-hash-test.pl diff --git a/src/PVE/AccessControl.pm b/src/PVE/AccessControl.pm index a4e1c36..fceea56 100644 --- a/src/PVE/AccessControl.pm +++ b/src/PVE/AccessControl.pm @@ -377,12 +377,25 @@ my $get_ticket_age_range = sub { return ($min, $max); }; +# The hash algorithm for the signature of newly created tickets, as configured cluster-wide. +my sub get_ticket_signature_hash { + my $dc_conf = cfs_read_file('datacenter.cfg'); + + return $dc_conf->{'ticket-signature-hash'} // 'sha1'; +} + sub assemble_ticket : prototype($;$) { my ($data, $aad) = @_; my $rsa_priv = get_privkey(); - return PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', $data, $aad); + return PVE::Ticket::assemble_rsa_ticket( + $rsa_priv, + 'PVE', + $data, + $aad, + get_ticket_signature_hash(), + ); } # Returns the username, "age" and tfa info. @@ -516,7 +529,13 @@ my $assemble_short_lived_ticket = sub { my $secret_data = "$username:$path"; $secret_data .= ":$additional_secret" if defined($additional_secret); - return PVE::Ticket::assemble_rsa_ticket($rsa_priv, $prefix, undef, $secret_data); + return PVE::Ticket::assemble_rsa_ticket( + $rsa_priv, + $prefix, + undef, + $secret_data, + get_ticket_signature_hash(), + ); }; my $verify_short_lived_ticket = sub { diff --git a/src/test/Makefile b/src/test/Makefile index 8f3ba47..ac8c6cc 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -22,4 +22,5 @@ check: perl -I.. api-tests.pl perl -I.. sdn_acl_pruning_test.pl perl -I.. sdn_acl_migration_test.pl + perl -I.. ticket-signature-hash-test.pl diff --git a/src/test/ticket-signature-hash-test.pl b/src/test/ticket-signature-hash-test.pl new file mode 100644 index 0000000..2e4d05b --- /dev/null +++ b/src/test/ticket-signature-hash-test.pl @@ -0,0 +1,100 @@ +#!/usr/bin/perl + +use v5.36; + +use lib qw(..); + +use Crypt::OpenSSL::RSA; +use MIME::Base64; +use Test::MockModule; +use Test::More; + +use PVE::AccessControl; + +# Tickets are signed with the hash from the 'ticket-signature-hash' datacenter option, which +# defaults to SHA-1. Whether a signature is SHA-1 or SHA-256 is checked by verifying it with a +# public key where only that hash is accepted. + +my $rsa_priv = Crypt::OpenSSL::RSA->generate_key(2048); +my $pub_pem = $rsa_priv->get_public_key_string(); + +my $datacenter_conf = {}; + +my $access_control_module = Test::MockModule->new('PVE::AccessControl'); +$access_control_module->mock( + get_privkey => sub { return $rsa_priv }, + get_pubkey => sub { return (Crypt::OpenSSL::RSA->new_public_key($pub_pem), time()) }, + cfs_read_file => sub($file) { + die "unexpected cfs_read_file('$file') call\n" if $file ne 'datacenter.cfg'; + return $datacenter_conf; + }, +); + +my sub signed_with($ticket, $hash, $secret_data) { + my $pub = Crypt::OpenSSL::RSA->new_public_key($pub_pem); + $hash eq 'sha256' ? $pub->use_sha256_hash() : $pub->use_sha1_hash(); + my ($plain, $sig) = $ticket =~ m/^(.+)::([^:]+)$/ or die "unexpected ticket '$ticket'\n"; + my $full = defined($secret_data) ? "$plain:$secret_data" : $plain; + return $pub->verify($full, decode_base64($sig)) ? 1 : 0; +} + +# name, assemble function and the secret data that is signed along but not part of the ticket +my @tickets = ( + ['login ticket', sub { PVE::AccessControl::assemble_ticket('root@pam') }, undef], + [ + 'TFA ticket', + sub { PVE::AccessControl::assemble_ticket('root@pam', 'tfa-aad') }, + 'tfa-aad', + ], + [ + 'VNC ticket', + sub { PVE::AccessControl::assemble_vnc_ticket('root@pam', '/vms/100', 5900) }, + 'root@pam:/vms/100:5900', + ], + [ + 'tunnel ticket', + sub { PVE::AccessControl::assemble_tunnel_ticket('root@pam', '/vms/100') }, + 'root@pam:/vms/100', + ], +); + +my @options = ( + ['unset', {}, 'sha1'], + ['sha1', { 'ticket-signature-hash' => 'sha1' }, 'sha1'], + ['sha256', { 'ticket-signature-hash' => 'sha256' }, 'sha256'], +); + +for my $option (@options) { + my ($name, $conf, $expected) = @$option; + my $other = $expected eq 'sha1' ? 'sha256' : 'sha1'; + $datacenter_conf = $conf; + + for my $ticket_type (@tickets) { + my ($type, $assemble, $secret) = @$ticket_type; + my $ticket = $assemble->(); + is( + signed_with($ticket, $expected, $secret), + 1, + "$type is signed with $expected if option is $name", + ); + is( + signed_with($ticket, $other, $secret), + 0, + "$type is not signed with $other if option is $name", + ); + } +} + +# tickets of either hash have to be accepted, independent of the option +for my $option (@options) { + my ($name, $conf) = @$option; + $datacenter_conf = $conf; + my $ticket = PVE::AccessControl::assemble_ticket('root@pam'); + for my $verify_conf (@options) { + $datacenter_conf = $verify_conf->[1]; + my ($user) = PVE::AccessControl::verify_ticket($ticket, 1); + is($user, 'root@pam', "ticket created with option $name is valid with $verify_conf->[0]"); + } +} + +done_testing();