From 338abbbc5f723daf4df84df5e61b8aa939736beb Mon Sep 17 00:00:00 2001
From: Christophe Maudoux <chrmdx@gmail.com>
Date: Fri, 31 Aug 2018 23:47:36 +0200
Subject: [PATCH] Improve sfRequired test

---
 .../lib/Lemonldap/NG/Manager/Conf/Tests.pm    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
index c17f7a491..45505e0cd 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Tests.pm
@@ -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