From: Folke Gleumes <f.gleumes@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH manager v2 2/5] fix #4497: acme: add support for external account bindings
Date: Wed, 25 Oct 2023 15:07:17 +0200 [thread overview]
Message-ID: <20231025130720.195478-3-f.gleumes@proxmox.com> (raw)
In-Reply-To: <20231025130720.195478-1-f.gleumes@proxmox.com>
Signed-off-by: Folke Gleumes <f.gleumes@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
next prev parent reply other threads:[~2023-10-25 13:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-25 13:07 [pve-devel] [PATCH acme/manager v2 0/5] fix #4497: add external account binding support Folke Gleumes
2023-10-25 13:07 ` [pve-devel] [PATCH acme v2 1/5] fix #4497: add support for external account bindings Folke Gleumes
2023-10-27 6:58 ` Thomas Lamprecht
2023-10-27 7:12 ` Thomas Lamprecht
2023-10-25 13:07 ` Folke Gleumes [this message]
2023-10-25 13:07 ` [pve-devel] [PATCH manager v2 3/5] api/acme: deprecate tos endpoint in favor of meta Folke Gleumes
2023-10-25 13:07 ` [pve-devel] [PATCH manager v2 4/5] fix #4497: cli/acme: detect eab and ask for credentials Folke Gleumes
2023-10-25 13:07 ` [pve-devel] [PATCH manager v2 5/5] ui/acme: switch to new meta endpoint Folke Gleumes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231025130720.195478-3-f.gleumes@proxmox.com \
--to=f.gleumes@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal