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 3B8CD1FF0C0 for ; Wed, 18 Nov 2026 11:31:42 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id A9C70217CF; Wed, 18 Nov 2026 11:31:33 +0100 (CET) From: Thomas Ellmenreich To: pve-devel@lists.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 Message-ID: <20261118103127.165100-3-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: 1794997889196 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.341 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: EGUA4BP7ZSIGBOQ7VHZHA3QEV5Q3KABI X-Message-ID-Hash: EGUA4BP7ZSIGBOQ7VHZHA3QEV5Q3KABI 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: 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 --- 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