dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve sfRequired test

Browse Source
This commit is contained in:
Christophe Maudoux 2018-08-31 23:47:36 +02:00
parent a26b7867ca
commit 338abbbc5f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
View File

@ -498,21 +498,21 @@ sub tests {
required2FA => sub {
return 1 unless ( $conf->{sfRequired} );
my $enable2fModule = 0;
foreach (qw(u totp utotp yubikey)) {
$enable2fModule ||= $conf->{ $_ . '2fActivation' };
}
my $registrable2fModule = 0;
my $msg = '';
my $ok = 0;
foreach (qw(u totp yubikey)) {
$registrable2fModule ||= $conf->{ $_ . '2fSelfRegistration' };
$ok ||= $conf->{ $_ . '2fActivation' }
&& $conf->{ $_ . '2fSelfRegistration' };
}
return ( 1,
"At least one self registrable 2F module should be enabled to require 2FA"
) unless ( $enable2fModule && $registrable2fModule );
$ok ||= $conf->{'utotp2fActivation'}
&& ( $conf->{'u2fSelfRegistration'}
|| $conf->{'totp2fSelfRegistration'} );
$msg = "A self registrable module should be enabled to require 2FA"
unless ($ok);
# Return
return 1;
return ( 1, $msg );
},
# Error if external 2F Send or Validate command is missing