Commit 26942c64 authored by Christophe Maudoux's avatar Christophe Maudoux

Improve conf tests

parent 59550d3a
...@@ -389,11 +389,12 @@ sub tests { ...@@ -389,11 +389,12 @@ sub tests {
# Warn if 2F dependencies seem missing # Warn if 2F dependencies seem missing
sfaDependencies => sub { sfaDependencies => sub {
my $enabled2fModule = 0; my $ok = 0;
foreach (qw(u totp utotp yubikey)) { foreach (qw(u totp utotp yubikey)) {
$enabled2fModule ||= $conf->{ $_ . '2fActivation' }; $ok ||= $conf->{ $_ . '2fActivation' };
last if ($ok);
} }
return 1 unless ($enabled2fModule); return 1 unless ($ok);
# Use TOTP # Use TOTP
if ( $conf->{totp2fActivation} if ( $conf->{totp2fActivation}
...@@ -500,10 +501,10 @@ sub tests { ...@@ -500,10 +501,10 @@ sub tests {
my $msg = ''; my $msg = '';
my $ok = 0; my $ok = 0;
foreach (qw(u totp yubikey)) { foreach (qw(u totp yubikey)) {
$ok ||= $conf->{ $_ . '2fActivation' } $ok ||= $conf->{ $_ . '2fActivation' }
&& $conf->{ $_ . '2fSelfRegistration' }; && $conf->{ $_ . '2fSelfRegistration' };
last if ($ok);
} }
$ok ||= $conf->{'utotp2fActivation'} $ok ||= $conf->{'utotp2fActivation'}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment