OTP: support v2 secret format

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/src/PVE/OTP.pm b/src/PVE/OTP.pm
index 019076b444c9e914ef8e62a363bb1f2e73faac29..070ab59e48bb2684e48a3a4b6d4df9a563921e95 100644 (file)
--- a/src/PVE/OTP.pm
+++ b/src/PVE/OTP.pm
@@ -137,7 +137,13 @@ sub oath_verify_otp {
     foreach my $k (PVE::Tools::split_list($keys)) {
        # Note: we generate 3 values to allow small time drift
        my $binkey;
     foreach my $k (PVE::Tools::split_list($keys)) {
        # Note: we generate 3 values to allow small time drift
        my $binkey;

-       if ($k =~ /^[A-Z2-7=]{16}$/) {
+       if ($k =~ /^v2-0x([0-9a-fA-F]+)$/) {
+           # v2, hex
+           $binkey = pack('H*', $1);
+       } elsif ($k =~ /^v2-([A-Z2-7=]+)$/) {
+           # v2, base32
+           $binkey = MIME::Base32::decode_rfc3548($1);
+       } elsif ($k =~ /^[A-Z2-7=]{16}$/) {

            $binkey = MIME::Base32::decode_rfc3548($k);
        } elsif ($k =~ /^[A-Fa-f0-9]{40}$/) {
            $binkey = pack('H*', $k);
            $binkey = MIME::Base32::decode_rfc3548($k);
        } elsif ($k =~ /^[A-Fa-f0-9]{40}$/) {
            $binkey = pack('H*', $k);