From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 42BD01FF146 for ; Tue, 09 Jun 2026 15:16:12 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7D9E1112D1; Tue, 9 Jun 2026 15:16:03 +0200 (CEST) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox-acme 2/2] fix #5978: pem parser: relax parsing of chain entries: Date: Tue, 9 Jun 2026 15:15:08 +0200 Message-ID: <20260609131549.104216-3-t.ellmenreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260609131549.104216-1-t.ellmenreich@proxmox.com> References: <20260609131549.104216-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: 1781010911799 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.112 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 Message-ID-Hash: FT225IHMWQSHMYBZPGNATW7FES35DYPG X-Message-ID-Hash: FT225IHMWQSHMYBZPGNATW7FES35DYPG 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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm index e6fb9c2..ff10c22 100644 --- a/src/PVE/ACME.pm +++ b/src/PVE/ACME.pm @@ -530,9 +530,11 @@ sub get_certificate { if !defined($res); } - if ($res =~ /^(-----BEGIN CERTIFICATE-----)(.+)(-----END CERTIFICATE-----)$/s) { # untaint - return $1 . $2 . $3; - } + my $checked = PVE::Certificate::check_pem->($res, no_err => 1); + if (defined $checked) { + return $checked; + } + die "Server reply does not look like a PEM encoded certificate\n"; }; $self->fatal("POST of '$order->{certificate}' failed - $@", $r) if $@; -- 2.47.3