Merge pull request #210 from creative-commoners/pulls/4.0/disable-mfa…

…-without-methods FIX No longer redirects to MFA when no methods are installed on the system
silverstripe · Jun 24, 2019 · a91ebbe · a91ebbe
2 parents 5784419 + a2dc9ff
commit a91ebbe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Service/EnforcementManager.php b/src/Service/EnforcementManager.php
@@ -100,6 +100,10 @@ public function shouldRedirectToMFA(Member $member): bool
             return false;
         }
 
+        if (empty(MethodRegistry::singleton()->getMethods())) {
+            return false;
+        }
+
         if ($member->RegisteredMFAMethods()->exists()) {
             return true;
         }

diff --git a/tests/php/Service/EnforcementManagerTest.php b/tests/php/Service/EnforcementManagerTest.php
@@ -153,6 +153,18 @@ public function testShouldNotRedirectToMFAWhenConfigIsDisabled()
         $this->assertFalse($shouldRedirect);
     }
 
+    public function testShouldNotRedirectToMFAWhenNoMethodsAreRegisteredInTheSystem()
+    {
+        $this->setSiteConfig(['MFARequired' => true]);
+        MethodRegistry::config()->set('methods', []);
+
+        /** @var Member $member */
+        $member = $this->objFromFixture(Member::class, 'sally_smith');
+        $this->logInAs($member);
+
+        $this->assertFalse(EnforcementManager::create()->shouldRedirectToMFA($member));
+    }
+
     /**
      * Helper method for changing the current SiteConfig values
      *