From: Max Carrara <m.carrara@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 manager 1/2] fix #4552: certhelpers: check if custom cert and key match on change
Date: Fri, 3 Mar 2023 18:57:04 +0100 [thread overview]
Message-ID: <20230303175705.214121-4-m.carrara@proxmox.com> (raw)
In-Reply-To: <20230303175705.214121-1-m.carrara@proxmox.com>
It is now checked whether the new custom SSL certificate actually
matches the provided or existing custom key.
Also, the new custom certificate and key pair is now validated
*before* it is used or replaced with the existing pair. Safety copies
are still made; if a pair is currently in use, it is therefore left
untouched until the new one is valid.
Signed-off-by: Max Carrara <m.carrara@proxmox.com>
---
PVE/CertHelpers.pm | 65 ++++++++++++++++++++++++++++++++++++++++------
1 file changed, 57 insertions(+), 8 deletions(-)
diff --git a/PVE/CertHelpers.pm b/PVE/CertHelpers.pm
index 7e088cb9..826f39bc 100644
--- a/PVE/CertHelpers.pm
+++ b/PVE/CertHelpers.pm
@@ -53,12 +53,15 @@ sub cert_lock {
sub set_cert_files {
my ($cert, $key, $path_prefix, $force) = @_;
- my ($old_cert, $old_key, $info);
+ my $info;
my $cert_path = "${path_prefix}.pem";
my $cert_path_tmp = "${path_prefix}.pem.old";
+ my $cert_path_new = "${path_prefix}.pem.new";
+
my $key_path = "${path_prefix}.key";
my $key_path_tmp = "${path_prefix}.key.old";
+ my $key_path_new = "${path_prefix}.key.new";
die "Custom certificate file exists but force flag is not set.\n"
if !$force && -e $cert_path;
@@ -69,26 +72,72 @@ sub set_cert_files {
PVE::Tools::file_copy($key_path, $key_path_tmp) if -e $key_path;
eval {
- PVE::Tools::file_set_contents($cert_path, $cert);
- PVE::Tools::file_set_contents($key_path, $key) if $key;
+ PVE::Tools::file_set_contents($cert_path_new, $cert);
+
+ if ($key) {
+ PVE::Tools::file_set_contents($key_path_new, $key);
+ } elsif (-e $key_path) {
+ PVE::Tools::file_copy($key_path, $key_path_new);
+ } else {
+ die "Cannot set custom certificate without key.\n";
+ }
+
+ die "Custom certificate does not match provided key.\n"
+ if !PVE::Certificate::certificate_matches_key($cert_path_new, $key_path_new);
+
+ PVE::Tools::file_copy($cert_path_new, $cert_path);
+ PVE::Tools::file_copy($key_path_new, $key_path);
+
$info = PVE::Certificate::get_certificate_info($cert_path);
};
my $err = $@;
if ($err) {
- if (-e $cert_path_tmp && -e $key_path_tmp) {
+ if (-e $cert_path_new) {
+ eval {
+ warn "Removing uploaded certificate...\n";
+ unlink $cert_path_new;
+ };
+ warn "$@\n" if $@;
+ }
+ if (-e $cert_path_tmp) {
eval {
- warn "Attempting to restore old certificate files..\n";
+ warn "Restoring previous certificate...\n";
PVE::Tools::file_copy($cert_path_tmp, $cert_path);
+ unlink $cert_path_tmp;
+ };
+ warn "$@\n" if $@;
+ }
+ if (-e $key_path_new) {
+ eval {
+ if ($key) {
+ warn "Removing uploaded key...\n";
+ } else {
+ warn "Removing temporary copy of key...\n";
+ }
+ unlink $key_path_new;
+ };
+ warn "$@\n" if $@;
+ }
+ if (-e $key_path_tmp) {
+ eval {
+ warn "Restoring previous key...\n";
PVE::Tools::file_copy($key_path_tmp, $key_path);
+ unlink $key_path_tmp;
};
warn "$@\n" if $@;
}
- die "Setting certificate files failed - $err\n"
+ die "Setting certificate files failed - $err\n";
}
- unlink $cert_path_tmp;
- unlink $key_path_tmp;
+ for my $path (
+ $cert_path_tmp,
+ $cert_path_new,
+ $key_path_tmp,
+ $key_path_new,
+ ) {
+ unlink $path if -e $path;
+ }
return $info;
}
--
2.30.2
next prev parent reply other threads:[~2023-03-03 17:57 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-03 17:57 [pve-devel] [PATCH-SERIES v2 common/manager] Fix SSL Certificate and Key Upload Issues Max Carrara
2023-03-03 17:57 ` [pve-devel] [PATCH v2 common 1/2] certificate: add subroutine that checks if cert and key match Max Carrara
2023-03-07 10:52 ` [pve-devel] applied: " Fabian Grünbichler
2023-03-07 17:47 ` Thomas Lamprecht
2023-03-03 17:57 ` [pve-devel] [PATCH v2 common 2/2] certificate: fix formatting and whitespace Max Carrara
2023-03-07 10:52 ` [pve-devel] applied: " Fabian Grünbichler
2023-03-03 17:57 ` Max Carrara [this message]
2023-03-07 11:07 ` [pve-devel] [PATCH v2 manager 1/2] fix #4552: certhelpers: check if custom cert and key match on change Fabian Grünbichler
2023-03-07 15:45 ` Max Carrara
2023-03-03 17:57 ` [pve-devel] [PATCH v2 manager 2/2] ui: cert upload: fix private key field sending empty string Max Carrara
2023-03-07 10:53 ` Fabian Grünbichler
2023-03-07 18:33 ` Thomas Lamprecht
2023-03-08 6:34 ` Thomas Lamprecht
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=20230303175705.214121-4-m.carrara@proxmox.com \
--to=m.carrara@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