[pve-devel] [PATCH manager v2 2/5] fix #4497: acme: add support for external account bindings
Folke Gleumes
f.gleumes at proxmox.com
Wed Oct 25 15:07:17 CEST 2023
Signed-off-by: Folke Gleumes <f.gleumes at proxmox.com>
---
Changes v1 -> v2:
* renamed api methods so they use '-' instead of '_'
* use 'requires' in api to declare dependency instead of manual check
PVE/API2/ACMEAccount.pm | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/PVE/API2/ACMEAccount.pm b/PVE/API2/ACMEAccount.pm
index b790843a..994d2b49 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,13 @@ __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 $eab = (defined($eab_kid) and defined($eab_hmac_key)) ? {
+ kid => $eab_kid,
+ hmac_key => $eab_hmac_key
+ } : undef;
+
+ eval { $acme->new_account($param->{tos_url}, $eab, contact => $contact); };
+
if (my $err = $@) {
unlink $account_file;
die "Registration failed: $err\n";
--
2.39.2
More information about the pve-devel
mailing list