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 C78831FF0B7 for ; Fri, 13 Nov 2026 04:35:36 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C185121DA1; Fri, 13 Nov 2026 04:22:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wolfssl-com.20260707.gappssmtp.com; s=20260707; t=1794539206; x=1795144006; 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=Ma/gfNa8NrJaWGIhJFjXPTqb/QYnjK0BTuYzXIMWZIA=; b=cljt8T6MvFK/klQGxnF8ff7CNyIymf8rDWbuwovek/o+k+C9sGjmdnZ4V4faAo0gGu sjSqQlzqtYNB0d8//oZPtcx+rd1vB/18NOT75y/51N/eAWWub265JD+fRicnP/tcgeC2 zhynjBje1Vbab80zlcNCi4Fxdz37tUQQe4fZqaSEXCTw4V65tJ0VFBk+7mVacbgdluSr aFdAQ/7Q811HVtTeR1uL0KIqx8hnLodOOx+Emn4abUfE5EtM+yTj1HbnzTFnLCr+nORi 0n+VhJdufYSZvMa+rhUl0/TY45CbpDLSjScUFqfvWvZUnakBA8BlTCop99zw+Avf2C3j nebw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794539206; x=1795144006; 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=Ma/gfNa8NrJaWGIhJFjXPTqb/QYnjK0BTuYzXIMWZIA=; b=EHWOroXCzZmf+Y6Wtz9GSCMVJtqlKW5TG//HBkKh7p/8uZmfMDhoGi2i0k3lbUrhDL K+me3jjyDNVlQ4RsRbgxHo4tPlVMGiT6pcxGGgFRbJYAj0nzZVCN1YIHicmcM/IJyiQ3 jqlLO2/O3dbfonT/J09pvlvcd8b3062SxX+QSqA4hE7lCwI7TOUA9X6/17/zCBsEiN/Z 9L01rjoHu7JH1sfDtiVFi0z4HfR+saNWro0krESAQJPNuOx/5KFOH8VFvKCbCYB4qd0T vHAtl/IUBMRJqgZREDfDpuuqf4A8RIMy1a9vbgTYNOez4C6egf3Ev7gIGk5i/jB3ihr7 eVXw== X-Gm-Message-State: APuU4Z9qAf1sUoqUwASp64nnTtEBc8rLBL7KPmRSnKs+yltEYlKN99jm pixxAtwYgx85gDOa04yeY0JSPZy0D89PjeTvKD9m7Yv6fUk+dtyAFDNEqBHaN3GmhPwc1I4Ub1f GyyWv X-Gm-Gg: AYBFou1IK81ZdkbInOVrA1luQxtaWn+pjNbsFe7SXd2IWfQgNhUPE3Pzn+pMe/mUCGC MtobW2CP4o6WiVNW6Fek59RoKZ8WnqNqjXMMVR+IpX3bFextqVrRX7slFsGk1ZZeJ1x0qCQuJ98 Bgdzr4/xajWukXIFrRB8MgiyberbbFDniiGUczhUNOVOLMlsmOPuYwpP6yDM5o8JggOv71UgYjr rqFOlF/TKQBq8FJ/Xr5tjFQwn8zL53qrsm4ysvWw3E83zcX2JlFssOZ8b7Qpi6satXt0P6VkN+r 180h2qhVMTd5nwz7vVsI+RxY5k/fs7+QVXY40m4o1KFdK1sgYbOykqk6p8Fz5XvY3XZmOuCipMp jcgZwe1ZDubEsbVFibYBuYCkVpAnc4+SI4mOUoo+t6jQI+rK74mKR+dbQ0idfqaWZJFA/Tu4p8Z nIqPHZxc9wF4J7DkWJ5o49Ccpy78fnpi5uit6I/rNS3rEcoj8W+v/lEu6/F1XoGdnNGA/mI/Vpo p31Uw3DXI/fLxfIO9vGSjFgVKGLUMjmc/7oNyKqrqGIVOxPpbmeapzrbke9k1kGyAH3thLQsYPC xKgqt4OGc1FBZxUND+zc03GDiJKp5UscnAX1uc5zZzR9uG4ElezwOxFpDpawCMDHvk+2bHk7/Qb FPoUaF2l4wFKe5TWAT4/zONbS6w0Zzu2MlibnyoWsmalwoJTVnoxT6NuI1PHdtiGlJzTeexyHX7 qPbvZfSksT7Cq36o+MVlP4jpwMPjqlnoSMs+8NCFDgt9AaFuLIFNOdUAnAGNhgerhDVLvr6037B bV7g4C5qg== X-Received: by 2002:a05:6820:c3d8:b0:70d:9072:bef1 with SMTP id 006d021491bc7-71ab4fbc34dmr489903eaf.21.1794539206523; Thu, 12 Nov 2026 19:06:46 -0800 (PST) From: Mark Atwood To: pve-devel@lists.proxmox.com Subject: [PATCH common v2 2/2] ticket: allow signing RSA tickets with SHA-256 Date: Fri, 13 Nov 2026 03:06:39 +0000 Message-ID: <20261113030639.3514-3-mark@wolfssl.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261113030639.3514-1-mark@wolfssl.com> References: <20261113030639.3514-1-mark@wolfssl.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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: Q65XXYDDZ446PCPQPWXA7KQQ3HNK2IU2 X-Message-ID-Hash: Q65XXYDDZ446PCPQPWXA7KQQ3HNK2IU2 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: Add an optional hash parameter to assemble_rsa_ticket(), either 'sha1' or 'sha256'. It defaults to 'sha1', so existing callers get the same tickets as before. Callers that need SHA-256 signatures, like for running with providers that refuse SHA-1, can opt in. This also affects Proxmox Mail Gateway, which uses PVE::Ticket too, but only for callers that pass the parameter. Nodes that do not accept SHA-256 tickets yet, i.e. without the previous patch, reject them, so callers should only pass 'sha256' once all nodes that verify the tickets accept them. The digest is set on the private key object explicitly on every call, as it is state of the object that earlier calls would otherwise leak into later ones. The tests check the digest that was used by verifying the signatures with a public key that only accepts a single one. Signed-off-by: Mark Atwood --- src/PVE/Ticket.pm | 14 +++++++++++++- test/ticket_test.pl | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/PVE/Ticket.pm b/src/PVE/Ticket.pm index f20ab5d..a4a593b 100644 --- a/src/PVE/Ticket.pm +++ b/src/PVE/Ticket.pm @@ -50,8 +50,14 @@ sub verify_csrf_prevention_token { } # Note: data may not contain white spaces (verify fails in that case) +# +# $hash selects the digest of the RSA signature, either 'sha1' (default) or 'sha256'. The digest is +# set explicitly on every call, as it is state of the $rsa_priv object. sub assemble_rsa_ticket { - my ($rsa_priv, $prefix, $data, $secret_data) = @_; + my ($rsa_priv, $prefix, $data, $secret_data, $hash) = @_; + + $hash //= 'sha1'; + die "unsupported ticket signature hash '$hash'\n" if $hash ne 'sha1' && $hash ne 'sha256'; my $timestamp = sprintf("%08X", time()); @@ -66,6 +72,12 @@ sub assemble_rsa_ticket { my $full = defined($secret_data) ? "$plain:$secret_data" : $plain; + if ($hash eq 'sha256') { + $rsa_priv->use_sha256_hash(); + } else { + $rsa_priv->use_sha1_hash(); + } + my $ticket = $plain . "::" . encode_base64($rsa_priv->sign($full), ''); return $ticket; diff --git a/test/ticket_test.pl b/test/ticket_test.pl index ee4212a..eb495b8 100755 --- a/test/ticket_test.pl +++ b/test/ticket_test.pl @@ -92,6 +92,42 @@ for my $hash ('sha1', 'sha256') { is(eval { verify_fixed('sha256', $rsa_pub, 0) }, undef, "ticket of other key is rejected"); like($@, qr/invalid PVE ticket/, "ticket of other key raises without noerr"); +# which digest was used when signing, checked by verifying with the digest forced +my sub signed_with($ticket, $hash) { + my $pub = Crypt::OpenSSL::RSA->new_public_key($rsa_pub->get_public_key_string()); + $hash eq 'sha256' ? $pub->use_sha256_hash() : $pub->use_sha1_hash(); + my ($plain, $sig) = $ticket =~ m/^(\S+)::(\S+)$/; + return $pub->verify($plain, decode_base64($sig)) ? 1 : 0; +} + +my $sha1_ticket = PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', 'root@pam'); +my $default_ticket = PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', 'root@pam', undef, undef); +my $sha256_ticket = PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', 'root@pam', undef, 'sha256'); +# the digest set on the key by the previous call must not leak into the next one +my $sha1_again = PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', 'root@pam', undef, 'sha1'); + +is(signed_with($sha1_ticket, 'sha1'), 1, "default is a SHA-1 signature"); +is(signed_with($default_ticket, 'sha1'), 1, "undef hash is a SHA-1 signature"); +is(signed_with($sha256_ticket, 'sha256'), 1, "sha256 is a SHA-256 signature"); +is(signed_with($sha256_ticket, 'sha1'), 0, "sha256 is not a SHA-1 signature"); +is(signed_with($sha1_again, 'sha1'), 1, "sha1 after sha256 is a SHA-1 signature"); + +for my $ticket ($sha1_ticket, $sha256_ticket) { + is(verify($ticket), 'root@pam', "accepts ticket of either digest"); + is( + PVE::Ticket::verify_rsa_ticket($rsa_pub, 'PVE', $ticket, undef, -20, 7200), + 'root@pam', + "accepts ticket without noerr", + ); +} + +my $secret_ticket = PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', undef, 'secret', 'sha256'); +is(verify($secret_ticket, 'secret'), 1, "sha256 ticket with secret data"); +is(verify($secret_ticket, 'other'), undef, "sha256 ticket with wrong secret data"); + +eval { PVE::Ticket::assemble_rsa_ticket($rsa_priv, 'PVE', 'root@pam', undef, 'md5') }; +like($@, qr/unsupported ticket signature hash 'md5'/, "unknown hash is refused"); + my sub verify_refusing($hash, $error) { my $pub = RefusingSha1->new(Crypt::OpenSSL::RSA->new_public_key($fixed_pub_pem), $error); my @warnings;