public inbox for pve-devel@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 proxmox-acme 2/2] fix #5978: pem parser: relax parsing of chain entries:
Date: Tue,  9 Jun 2026 15:15:08 +0200	[thread overview]
Message-ID: <20260609131549.104216-3-t.ellmenreich@proxmox.com> (raw)
In-Reply-To: <20260609131549.104216-1-t.ellmenreich@proxmox.com>

Instead of using a custom regex to parse pem chains, now uses
the pve-common Certificate::check_pem function to do so. This
now allows for additional text and whitespace inbetween the
chain entries.

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

diff --git a/src/PVE/ACME.pm b/src/PVE/ACME.pm
index e6fb9c2..ff10c22 100644
--- a/src/PVE/ACME.pm
+++ b/src/PVE/ACME.pm
@@ -530,9 +530,11 @@ sub get_certificate {
                 if !defined($res);
         }
 
-        if ($res =~ /^(-----BEGIN CERTIFICATE-----)(.+)(-----END CERTIFICATE-----)$/s) { # untaint
-            return $1 . $2 . $3;
-        }
+        my $checked = PVE::Certificate::check_pem->($res, no_err => 1);
+        if (defined $checked) {
+            return $checked;
+        } 
+
         die "Server reply does not look like a PEM encoded certificate\n";
     };
     $self->fatal("POST of '$order->{certificate}' failed - $@", $r) if $@;
-- 
2.47.3





      parent reply	other threads:[~2026-06-09 13:16 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-09 13:15 [PATCH common/proxmox-acme 0/2] fix #5978: pem parser: relax parsing of chain entries Thomas Ellmenreich
2026-06-09 13:15 ` [PATCH common 1/2] fix #5978: pem parser: relax parsing of chain entries: Thomas Ellmenreich
2026-06-09 13:15 ` 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=20260609131549.104216-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal