From: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
Subject: [PATCH common v2 11/11] pom parsing: allow for CRLF line ending
Date: Wed, 18 Nov 2026 11:31:25 +0100 [thread overview]
Message-ID: <20261118103127.165100-12-t.ellmenreich@proxmox.com> (raw)
In-Reply-To: <20261118103127.165100-1-t.ellmenreich@proxmox.com>
According to RFC 7468 CRLF line endings are allowed which means that our
functions should support this. We simply replace all CRLF line endings
with normal newlines to also produce coherent results.
Also add some tests to check that they are accepted as expected.
Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
src/PVE/Certificate.pm | 3 +++
test/certificate_utils_test.pl | 8 ++++++++
test/check_pem_test.pl | 18 ++++++++++++++++++
test/pem_to_der_test.pl | 11 +++++++++++
test/split_pem_test.pl | 21 +++++++++++++++++++++
5 files changed, 61 insertions(+)
diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index c89c9e2..d400ae7 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -165,6 +165,7 @@ sub strip_leading_text {
sub split_pem {
my ($content, %opts) = @_;
+ $content =~ s/\r\n/\n/g;
$content = trim_trailing_space($content);
my $footer = $footer_re->($opts{label} // $ANY_LABEL);
@@ -176,6 +177,7 @@ sub split_pem {
sub check_pem {
my ($content, %opts) = @_;
+ $content =~ s/\r\n/\n/g;
my $label = $opts{label} // ($opts{any_label} ? $ANY_LABEL : 'CERTIFICATE');
my $re = __pem_re($label);
@@ -211,6 +213,7 @@ sub check_pem {
sub pem_to_der {
my ($content) = @_;
+ $content =~ s/\r\n/\n/g;
my $header = $header_re->($ANY_LABEL);
my $footer = $footer_re->($ANY_LABEL);
diff --git a/test/certificate_utils_test.pl b/test/certificate_utils_test.pl
index 873a549..915076b 100755
--- a/test/certificate_utils_test.pl
+++ b/test/certificate_utils_test.pl
@@ -226,6 +226,14 @@ some extra content
TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+ },
+ {
+ name => "blank line after header",
+ expected_match => 1,
+ pem => q{-----BEGIN CERTIFICATE-----
+
+TG9yZW0gaXBzdW0=
-----END CERTIFICATE-----},
},
{
diff --git a/test/check_pem_test.pl b/test/check_pem_test.pl
index 73e9826..3c939fb 100755
--- a/test/check_pem_test.pl
+++ b/test/check_pem_test.pl
@@ -238,6 +238,24 @@ TG9yZW0gaXBzdW0=
TG9yZW0gaXBzdW0=
-----END EC PRIVATE KEY-----}
},
+ {
+ expected_success => 1,
+ name => "chain with crlf line endings",
+ multiple => 1,
+ pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+} =~ s/\n/\r\n/gr,
+ expected_result => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+ },
];
for my $data ($setup->@*) {
diff --git a/test/pem_to_der_test.pl b/test/pem_to_der_test.pl
index c35e1f4..debfed3 100755
--- a/test/pem_to_der_test.pl
+++ b/test/pem_to_der_test.pl
@@ -117,6 +117,17 @@ TG9yZW0gaXBzdW0gMw==
},
expected_decoded_result => "Lorem ipsum 1",
},
+ {
+ name => "multiple pem crlf line endings",
+ pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMQ==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0gMg==
+-----END CERTIFICATE-----
+} =~ s/\n/\r\n/gr,
+ expected_decoded_result => "Lorem ipsum 1",
+ },
{
name => "all in one line",
pem => "-----BEGIN CERTIFICATE-----TG9yZW0gaXBzdW0=-----END CERTIFICATE-----",
diff --git a/test/split_pem_test.pl b/test/split_pem_test.pl
index 02cce94..0e2f6be 100755
--- a/test/split_pem_test.pl
+++ b/test/split_pem_test.pl
@@ -239,6 +239,27 @@ TG9yZW0gaXBzdW0=
-----END LABEL B-----},
],
},
+ {
+ expected_success => 1,
+ name => "crlf line endings pem",
+ pem => q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+} =~ s/\n/\r\n/gr,
+
+ expected_result => [
+ q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----
+},
+ q{-----BEGIN CERTIFICATE-----
+TG9yZW0gaXBzdW0=
+-----END CERTIFICATE-----},
+ ],
+ },
];
for my $data ($setup->@*) {
--
2.47.3
prev parent reply other threads:[~2026-11-18 10:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-18 10:31 [PATCH common v2 00/11] pem parser: refactor parsing to cover more edge cases Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 01/11] certificate tests: use q{} for multiline strings Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 02/11] pem parser: add constant to match any label Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 03/11] pem parser: refactor check_pem to use list instead of string Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 04/11] pem parser: stricter handling of newlines Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 05/11] certificate formats: enable multiple parsing for pem-string format Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 06/11] pem parsing: strip all surrounding text from chain entries Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 07/11] pem parsing: make validation of pem entry stricter Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 08/11] pem parsing: default splitting to any label Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 09/11] pem to der: create clearer error boundary Thomas Ellmenreich
2026-11-18 10:31 ` [PATCH common v2 10/11] certificate tests: refactor and exapand testsuite Thomas Ellmenreich
2026-11-18 10:31 ` Thomas Ellmenreich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261118103127.165100-12-t.ellmenreich@proxmox.com \
--to=t.ellmenreich@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.