all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
To: pve-devel@lists.proxmox.com
Cc: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
Subject: [PATCH common v2 02/11] pem parser: add constant to match any label
Date: Wed, 18 Nov 2026 11:31:16 +0100	[thread overview]
Message-ID: <20261118103127.165100-3-t.ellmenreich@proxmox.com> (raw)
In-Reply-To: <20261118103127.165100-1-t.ellmenreich@proxmox.com>

Instead of defining a regex to match any pem label multiple times,
define a single constant that can be reused.

check_pem now also accepts a 'any_label' parameter that makes the
subroutine use the new constant as a label.

The new any label as also changed to still match any character, but not
two consecutive dashes. According to RFC 7468 the label can contain one
but not two consecutive dashes.

Signed-off-by: Thomas Ellmenreich <t.ellmenreich@proxmox.com>
---
 src/PVE/Certificate.pm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/PVE/Certificate.pm b/src/PVE/Certificate.pm
index 589bce8..a046dc8 100644
--- a/src/PVE/Certificate.pm
+++ b/src/PVE/Certificate.pm
@@ -14,6 +14,9 @@ use PVE::JSONSchema qw(get_standard_option);
 Net::SSLeay::load_error_strings();
 Net::SSLeay::randomize();
 
+# RFC 7468 allows a single dash, so only dissallow 2 consecutive dashes
+my $ANY_LABEL = qr/(?:(?!--).)+?/;
+
 PVE::JSONSchema::register_format(
     'pem-certificate',
     sub {
@@ -37,7 +40,7 @@ PVE::JSONSchema::register_format(
     sub {
         my ($content, $noerr) = @_;
 
-        return check_pem($content, noerr => $noerr, label => qr/.*?/);
+        return check_pem($content, noerr => $noerr, any_label => 1);
     },
 );
 
@@ -130,7 +133,7 @@ my $pem_re = sub {
 sub strip_leading_text {
     my ($content) = @_;
 
-    my $header = $header_re->(qr/.*?/);
+    my $header = $header_re->($ANY_LABEL);
     $content =~ s/^.*?(?=$header)//s;
     return $content;
 }
@@ -149,7 +152,7 @@ sub split_pem {
 sub check_pem {
     my ($content, %opts) = @_;
 
-    my $label = $opts{label} // 'CERTIFICATE';
+    my $label = $opts{label} // ($opts{any_label} ? $ANY_LABEL : 'CERTIFICATE');
     my $re = $pem_re->($label);
 
     my @split =
@@ -183,8 +186,8 @@ sub check_pem {
 sub pem_to_der {
     my ($content) = @_;
 
-    my $header = $header_re->(qr/.*?/);
-    my $footer = $footer_re->(qr/.*?/);
+    my $header = $header_re->($ANY_LABEL);
+    my $footer = $footer_re->($ANY_LABEL);
 
     $content = strip_leading_text($content);
 
-- 
2.47.3





  parent reply	other threads:[~2026-11-18 10:31 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 ` Thomas Ellmenreich [this message]
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 ` [PATCH common v2 11/11] pom parsing: allow for CRLF line ending Thomas Ellmenreich

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-3-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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal