From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Wed, 19 Jun 2019 09:46:18 +0000 (+0200)
Subject: ticket: reorder calls when rotating
X-Git-Url: https://git.proxmox.com/?p=pve-access-control.git;a=commitdiff_plain;h=e770e6672fdb54c30a787d71043a84b010a8e67f;hp=5bb966fe5d6f3f6a30e86724c024f80ebebacfba

ticket: reorder calls when rotating

to shrink the window between the two file_set_contents calls. we don't
need the mtimes to line up exactly since we have 300s of uncertainty
anyway, but generating an RSA key could take a while ;)

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---

diff --git a/PVE/AccessControl.pm b/PVE/AccessControl.pm
index fff2df2..0132268 100644
--- a/PVE/AccessControl.pm
+++ b/PVE/AccessControl.pm
@@ -166,6 +166,7 @@ sub rotate_authkey {
 	return if check_authkey();
 
 	my $old = get_pubkey();
+	my $new = Crypt::OpenSSL::RSA->generate_key(2048);
 
 	if ($old) {
 	    eval {
@@ -175,7 +176,6 @@ sub rotate_authkey {
 	    die "Failed to store old auth key: $@\n" if $@;
 	}
 
-	my $new = Crypt::OpenSSL::RSA->generate_key(2048);
 	eval {
 	    my $pem = $new->get_public_key_x509_string();
 	    PVE::Tools::file_set_contents($pve_auth_key_files->{pub}, $pem);