Merge pull request #1017 from rochamarcelo/feature/correctly-load-web…

…authn Correcly load classed for webauthn
CakeDC · Jan 16, 2023 · 47897d9 · 47897d9
2 parents 1aafd0b + 6870345
commit 47897d9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/Loader/AuthenticationServiceLoader.php b/src/Loader/AuthenticationServiceLoader.php
@@ -84,6 +84,7 @@ protected function loadTwoFactorAuthenticator($service)
     {
         if (
             Configure::read('OneTimePasswordAuthenticator.login') !== false
+            || Configure::read('Webauthn2fa.enabled') !== false
             || Configure::read('U2f.enabled') !== false
         ) {
             $service->loadAuthenticator('CakeDC/Auth.TwoFactor', [

diff --git a/src/Loader/MiddlewareQueueLoader.php b/src/Loader/MiddlewareQueueLoader.php
@@ -97,6 +97,7 @@ protected function load2faMiddleware(MiddlewareQueue $middlewareQueue)
     {
         if (
             Configure::read('OneTimePasswordAuthenticator.login') !== false
+            || Configure::read('Webauthn2fa.enabled') !== false
             || Configure::read('U2f.enabled') !== false
         ) {
             $middlewareQueue->add(TwoFactorMiddleware::class);

diff --git a/tests/TestCase/Provider/AuthenticationServiceProviderTest.php b/tests/TestCase/Provider/AuthenticationServiceProviderTest.php
@@ -114,7 +114,9 @@ public function testGetAuthenticationService()
         ];
         $actual = [];
         foreach ($authenticators as $key => $value) {
-            $actual[get_class($value)] = $value->getConfig();
+            $config = $value->getConfig();
+            unset($config['impersonateSessionKey']);
+            $actual[get_class($value)] = $config;
         }
         $this->assertEquals($expected, $actual);
 
@@ -144,7 +146,9 @@ public function testGetAuthenticationService()
         ];
         $actual = [];
         foreach ($identifiers as $key => $value) {
-            $actual[get_class($value)] = $value->getConfig();
+            $config = $value->getConfig();
+            unset($config['impersonateSessionKey'], $config['hashAlgorithm']);
+            $actual[get_class($value)] = $config;
         }
         $this->assertEquals($expected, $actual);
     }
@@ -242,7 +246,9 @@ public function testGetAuthenticationServiceWithoutOneTimePasswordAuthenticator(
         ];
         $actual = [];
         foreach ($authenticators as $key => $value) {
-            $actual[get_class($value)] = $value->getConfig();
+            $config = $value->getConfig();
+            unset($config['impersonateSessionKey']);
+            $actual[get_class($value)] = $config;
         }
         $this->assertEquals($expected, $actual);
     }