proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-06-14 19:51:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

improve CSRF compat with older PVE

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-06-26 19:34:13 +02:00
parent a237dc2e76
commit e149b1c6c9
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/AccessControl.pm
View File

@ -212,10 +212,12 @@ sub rotate_authkey {
} }
my $csrf_prevention_secret; my $csrf_prevention_secret;
my $csrf_prevention_secret_legacy;
my $get_csrfr_secret = sub { my $get_csrfr_secret = sub {
if (!$csrf_prevention_secret) { if (!$csrf_prevention_secret) {
my $input = PVE::Tools::file_get_contents($pve_www_key_fn); my $input = PVE::Tools::file_get_contents($pve_www_key_fn);
$csrf_prevention_secret = Digest::SHA::hmac_sha256_base64($input); $csrf_prevention_secret = Digest::SHA::hmac_sha256_base64($input);
$csrf_prevention_secret_legacy = Digest::SHA::sha1_base64($input);
} }
return $csrf_prevention_secret; return $csrf_prevention_secret;
}; };
@ -231,7 +233,16 @@ sub assemble_csrf_prevention_token {
sub verify_csrf_prevention_token { sub verify_csrf_prevention_token {
my ($username, $token, $noerr) = @_; my ($username, $token, $noerr) = @_;
my $secret = &$get_csrfr_secret(); my $secret = $get_csrfr_secret->();
# FIXME: remove with PVE 7 and/or refactor all into PVE::Ticket ?
if ($token =~ m/^([A-Z0-9]{8}):(\S+)$/) {
my $sig = $2;
if (length($sig) == 27) {
# the legacy secret got populated by above get_csrfr_secret call
$secret = $csrf_prevention_secret_legacy;
}
}
return PVE::Ticket::verify_csrf_prevention_token( return PVE::Ticket::verify_csrf_prevention_token(
$secret, $username, $token, -300, $ticket_lifetime, $noerr); $secret, $username, $token, -300, $ticket_lifetime, $noerr);