use PVE::JSONSchema qw(get_standard_option);
use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_lock_file);
-use Data::Dumper;
-
use base qw(PVE::SectionConfig);
my $domainconfigfile = "domains.cfg";
-cfs_register_file($domainconfigfile,
+cfs_register_file($domainconfigfile,
sub { __PACKAGE__->parse_config(@_); },
sub { __PACKAGE__->write_config(@_); });
PVE::JSONSchema::register_format('pve-realm', \&pve_verify_realm);
sub pve_verify_realm {
my ($realm, $noerr) = @_;
-
+
if ($realm !~ m/^${realm_regex}$/) {
return undef if $noerr;
- die "value does not look like a valid realm\n";
+ die "value does not look like a valid realm\n";
}
return $realm;
}
}
# we only allow a limited set of characters
- # colon is not allowed, because we store usernames in
+ # colon is not allowed, because we store usernames in
# colon separated lists)!
# slash is not allowed because it is used as pve API delimiter
- # also see "man useradd"
+ # also see "man useradd"
if ($username =~ m!^([^\s:/]+)\@(${realm_regex})$!) {
return wantarray ? ($username, $1, $2) : $username;
}
}
PVE::JSONSchema::register_standard_option('userid', {
- description => "User ID",
+ description => "User ID", title => "User ID",
type => 'string', format => 'pve-userid',
maxLength => 64,
});
foreach my $kvp (split(/,/, $data)) {
- if ($kvp =~ m/^type=(yubico)$/) {
+ if ($kvp =~ m/^type=(yubico|oath)$/) {
$res->{type} = $1;
} elsif ($kvp =~ m/^id=(\S+)$/) {
$res->{id} = $1;
$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;
}
-sub encrypt_pw {
- my ($pw) = @_;
-
- my $time = substr(Digest::SHA::sha1_base64 (time), 0, 8);
- return crypt(encode("utf8", $pw), "\$5\$$time\$");
-}
-
my $defaultData = {
propertyList => {
type => { description => "Realm type." },
sub write_config {
my ($class, $filename, $cfg) = @_;
- delete $cfg->{ids}->{pve};
- delete $cfg->{ids}->{pam};
-
foreach my $realm (keys %{$cfg->{ids}}) {
my $data = $cfg->{ids}->{$realm};
if ($data->{comment}) {
$data->{comment} = PVE::Tools::encode_text($data->{comment});
}
}
-
+
$class->SUPER::write_config($filename, $cfg);
}