10.next cake5 Add the ability to use a callback in bypassAuth in permissions

.github/workflows/ci.yml

@@ -16,9 +16,11 @@ jobs:
         prefer-lowest: ['']
 
     steps:
-      - name: Setup MySQL latest
+      - name: Setup MySQL 8.0
         if: matrix.db-type == 'mysql'
-        run: docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=cakephp -p 3306:3306 -d mysql --default-authentication-plugin=mysql_native_password --disable-log-bin
+        run: |
+          sudo service mysql start
+          mysql -h 127.0.0.1 -u root -proot -e 'CREATE DATABASE cakephp;'
 
       - name: Setup PostgreSQL latest
         if: matrix.db-type == 'pgsql'

src/Rbac/Rbac.php

@@ -170,7 +170,11 @@ protected function _matchPermission(array $permission, array|ArrayAccess $user,
             'action' => $params['action'] ?? null,
             'role' => $role,
         ];
-        if (!$user && ($permission['bypassAuth'] ?? false) !== true) {
+        $bypass = $permission['bypassAuth'] ?? false;
+        if (is_callable($bypass)) {
+            $bypass = $bypass($user, $role, $request);
+        }
+        if (!$user && $bypass !== true) {
             return null;
         }
         foreach ($permission as $key => $value) {

tests/TestCase/Authenticator/CookieAuthenticatorTest.php

@@ -59,7 +59,6 @@ public function testPersistIdentity($setCookie, $field, array $post, array $sess
             'Authentication.Password',
         ]);
         $uri = new Uri('/login');
-        $uri->base = null;
         $request = new ServerRequest();
         $request = $request->withUri($uri);
 

tests/TestCase/Authenticator/TwoFactorAuthenticatorTest.php

@@ -30,7 +30,6 @@ class TwoFactorAuthenticatorTest extends TestCase
     public function testAuthenticateFailedNoData()
     {
         $uri = new Uri('/testpath');
-        $uri->base = null;
         $request = new ServerRequest();
         $request = $request->withUri($uri);
         $identifiers = new IdentifierCollection([
@@ -54,7 +53,6 @@ public function testAuthenticateFailedNoData()
     public function testAuthenticateFailedInvalidUrl()
     {
         $uri = new Uri('/testpath');
-        $uri->base = null;
         $request = new ServerRequest();
         $request = $request->withUri($uri);
         $request->getSession()->write(
@@ -85,7 +83,6 @@ public function testAuthenticateFailedInvalidUrl()
     public function testAuthenticate()
     {
         $uri = new Uri('/testpath');
-        $uri->base = null;
         $request = new ServerRequest();
         $request = $request->withUri($uri);
         $request->getSession()->write(

tests/TestCase/Controller/Component/OneTimePasswordAuthenticatorComponentTest.php

@@ -69,7 +69,8 @@ public function setUp(): void
         $this->request->expects($this->any())->method('is')->will($this->returnValue(true));
         $this->Controller = new Controller($this->request);
         $this->Registry = $this->Controller->components();
-        $this->Controller->OneTimePasswordAuthenticator = new OneTimePasswordAuthenticatorComponent($this->Registry);
+        $this->Controller->components()->set('OneTimePasswordAuthenticator', new OneTimePasswordAuthenticatorComponent($this->Registry));
+        //$this->Controller->OneTimePasswordAuthenticator = new OneTimePasswordAuthenticatorComponent($this->Registry);
     }
 
     /**
@@ -92,7 +93,8 @@ public function tearDown(): void
      */
     public function testInitialize()
     {
-        $this->Controller->OneTimePasswordAuthenticator = new OneTimePasswordAuthenticatorComponent($this->Registry);
+        //$this->Controller->OneTimePasswordAuthenticator = new OneTimePasswordAuthenticatorComponent($this->Registry);
+        $this->Controller->components()->set('OneTimePasswordAuthenticator', new OneTimePasswordAuthenticatorComponent($this->Registry));
         $this->assertInstanceOf(OneTimePasswordAuthenticatorComponent::class, $this->Controller->OneTimePasswordAuthenticator);
     }
 

tests/TestCase/Rbac/RbacTest.php

@@ -19,6 +19,7 @@
 use CakeDC\Auth\Rbac\Rules\Owner;
 use CakeDC\Auth\Test\App\Auth\Rule\SampleRule;
 use Exception;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Psr\Log\LogLevel;
 use ReflectionClass;
 use RuntimeException;
@@ -183,12 +184,13 @@ public function testAuthorize($permissions, $user, $requestParams, $expected)
         $this->assertSame($expected, $result);
     }
 
-    public function providerAuthorize()
+    public static function providerAuthorize()
     {
-        $trueRuleMock = $this->getMockBuilder(Owner::class)
+        $testCase = new static(RbacTest::class);
+        $trueRuleMock = $testCase->getMockBuilder(Owner::class)
             ->onlyMethods(['allowed'])
             ->getMock();
-        $trueRuleMock->expects($this->any())
+        $trueRuleMock->expects($testCase->any())
             ->method('allowed')
             ->willReturn(true);
 

tests/bootstrap.php

@@ -92,7 +92,7 @@
     'default' => [
         'engine' => 'File',
     ],
-    '_cake_core_' => [
+    '_cake_translations_' => [
         'className' => 'File',
         'prefix' => 'users_myapp_cake_core_',
         'path' => CACHE . 'persistent/',