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 B8B3F73A16 for ; Fri, 8 Oct 2021 10:18:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AA7C423A93 for ; Fri, 8 Oct 2021 10:18:27 +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 id 18F8223A88 for ; Fri, 8 Oct 2021 10:18:27 +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 D4B804599F for ; Fri, 8 Oct 2021 10:18:26 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Fri, 8 Oct 2021 10:18:21 +0200 Message-Id: <20211008081821.3499530-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.343 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 v2 proxmox-acme] support downloading alternate chains 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: Fri, 08 Oct 2021 08:18:27 -0000 the current default chains end with an expired root certificate for maximum compatibility with old Android versions. this breaks some other older clients (openssl, gnutls) which don't expect chains to contain any expired certificates, even if they are 'above' the trust anchor. by setting $root, it is possible to specify which root the ACME provided certificate chain should end with, downloading alternate chains as necessary. Signed-off-by: Fabian Grünbichler --- Notes: v2: - only check issuer - also check default chain - add 'i' to RE check only tested with pebble src/PVE/ACME.pm | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm index 265482d..57578d7 100644 --- a/src/PVE/ACME.pm +++ b/src/PVE/ACME.pm @@ -442,17 +442,50 @@ sub deactivate_authorization { # Get certificate # GET-as-POST to order's certificate URL +# if $root is specified, attempts to find a matching (alternate) chain # Expects a '200 OK' reply # returns certificate chain in PEM format sub get_certificate { - my ($self, $order) = @_; + my ($self, $order, $root) = @_; $self->fatal("no certificate URL available (yet?)", $order) if !$order->{certificate}; + my $check_root = sub { + my ($chain) = @_; + + my @certs = PVE::Certificate::split_pem($chain); + my $root_pem = $certs[-1]; + + my ($file, $fh) = PVE::Tools::tempfile_contents($root_pem); + my $info = PVE::Certificate::get_certificate_info($file); + + return defined($info->{issuer}) && $info->{issuer} =~ m/\Q$root\E/i; + }; + my $r = $self->do(POST => $order->{certificate}, ''); my $return = eval { + # default chain my $res = __get_result($r, 200, 1); + if ($root && !$check_root->($res)) { + # alternate chains if requested and default didn't match + $res = undef; + my @links = $r->header('link'); + for my $link (@links) { + if ($link =~ /^<(.*)>;rel="alternate"$/) { + my $url = $1; + my $chain = eval { __get_result($self->do(POST => $url, ''), 200, 1); }; + die "failed to retrieve alternate chain from '$url' - $@\n" if $@; + if ($check_root->($chain)) { + $res = $chain; + last; + } + } + } + die "no matching alternate chain for '$root' returned by server\n" + if !defined($res); + } + if ($res =~ /^(-----BEGIN CERTIFICATE-----)(.+)(-----END CERTIFICATE-----)$/s) { # untaint return $1 . $2 . $3; } -- 2.30.2