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 2070D1FF13A for ; Wed, 24 Jun 2026 12:57:56 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E70D91578C; Wed, 24 Jun 2026 12:57:55 +0200 (CEST) Date: Wed, 24 Jun 2026 12:57:18 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= Subject: Re: [PATCH proxmox-acme v2 2/2] fix #5978: pem parser: relax parsing of chain entries: To: pve-devel@lists.proxmox.com, Thomas Ellmenreich References: <20260617124251.89036-1-t.ellmenreich@proxmox.com> <20260617124251.89036-3-t.ellmenreich@proxmox.com> In-Reply-To: <20260617124251.89036-3-t.ellmenreich@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.17.0 (https://github.com/astroidmail/astroid) Message-Id: <1782298083.ygyuzbtfgd.astroid@yuna.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1782298628834 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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: 57YXXDAY2F7ILWDN5MW6WVSDQYS4DH4J X-Message-ID-Hash: 57YXXDAY2F7ILWDN5MW6WVSDQYS4DH4J X-MailFrom: f.gruenbichler@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 X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Reviewed-by: Fabian Gr=C3=BCnbichler (once patch #1 has the feedback adressed) On June 17, 2026 2:42 pm, Thomas Ellmenreich wrote: > 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. >=20 > Signed-off-by: Thomas Ellmenreich > --- > src/PVE/ACME.pm | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) >=20 > diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm > index e6fb9c2..4b06817 100644 > --- a/src/PVE/ACME.pm > +++ b/src/PVE/ACME.pm > @@ -530,10 +530,10 @@ sub get_certificate { > if !defined($res); > } > =20 > - if ($res =3D~ /^(-----BEGIN CERTIFICATE-----)(.+)(-----END CERTI= FICATE-----)$/s) { # untaint > - return $1 . $2 . $3; > - } > - die "Server reply does not look like a PEM encoded certificate\n= "; > + my $parsed =3D eval { PVE::Certificate::check_pem->($res) }; > + die "Server reply does not look like a PEM encoded certificate: = $@\n" > + if $@; > + return $parsed; > }; > $self->fatal("POST of '$order->{certificate}' failed - $@", $r) if $= @; > return $return; > --=20 > 2.47.3 >=20 >=20 >=20 >=20 >=20 >=20