Merge pull request tmaiaroto#15 from mariano/i14

Fixing issue where namespace were not taken into account in AuthRbac adapter
mariano · Jan 10, 2012 · 386d00d · 386d00d
2 parents 24c841f + ce15b7f
commit 386d00d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/extensions/adapter/security/access/AuthRbac.php b/extensions/adapter/security/access/AuthRbac.php
@@ -119,9 +119,11 @@ public static function parseMatch($match, $request) {
 		$params = array();
 		foreach ((array) $match as $key => $param) {
 			if (is_string($param)) {
-				if (preg_match('/^[A-Za-z0-9_\*]+::[A-Za-z0-9_\*]+$/', $param, $regexMatches)) {
-					list($controller, $action) = explode('::', reset($regexMatches));
-					$params += compact('controller', 'action');
+				if (preg_match('/^([A-Za-z0-9_\*\\\]+)::([A-Za-z0-9_\*]+)$/', $param, $regexMatches)) {
+					$params += array(
+						'controller' => $regexMatches[1],
+						'action' => $regexMatches[2]
+					);
 					continue;
 				}
 			}
@@ -216,4 +218,4 @@ protected static function _hasRole($requesters, $request, array $options = array
 	}
 }
 
-?>
+?>
diff --git a/tests/cases/extensions/adapter/security/access/AuthRbacTest.php b/tests/cases/extensions/adapter/security/access/AuthRbacTest.php
@@ -226,6 +226,15 @@ public function testParseMatch() {
 		$test = function() { return false; };
 		$this->assertFalse(Access::adapter('test_closures')->parseMatch(array($test), $request));
 		$this->assertFalse(Access::adapter('test_closures')->parseMatch(array(), $request));
+
+		$request = new Request(array('params' => array(
+			'controller' => 'lithium\test\Controller',
+			'action' => 'index'
+		)));
+		$match = 'Controller::*';
+		$this->assertFalse(Access::adapter('test_check')->parseMatch($match, $request));
+		$match = 'lithium\test\Controller::*';
+		$this->assertTrue(Access::adapter('test_check')->parseMatch($match, $request));
 	}
 
 	public function testClosures() {
@@ -271,4 +280,4 @@ public function testNoRolesConfigured() {
 	}
 }
 
-?>
+?>