From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [IPv6:2a0f:8001:1:32::40]) by lore.proxmox.com (Postfix) with ESMTPS id F37341FF142 for ; Fri, 03 Jul 2026 12:53:10 +0200 (CEST) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id C12DC21425; Fri, 03 Jul 2026 12:53:10 +0200 (CEST) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-acme v3 2/2] fix #5978: pem parser: relax parsing of chain entries: Date: Fri, 3 Jul 2026 12:51:33 +0200 Message-ID: <20260703105133.77817-3-t.ellmenreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260703105133.77817-1-t.ellmenreich@proxmox.com> References: <20260703105133.77817-1-t.ellmenreich@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1783075948245 X-SPAM-LEVEL: Spam detection results: 0 DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: 2MWDWIIKJ3I6TYCEYZHVFJNGHSGOULHO X-Message-ID-Hash: 2MWDWIIKJ3I6TYCEYZHVFJNGHSGOULHO X-MailFrom: t.ellmenreich@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Thomas Ellmenreich X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Instead of using a custom regex to parse pem chains, now uses the pve-common Certificate::check_pem function to do so. This now allows for additional text and whitespace inbetween the chain entries. Signed-off-by: Thomas Ellmenreich --- src/PVE/ACME.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm index e6fb9c2..7adda25 100644 --- a/src/PVE/ACME.pm +++ b/src/PVE/ACME.pm @@ -526,14 +526,15 @@ sub get_certificate { } } } - die "no matching alternate chain for '$root' returned by server\n" + die "no matching alternate chain for '$root' provided by the acme server\n" if !defined($res); } - if ($res =~ /^(-----BEGIN CERTIFICATE-----)(.+)(-----END CERTIFICATE-----)$/s) { # untaint - return $1 . $2 . $3; - } - die "Server reply does not look like a PEM encoded certificate\n"; + my $parsed = eval { PVE::Certificate::check_pem($res, multiple => 1) }; + die + "value returned by acme certificate url does not look like a PEM encoded certificate: $@\n" + if $@; + return $parsed; }; $self->fatal("POST of '$order->{certificate}' failed - $@", $r) if $@; return $return; -- 2.47.3