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 C649F9C1A7 for ; Mon, 23 Oct 2023 15:18:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A80DC140C1 for ; Mon, 23 Oct 2023 15:18:47 +0200 (CEST) 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 ; Mon, 23 Oct 2023 15:18:47 +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 C7BFD444AC for ; Mon, 23 Oct 2023 15:18:46 +0200 (CEST) From: Folke Gleumes To: pve-devel@lists.proxmox.com Date: Mon, 23 Oct 2023 15:18:05 +0200 Message-Id: <20231023131808.172494-3-f.gleumes@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231023131808.172494-1-f.gleumes@proxmox.com> References: <20231023131808.172494-1-f.gleumes@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 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 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 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: Mon, 23 Oct 2023 13:18:47 -0000 Signed-off-by: Folke Gleumes --- 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..daae18d8 100644 --- a/PVE/API2/ACMEAccount.pm +++ b/PVE/API2/ACMEAccount.pm @@ -115,6 +115,16 @@ __PACKAGE__->register_method ({ default => $acme_default_directory_url, optional => 1, }), + eab_kid => { + type => 'string', + description => 'Key Identifier for External Account Binding.', + optional => 1, + }, + eab_hmac_key => { + type => 'string', + description => 'HMAC key for External Account Binding.', + optional => 1, + }, }, }, returns => { @@ -130,8 +140,15 @@ __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; + raise_param_exc({'eab_kid' => "'eab_hmac_key' must be defined if 'eab_kid' is set."}) + if defined($eab_kid) and not defined($eab_hmac_key); + raise_param_exc({'eab_hmac_key' => "'eab_kid' must be defined if 'eab_hmac_key' is set."}) + if defined($eab_hmac_key) and not defined($eab_kid); my $directory = extract_param($param, 'directory') // $acme_default_directory_url; my $contact = $account_contact_from_param->($param); @@ -145,7 +162,15 @@ __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) and defined($eab_hmac_key)) { + $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