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 010AB9E354 for ; Tue, 31 Oct 2023 10:05:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BF9021865E for ; Tue, 31 Oct 2023 10:05:33 +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 9F22342D3F 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:11 +0100 Message-Id: <20231031090514.23629-3-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.030 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. [acmeaccount.pm] Subject: [pve-devel] [PATCH manager v3 2/5] fix #4497: acme: 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 Signed-off-by: Folke Gleumes --- No changes in v3 PVE/API2/ACMEAccount.pm | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/PVE/API2/ACMEAccount.pm b/PVE/API2/ACMEAccount.pm index b790843a..ec4eba24 100644 --- a/PVE/API2/ACMEAccount.pm +++ b/PVE/API2/ACMEAccount.pm @@ -115,6 +115,18 @@ __PACKAGE__->register_method ({ default => $acme_default_directory_url, optional => 1, }), + 'eab-kid' => { + type => 'string', + description => 'Key Identifier for External Account Binding.', + requires => 'eab-hmac-key', + optional => 1, + }, + 'eab-hmac-key' => { + type => 'string', + description => 'HMAC key for External Account Binding.', + requires => 'eab-kid', + optional => 1, + }, }, }, returns => { @@ -130,6 +142,9 @@ __PACKAGE__->register_method ({ my $account_file = "${acme_account_dir}/${account_name}"; mkdir $acme_account_dir if ! -e $acme_account_dir; + my $eab_kid = extract_param($param, 'eab-kid'); + my $eab_hmac_key = extract_param($param, 'eab-hmac-key'); + raise_param_exc({'name' => "ACME account config file '${account_name}' already exists."}) if -e $account_file; @@ -145,7 +160,17 @@ __PACKAGE__->register_method ({ print "Generating ACME account key..\n"; $acme->init(4096); print "Registering ACME account..\n"; - eval { $acme->new_account($param->{tos_url}, contact => $contact); }; + + my %info = (contact => $contact); + if (defined($eab_kid)) { + $info{eab} = { + kid => $eab_kid, + hmac_key => $eab_hmac_key + }; + } + + eval { $acme->new_account($param->{tos_url}, %info); }; + if (my $err = $@) { unlink $account_file; die "Registration failed: $err\n"; -- 2.39.2