The allow option now replaces the rules option. true (default) lets t…

…he request go though, false prevents the request and an array of closures is passed to _parseClosures for evaluation
mariano · May 26, 2011 · 0714cc6 · 0714cc6
1 parent a868ce0
commit 0714cc6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/extensions/adapter/security/access/AuthRbac.php b/extensions/adapter/security/access/AuthRbac.php
@@ -22,8 +22,6 @@ class AuthRbac extends \lithium\core\Object {
 
 	/**
 	 * The `Rbac` adapter will iterate trough the rbac data Array.
-	 * @todo: Implement file based data access
-	 * @todo: Shorter $match syntax
 	 *
 	 * @param mixed $user The user data array that holds all necessary information about
 	 *        the user requesting access. Or false (because Auth::check() can return false).
@@ -51,12 +49,12 @@ public function check($user, $request, array $options = array()) {
             $accessGranted = $match;
 
             $requesters = isset($role['requesters']) ? $role['requesters'] : '*';
-            $allow = isset($role['allow']) ? (boolean) $role['allow'] : true;
+            $allow = isset($role['allow']) ? $role['allow'] : true;
             $diff = array_diff((array) $requesters, array_keys($authedRoles));
 
-            if ((!$allow) ||
+            if (($allow === false) ||
                 (count($diff) === count($authedRoles)) ||
-                (!empty($role['rules']) && !static::_parseClosures($role['rules'], $request))
+                (is_array($allow) && !static::_parseClosures($allow, $request))
             ) {
                 $accessGranted = false;
             }

diff --git a/tests/cases/extensions/adapter/security/access/AuthRbacTest.php b/tests/cases/extensions/adapter/security/access/AuthRbacTest.php
@@ -41,7 +41,7 @@ public function setUp() {
                 'roles' => array(
                     array(
                         'requesters' => 'user',
-                        'rules' => array(function($request) {
+                        'allow' => array(function($request) {
                             return $request->params['success'] ? true : false;
                         }),
                         'match' => array(