improve csrf backward compatibility

this patch follows the code in pve-access-control
e149b1c6c9954c07672d63f23f696d5b1e6c11d4)

and should enable us to update pve-common in PMG 5.x along with PVE again.

Tested by:
* logging into PMG (get csrf token)
a) installing only the previous patch:
   * POSTing (with the previously obtained token) -> 401
b) installing previous and this patch
   * POSTing (with the previously obtained token) -> 200

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/src/PMG/Ticket.pm b/src/PMG/Ticket.pm
index b1408da417df0221b025d470b38a03ecb2c7f396..1cef4a91bda8e248ed006909e3137f2e771b17df 100644 (file)
--- a/src/PMG/Ticket.pm
+++ b/src/PMG/Ticket.pm
@@ -132,6 +132,8 @@ PVE::INotify::register_file('auth_pub_key', $authpubkeyfn,
                            $read_rsa_pub_key, undef, undef,
                            noclone => 1);
 
+my $csrf_prevention_secret_legacy;
+
 my $read_csrf_secret = sub {
    my ($filename, $fh) = @_;
 
@@ -139,6 +141,8 @@ my $read_csrf_secret = sub {
 
    my $input = <$fh>;
 
+   $csrf_prevention_secret_legacy = Digest::SHA::sha1_base64($input);
+
    return Digest::SHA::hmac_sha256_base64($input);
 };
 
@@ -151,6 +155,15 @@ sub verify_csrf_prevention_token {
 
     my $secret = PVE::INotify::read_file('csrf_secret');
 
+    # FIXME: remove with PMG 7
+    if ($token =~ m/^([A-Z0-9]{8}):(\S+)$/) {
+        my $sig = $2;
+        if (length($sig) == 27) {
+            # the legacy secret got populated by read_file above
+            $secret = $csrf_prevention_secret_legacy;
+        }
+    }
+
     return PVE::Ticket::verify_csrf_prevention_token(
        $secret, $username, $token, $min_ticket_lifetime,
        $max_ticket_lifetime, $noerr);