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 6188B1FF0C0 for ; Wed, 18 Nov 2026 11:32:49 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 781CD21901; Wed, 18 Nov 2026 11:31:42 +0100 (CET) From: Thomas Ellmenreich To: pve-devel@lists.proxmox.com Subject: [PATCH common v2 04/11] pem parser: stricter handling of newlines Date: Wed, 18 Nov 2026 11:31:18 +0100 Message-ID: <20261118103127.165100-5-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: 1794997889327 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.326 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: NMBIZWMHMI4A76H4LEHX3P7UTJ4YV5B6 X-Message-ID-Hash: NMBIZWMHMI4A76H4LEHX3P7UTJ4YV5B6 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: Headers and footers are now expected to be at the start of the line and to have a newline (or end of string) following them. Then, when checking each PEM entry, remove any trailing newlines and join the resulting list of entries with newlines between them to ensure consistent trailing newlines. The tests have also been updated accordingly. Signed-off-by: Thomas Ellmenreich --- src/PVE/Certificate.pm | 21 ++++++--- test/check_pem_test.pl | 96 +++++++++++++++++------------------------- test/split_pem_test.pl | 77 +++++++++++++++++++++++++-------- 3 files changed, 114 insertions(+), 80 deletions(-) diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm index 8e6305a..b0574fa 100644 --- a/src/PVE/Certificate.pm +++ b/src/PVE/Certificate.pm @@ -109,12 +109,14 @@ PVE::JSONSchema::register_standard_option( my $header_re = sub { my ($label) = @_; - return qr!-----BEGIN\ $label-----(?:\s|\n)*!; + return qr!(?m:^)-----BEGIN\ $label-----(?:\s|\n)*\n(?:\s|\n)*!; }; + my $footer_re = sub { my ($label) = @_; - return qr!-----END\ $label-----(?:\s|\n)*!; + return qr!(?m:^)-----END\ $label-----(?:\z|\n(?=\s*\S))!; }; + my $pem_re = sub { my ($label) = @_; @@ -130,6 +132,13 @@ my $pem_re = sub { }x; }; +my sub trim_trailing_space { + my ($content) = @_; + + $content =~ s/\s+\z//g; + return $content; +} + sub strip_leading_text { my ($content) = @_; @@ -142,6 +151,7 @@ sub strip_leading_text { sub split_pem { my ($content, %opts) = @_; + $content = trim_trailing_space($content); my $footer = $footer_re->($opts{label} // 'CERTIFICATE'); return $content =~ /(.*?$footer)/sg; @@ -168,15 +178,16 @@ sub check_pem { my @result_entries = (); for my $entry (@split) { my $stripped = strip_leading_text($entry); + my $trimmed = trim_trailing_space($stripped); - if ($stripped !~ /^$re$/) { + if ($trimmed !~ /$re/) { @result_entries = (); last; } - push @result_entries, $stripped; + push @result_entries, $trimmed; } - my $result_pem = join "", @result_entries; + my $result_pem = join "\n", @result_entries; return $result_pem if $result_pem; diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl index 176194d..d806f09 100755 --- a/test/check_pem_test.pl +++ b/test/check_pem_test.pl @@ -25,8 +25,7 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID SAAwRQIhANfakefakefakefakefakefakefakefakefake ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -42,16 +41,14 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID SAAwRQIhANfakefakefakefakefakefakefakefakefake ------END SOME LABEL----- -}, +-----END SOME LABEL-----}, }, { expected_success => 1, name => "simple pem", pem => q{-----BEGIN CERTIFICATE----- test ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -60,15 +57,13 @@ test test ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { - expected_success => 1, + expected_success => 0, name => "only newline pem", pem => q{-----BEGIN CERTIFICATE----- ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -77,15 +72,13 @@ test ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 0, name => "no content pem", pem => q{ ------BEGIN CERTIFICATE----------END CERTIFICATE----- -}, +-----BEGIN CERTIFICATE----------END CERTIFICATE-----}, }, { expected_success => 1, @@ -94,23 +87,24 @@ test some extended content -----BEGIN CERTIFICATE----- test ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => q{-----BEGIN CERTIFICATE----- test ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { - expected_success => 0, + expected_success => 1, name => "following content pem", pem => q{ -----BEGIN CERTIFICATE----- test -----END CERTIFICATE----- -some extended content -}, +some extended content}, + expected_result => q{-----BEGIN CERTIFICATE----- +test +-----END CERTIFICATE----- +some extended content} }, { expected_success => 0, @@ -125,8 +119,7 @@ some extended content pem => q{ -----END CERTIFICATE----- test ------BEGIN CERTIFICATE----- -}, +-----BEGIN CERTIFICATE-----}, }, { expected_success => 1, @@ -143,30 +136,30 @@ test -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- 42JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { - expected_success => 0, + expected_success => 1, name => "multiple as single pem", pem => q{ Subject: CN=some.test.content Issuer: CN=Org Issuing CA 3 -----BEGIN CERTIFICATE----- -1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i -dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h -dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 -c2JlZ2tseTxzZWl2IGF3ZWlidm4= +TG9yZW0gaXBzdW0gMQ== -----END CERTIFICATE----- Subject: CN=Org Issuing CA 3 Issuer: CN=Org Root CA -----BEGIN CERTIFICATE----- -2WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i -dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h -dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 -c2JlZ2tseTxzZWl2IGF3ZWlidm4= +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-----} }, { expected_success => 1, @@ -188,8 +181,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => q{-----BEGIN CERTIFICATE----- 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h @@ -201,8 +193,7 @@ c2JlZ2tseTxzZWl2IGF3ZWlidm4= dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -233,8 +224,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END LABEL----- -}, +-----END LABEL-----}, expected_result => q{-----BEGIN LABEL----- 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i @@ -253,8 +243,7 @@ c2JlZ2tseTxzZWl2IGF3ZWlidm4= dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END LABEL----- -}, +-----END LABEL-----}, }, { expected_success => 1, @@ -267,15 +256,13 @@ Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authorit dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => q{-----BEGIN CERTIFICATE----- 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 0, @@ -311,9 +298,7 @@ Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authorit dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- - -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -324,8 +309,7 @@ c2JlZ2tseTxzZWl2IGF3ZWlidm4= dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -339,15 +323,13 @@ Issuer: CN=The Orgs Name RootCA 2015,O=The Orgs name Institutions Cert. Authorit dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => q{-----BEGIN CERTIFICATE----- 1WtzZGhmbGtqYXNoZ2RmaXVwYWJ2aXV1YXdlYmxmamlraGFzZGtmYWlzdXBkdW5i dmFpdXdlYmdtheseZ2RmaXVwYWJ2aXV1YXdlYmxmamlraWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, ]; diff --git a/test/split_pem_test.pl b/test/split_pem_test.pl index c4c79c4..fdc961e 100755 --- a/test/split_pem_test.pl +++ b/test/split_pem_test.pl @@ -26,8 +26,7 @@ ZXN0IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEv5Q8q1p7qZ2gqkQ0Qn5x MFEwHQYDVR0OBBYEFOu2Y0bq8v3z7qkq1m1Qwqkq1m1QMB8GA1UdIwQYMBaAFOu2 Y0bq8v3z7qkq1m1Qwqkq1m1QMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID SAAwRQIhANfakefakefakefakefakefakefakefakefake ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -44,8 +43,7 @@ SAAwRQIhANfakefakefakefakefakefakefakefakefake -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- 42JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => [ q{ @@ -66,10 +64,60 @@ SAAwRQIhANfakefakefakefakefakefakefakefakefake q{-----BEGIN CERTIFICATE----- 42JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE-----}, + ], + }, + { + expected_success => 1, + name => "trailing newline pem", + pem => q{ +-----BEGIN CERTIFICATE----- +12JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +42JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE----- +}, + + expected_result => [ + q{ +-----BEGIN CERTIFICATE----- +12JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE----- +}, + + q{-----BEGIN CERTIFICATE----- +42JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE-----}, + ], + }, + { + expected_success => 1, + name => "trailing text pem", + pem => q{ +-----BEGIN CERTIFICATE----- +12JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +42JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE----- +some test text +}, + + expected_result => [ + q{ +-----BEGIN CERTIFICATE----- +12JlZ2tseTxzZWl2IGF3ZWlidm4= +-----END CERTIFICATE----- +}, + + q{-----BEGIN CERTIFICATE----- +42JlZ2tseTxzZWl2IGF3ZWlidm4= -----END CERTIFICATE----- }, ], }, + { expected_success => 1, name => "leading and interleaved text pem", @@ -97,8 +145,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => [ q{ @@ -129,8 +176,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, ], }, { @@ -158,8 +204,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, }, { expected_success => 1, @@ -178,8 +223,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, expected_result => [ q{ @@ -197,8 +241,7 @@ Issuer: CN=Org Root CA dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= ------END CERTIFICATE----- -}, +-----END CERTIFICATE-----}, ], }, @@ -213,8 +256,7 @@ dmFpdXdlYmdmw7ZrYWpkc2JoZmdpYXNkbmJpZnVhYmdzaWprZmdyYXNkaHJmaW9h dXNkbmF1c2JmZ3ZramFzZGJma2phc2RibmZpanVhIHNkb3ZuYmF3b3VlYmZnb2F3 c2JlZ2tseTxzZWl2IGF3ZWlidm4= Subject: CN=Org Issuing CA 3 -Issuer: CN=Org Root CA -}, +Issuer: CN=Org Root CA}, }, { expected_success => 1, @@ -226,8 +268,7 @@ Issuer: CN=Org Root CA -----BEGIN CERTIFICATE----- 42JlZ2tseTxzZWl2IGF3ZWlidm4= -----END CERTIFICATE----- -some more text that we would like to remove -}, +some more text that we would like to remove}, expected_result => [ q{ -- 2.47.3