From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.gleumes@proxmox.com>
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 AFD509D228
for <pve-devel@lists.proxmox.com>; Wed, 25 Oct 2023 15:08:04 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 9344C1434D
for <pve-devel@lists.proxmox.com>; Wed, 25 Oct 2023 15:07:34 +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 <pve-devel@lists.proxmox.com>; Wed, 25 Oct 2023 15:07:33 +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 3801E45F2D
for <pve-devel@lists.proxmox.com>; Wed, 25 Oct 2023 15:07:33 +0200 (CEST)
From: Folke Gleumes <f.gleumes@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 25 Oct 2023 15:07:16 +0200
Message-Id: <20231025130720.195478-2-f.gleumes@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20231025130720.195478-1-f.gleumes@proxmox.com>
References: <20231025130720.195478-1-f.gleumes@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.019 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
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]
Subject: [pve-devel] [PATCH acme v2 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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 25 Oct 2023 13:08:04 -0000
implementation acording to rfc855 section 7.3.4
Signed-off-by: Folke Gleumes <f.gleumes@proxmox.com>
---
Changes v1 -> v2:
Switched from including the eab credentials in the info hash,
to passing them in their own variable. This still unfortunately still
breaks the api, but doesn't potentially expose secrets and is
cleaner then purging the values from the hash afterwards.
src/PVE/ACME.pm | 42 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 37 insertions(+), 5 deletions(-)
diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm
index 3f66182..7b3840b 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).
+sub external_account_binding_jws {
+ my ($self, $eab_kid, $eab_hmac_key, $url) = @_;
+
+ my $protected = {
+ alg => 'HS256',
+ kid => $eab_kid,
+ url => $url,
+ };
+ $protected = encode(tojs($protected));
+
+ my $payload = encode(tojs($self->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,13 +353,23 @@ sub __new_account {
# Create a new account using data in %info.
# Optionally pass $tos_url to agree to the given Terms of Service
+# Optionally pass $eab to use External Account Binding
# POST to newAccount endpoint
# Expects a '201 Created' reply
# Saves and returns the account data
sub new_account {
- my ($self, $tos_url, %info) = @_;
+ my ($self, $tos_url, $eab, %info) = @_;
my $url = $self->_method('newAccount');
+ if ($eab) {
+ my $eab_hmac_key = decode_base64($eab->{hmac_key});
+ $info{externalAccountBinding} = $self->external_account_binding_jws(
+ $eab->{kid},
+ $eab_hmac_key,
+ $url
+ );
+ }
+
if ($tos_url) {
$self->{tos} = $tos_url;
$info{termsOfServiceAgreed} = JSON::true;
--
2.39.2