From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 7F3BF1FF0C0 for ; Wed, 18 Nov 2026 11:31:57 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 62E73217F0; Wed, 18 Nov 2026 11:31:34 +0100 (CET) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH common v2 06/11] pem parsing: strip all surrounding text from chain entries Date: Wed, 18 Nov 2026 11:31:20 +0100 Message-ID: <20261118103127.165100-7-t.ellmenreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118103127.165100-1-t.ellmenreich@proxmox.com> References: <20261118103127.165100-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: 1794997889539 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.334 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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: M4LP2QF3JBLVDFUW5GZ66XCDDAPGX4I3 X-Message-ID-Hash: M4LP2QF3JBLVDFUW5GZ66XCDDAPGX4I3 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: Passing a chain that contains entries with different labels, but then specificing one of those labels leads to 'split_pem' only splitting on that specific label. This means that a single entry returned by 'split_pem' can contain multiple pem entries. That said it always contains a single entry of the specified label, so strip away any content before the BEGIN and after the END of the specified label. Signed-off-by: Thomas Ellmenreich --- src/PVE/Certificate.pm | 19 +++++++++++++++---- test/check_pem_test.pl | 8 +------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm index 0380250..84b97e8 100644 --- a/src/PVE/Certificate.pm +++ b/src/PVE/Certificate.pm @@ -139,6 +139,18 @@ my sub trim_trailing_space { return $content; } +my sub strip_surrounding_text { + my ($content, %opts) = @_; + + my $label = $opts{label} // $ANY_LABEL; + + my $header = $header_re->($label); + my $footer = $footer_re->($label); + $content =~ s/\A.*?(?=$header)//s; + $content =~ s/$footer\K.*\z//s; + return trim_trailing_space($content); +} + sub strip_leading_text { my ($content) = @_; @@ -177,15 +189,14 @@ sub check_pem { my @result_entries = (); for my $entry (@split) { - my $stripped = strip_leading_text($entry); - my $trimmed = trim_trailing_space($stripped); + my $stripped = strip_surrounding_text($entry, label => $label); - if ($trimmed !~ /$re/) { + if ($stripped !~ /$re/) { @result_entries = (); last; } - push @result_entries, $trimmed; + push @result_entries, $stripped; } my $result_pem = join "\n", @result_entries; diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl index d806f09..b1bb6f0 100755 --- a/test/check_pem_test.pl +++ b/test/check_pem_test.pl @@ -103,8 +103,7 @@ test some extended content}, expected_result => q{-----BEGIN CERTIFICATE----- test ------END CERTIFICATE----- -some extended content} +-----END CERTIFICATE-----} }, { expected_success => 0, @@ -154,11 +153,6 @@ TG9yZW0gaXBzdW0gMg== -----END CERTIFICATE-----}, expected_result => q{-----BEGIN CERTIFICATE----- TG9yZW0gaXBzdW0gMQ== ------END CERTIFICATE----- -Subject: CN=Org Issuing CA 3 -Issuer: CN=Org Root CA ------BEGIN CERTIFICATE----- -TG9yZW0gaXBzdW0gMg== -----END CERTIFICATE-----} }, { -- 2.47.3