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 31D8D9E2E4 for ; Tue, 31 Oct 2023 10:05:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 10B5218662 for ; Tue, 31 Oct 2023 10:05:34 +0100 (CET) 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 ; Tue, 31 Oct 2023 10:05:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id B967C42D3A for ; Tue, 31 Oct 2023 10:05:32 +0100 (CET) From: Folke Gleumes To: pve-devel@lists.proxmox.com Date: Tue, 31 Oct 2023 10:05:10 +0100 Message-Id: <20231031090514.23629-2-f.gleumes@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231031090514.23629-1-f.gleumes@proxmox.com> References: <20231031090514.23629-1-f.gleumes@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.032 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 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [acme.pm, ietf.org] Subject: [pve-devel] [PATCH acme v3 1/5] fix #4497: add support for external account bindings 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, 31 Oct 2023 09:05:34 -0000 implementation acording to rfc8555 section 7.3.4 Signed-off-by: Folke Gleumes --- Changes since v2: Transport eab credentials in the info hash, but don't reuse it as payload. Instead, needed values are extracted and, if needed, transformed into a new hash. While this limits how the info hash can be used, AFAIK there are no fields that could be set when creating a new account [0], that can't be produced with this abi. [0] https://datatracker.ietf.org/doc/html/rfc8555#section-7.1.2 src/PVE/ACME.pm | 48 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm index 3f66182..bf5410d 100644 --- a/src/PVE/ACME.pm +++ b/src/PVE/ACME.pm @@ -7,10 +7,10 @@ use POSIX; use Data::Dumper; use Date::Parse; -use MIME::Base64 qw(encode_base64url); +use MIME::Base64 qw(encode_base64url decode_base64); use File::Path qw(make_path); use JSON; -use Digest::SHA qw(sha256 sha256_hex); +use Digest::SHA qw(sha256 sha256_hex hmac_sha256); use HTTP::Request; use LWP::UserAgent; @@ -251,6 +251,28 @@ sub jws { }; } +# EAB signing using the HS256 alg (HMAC/SHA256). +my sub external_account_binding_jws { + my ($eab_kid, $eab_hmac_key, $jwk, $url) = @_; + + my $protected = { + alg => 'HS256', + kid => $eab_kid, + url => $url, + }; + $protected = encode(tojs($protected)); + + my $payload = encode(tojs($jwk)); + my $signdata = "$protected.$payload"; + my $signature = encode(hmac_sha256($signdata, $eab_hmac_key)); + + return { + protected => $protected, + payload => $payload, + signature => $signature, + }; +} + sub __get_result { my ($resp, $code, $plain) = @_; @@ -300,8 +322,8 @@ sub list_methods { } # return (optional) meta directory entry. -# this is public because it might contain the ToS, which should be displayed -# and agreed to before creating an account +# this is public because it might contain the ToS and EAB requirements, +# which have to be considered before creating an account sub get_meta { my ($self) = @_; my $methods = $self->__get_methods(); @@ -331,6 +353,8 @@ sub __new_account { # Create a new account using data in %info. # Optionally pass $tos_url to agree to the given Terms of Service +# %info must have at least a 'contact' field and may have a 'eab' field +# containing a hash with 'kid' and 'hmac_key' set. # POST to newAccount endpoint # Expects a '201 Created' reply # Saves and returns the account data @@ -338,12 +362,24 @@ sub new_account { my ($self, $tos_url, %info) = @_; my $url = $self->_method('newAccount'); + my %payload = ( contact => $info{contact} ); + + if (defined($info{eab})) { + my $eab_hmac_key = decode_base64($info{eab}->{hmac_key}); + $payload{externalAccountBinding} = external_account_binding_jws( + $info{eab}->{kid}, + $eab_hmac_key, + $self->jwk(), + $url + ); + } + if ($tos_url) { $self->{tos} = $tos_url; - $info{termsOfServiceAgreed} = JSON::true; + $payload{termsOfServiceAgreed} = JSON::true; } - return $self->__new_account(201, $url, 1, %info); + return $self->__new_account(201, $url, 1, %payload); } # Update existing account with new %info -- 2.39.2