proxmox-mirrors/pve-access-control
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-access-control synced 2025-08-12 10:02:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use a property string for tfa config

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2019-04-02 12:21:56 +02:00 committed by Thomas Lamprecht
parent 18f8ba1803
commit 9401be39cb
1 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
PVE/Auth/Plugin.pm
View File

@ -81,16 +81,50 @@ PVE::JSONSchema::register_standard_option('userid', {
maxLength => 64, maxLength => 64,
}); });
PVE::JSONSchema::register_format('pve-tfa-config', \&verify_tfa_config); my $tfa_format = {
sub verify_tfa_config { type => {
my ($value, $noerr) = @_; description => "The type of 2nd factor authentication.",
format_description => 'TFATYPE',
type => 'string',
enum => [qw(yubico oath)],
},
id => {
description => "Yubico API ID.",
format_description => 'ID',
type => 'string',
optional => 1,
},
key => {
description => "Yubico API Key.",
format_description => 'KEY',
type => 'string',
optional => 1,
},
url => {
description => "Yubico API URL.",
format_description => 'URL',
type => 'string',
optional => 1,
},
digits => {
description => "TOTP digits.",
format_description => 'COUNT',
type => 'integer',
minimum => 6, maximum => 8,
default => 6,
optional => 1,
},
step => {
description => "TOTP time period.",
format_description => 'SECONDS',
type => 'integer',
minimum => 10,
default => 30,
optional => 1,
},
};
return $value if parse_tfa_config($value); PVE::JSONSchema::register_format('pve-tfa-config', $tfa_format);
return undef if $noerr;
die "unable to parse tfa option\n";
}
PVE::JSONSchema::register_standard_option('tfa', { PVE::JSONSchema::register_standard_option('tfa', {
description => "Use Two-factor authentication.", description => "Use Two-factor authentication.",
@ -102,30 +136,7 @@ PVE::JSONSchema::register_standard_option('tfa', {
sub parse_tfa_config { sub parse_tfa_config {
my ($data) = @_; my ($data) = @_;
my $res = {}; return PVE::JSONSchema::parse_property_string($tfa_format, $data);
foreach my $kvp (split(/,/, $data)) {
if ($kvp =~ m/^type=(yubico|oath)$/) {
$res->{type} = $1;
} elsif ($kvp =~ m/^id=(\S+)$/) {
$res->{id} = $1;
} elsif ($kvp =~ m/^key=(\S+)$/) {
$res->{key} = $1;
} elsif ($kvp =~ m/^url=(\S+)$/) {
$res->{url} = $1;
} elsif ($kvp =~ m/^digits=([6|7|8])$/) {
$res->{digits} = $1;
} elsif ($kvp =~ m/^step=([1-9]\d+)$/) {
$res->{step} = $1;
} else {
return undef;
}
}
return undef if !$res->{type};
return $res;
} }
my $defaultData = { my $defaultData = {