Merge pull request #48 from CakeDC/feature/47-fix-callable-plugin-name

Refs #47 fix callable plugin name
CakeDC · Aug 26, 2019 · e494d68 · e494d68
2 parents d2a26fc + ed5bdac
commit e494d68
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/src/Rbac/Rbac.php b/src/Rbac/Rbac.php
@@ -171,7 +171,7 @@ protected function _matchPermission(array $permission, array $user, $role, Serve
                 $key = ltrim($key, '*');
             }
 
-            if (is_callable($value)) {
+            if (!is_string($value) && is_callable($value)) {
                 $return = (bool)call_user_func($value, $user, $role, $request);
             } elseif ($value instanceof Rule) {
                 $return = (bool)$value->allowed($user, $role, $request);

diff --git a/tests/TestCase/Rbac/RbacTest.php b/tests/TestCase/Rbac/RbacTest.php
@@ -1099,6 +1099,29 @@ function () {
                 //expected
                 false,
             ],
+            'plugin-name-matches-callable-function' => [
+                //permissions
+                [[
+                    'plugin' => 'Ord',
+                    'controller' => 'Tests',
+                    'action' => 'test',
+                    'role' => 'admin',
+                ]],
+                //user
+                [
+                    'id' => 1,
+                    'username' => 'luke',
+                    'role' => 'admin',
+                ],
+                //request
+                [
+                    'plugin' => 'Ord',
+                    'controller' => 'Tests',
+                    'action' => 'test'
+                ],
+                //expected
+                true,
+            ],
             'named-route' => [
                 //permissions
                 [[

diff --git a/tests/config/routes.php b/tests/config/routes.php
@@ -72,6 +72,11 @@
         'controller' => 'Tests',
         'action' => 'one',
     ]);
+    $routes->connect('/ord/tests/test', [
+        'plugin' => 'Ord',
+        'controller' => 'Tests',
+        'action' => 'test',
+    ]);
 
     $routes->fallbacks(\Cake\Routing\Route\DashedRoute::class);