Permalink
Browse files

make acl methods available in permission model

  • Loading branch information...
1 parent baf8991 commit a4952166f7108197bbc8b3a40dfb7df19519d3a0 @ceeram ceeram committed Feb 21, 2012
@@ -41,9 +41,9 @@ class DbAcl extends Object implements AclInterface {
*/
public function __construct() {
parent::__construct();
- App::uses('AclNode', 'Model');
- $this->Aro = ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro'));
- $this->Aco = ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco'));
+ $this->Permission = ClassRegistry::init(array('class' => 'Permission', 'alias' => 'Permission'));
+ $this->Aro = $this->Permission->Aro;
+ $this->Aco = $this->Permission->Aco;
}
/**
@@ -67,81 +67,7 @@ public function initialize(Component $component) {
* @link http://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#checking-permissions-the-acl-component
*/
public function check($aro, $aco, $action = "*") {
- if ($aro == null || $aco == null) {
- return false;
- }
-
- $permKeys = $this->_getAcoKeys($this->Aro->Permission->schema());
- $aroPath = $this->Aro->node($aro);
- $acoPath = $this->Aco->node($aco);
-
- if (empty($aroPath) || empty($acoPath)) {
- trigger_error(__d('cake_dev', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
- return false;
- }
-
- if ($acoPath == null || $acoPath == array()) {
- trigger_error(__d('cake_dev', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
- return false;
- }
-
- if ($action != '*' && !in_array('_' . $action, $permKeys)) {
- trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE);
- return false;
- }
-
- $inherited = array();
- $acoIDs = Set::extract($acoPath, '{n}.' . $this->Aco->alias . '.id');
-
- $count = count($aroPath);
- for ($i = 0; $i < $count; $i++) {
- $permAlias = $this->Aro->Permission->alias;
-
- $perms = $this->Aro->Permission->find('all', array(
- 'conditions' => array(
- "{$permAlias}.aro_id" => $aroPath[$i][$this->Aro->alias]['id'],
- "{$permAlias}.aco_id" => $acoIDs
- ),
- 'order' => array($this->Aco->alias . '.lft' => 'desc'),
- 'recursive' => 0
- ));
-
- if (empty($perms)) {
- continue;
- } else {
- $perms = Set::extract($perms, '{n}.' . $this->Aro->Permission->alias);
- foreach ($perms as $perm) {
- if ($action == '*') {
-
- foreach ($permKeys as $key) {
- if (!empty($perm)) {
- if ($perm[$key] == -1) {
- return false;
- } elseif ($perm[$key] == 1) {
- $inherited[$key] = 1;
- }
- }
- }
-
- if (count($inherited) === count($permKeys)) {
- return true;
- }
- } else {
- switch ($perm['_' . $action]) {
- case -1:
- return false;
- case 0:
- continue;
- break;
- case 1:
- return true;
- break;
- }
- }
- }
- }
- }
- return false;
+ return $this->Permission->check($aro, $aco, $action);
}
/**
@@ -155,45 +81,7 @@ public function check($aro, $aco, $action = "*") {
* @link http://book.cakephp.org/2.0/en/core-libraries/components/access-control-lists.html#assigning-permissions
*/
public function allow($aro, $aco, $actions = "*", $value = 1) {
- $perms = $this->getAclLink($aro, $aco);
- $permKeys = $this->_getAcoKeys($this->Aro->Permission->schema());
- $save = array();
-
- if ($perms == false) {
- trigger_error(__d('cake_dev', 'DbAcl::allow() - Invalid node'), E_USER_WARNING);
- return false;
- }
- if (isset($perms[0])) {
- $save = $perms[0][$this->Aro->Permission->alias];
- }
-
- if ($actions == "*") {
- $permKeys = $this->_getAcoKeys($this->Aro->Permission->schema());
- $save = array_combine($permKeys, array_pad(array(), count($permKeys), $value));
- } else {
- if (!is_array($actions)) {
- $actions = array('_' . $actions);
- }
- if (is_array($actions)) {
- foreach ($actions as $action) {
- if ($action{0} != '_') {
- $action = '_' . $action;
- }
- if (in_array($action, $permKeys)) {
- $save[$action] = $value;
- }
- }
- }
- }
- list($save['aro_id'], $save['aco_id']) = array($perms['aro'], $perms['aco']);
-
- if ($perms['link'] != null && !empty($perms['link'])) {
- $save['id'] = $perms['link'][0][$this->Aro->Permission->alias]['id'];
- } else {
- unset($save['id']);
- $this->Aro->Permission->id = null;
- }
- return ($this->Aro->Permission->save($save) !== false);
+ return $this->Permission->allow($aro, $aco, $actions, $value);
}
/**
@@ -255,22 +143,7 @@ public function revoke($aro, $aco, $action = "*") {
* @return array Indexed array with: 'aro', 'aco' and 'link'
*/
public function getAclLink($aro, $aco) {
- $obj = array();
- $obj['Aro'] = $this->Aro->node($aro);
- $obj['Aco'] = $this->Aco->node($aco);
-
- if (empty($obj['Aro']) || empty($obj['Aco'])) {
- return false;
- }
-
- return array(
- 'aro' => Set::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id'),
- 'aco' => Set::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id'),
- 'link' => $this->Aro->Permission->find('all', array('conditions' => array(
- $this->Aro->Permission->alias . '.aro_id' => Set::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id'),
- $this->Aro->Permission->alias . '.aco_id' => Set::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id')
- )))
- );
+ return $this->Permission->getAclLink($aro, $aco);
}
/**
@@ -280,14 +153,7 @@ public function getAclLink($aro, $aco) {
* @return array ACO keys
*/
protected function _getAcoKeys($keys) {
- $newKeys = array();
- $keys = array_keys($keys);
- foreach ($keys as $key) {
- if (!in_array($key, array('id', 'aro_id', 'aco_id'))) {
- $newKeys[] = $key;
- }
- }
- return $newKeys;
+ return $this->Permission->getAcoKeys($keys);
}
}
@@ -60,11 +60,8 @@ public function __construct(ComponentCollection $collection, $settings = array()
$name = Configure::read('Acl.classname');
if (!class_exists($name)) {
list($plugin, $name) = pluginSplit($name, true);
- App::uses($name . 'Component', $plugin . 'Controller/Component');
- App::uses($name, 'Controller/Component/Acl');
- if (class_exists($name . 'Component')) {
- $name .= 'Component';
- } elseif (!class_exists($name)) {
+ App::uses($name, $plugin . 'Controller/Component/Acl');
+ if (!class_exists($name)) {
throw new CakeException(__d('cake_dev', 'Could not find %s.', $name));
}
}
@@ -72,4 +72,182 @@ public function __construct() {
parent::__construct();
}
+/**
+ * Checks if the given $aro has access to action $action in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success (true if ARO has access to action in ACO, false otherwise)
+ */
+ public function check($aro, $aco, $action = "*") {
+ if ($aro == null || $aco == null) {
+ return false;
+ }
+
+ $permKeys = $this->getAcoKeys($this->schema());
+ $aroPath = $this->Aro->node($aro);
+ $acoPath = $this->Aco->node($aco);
+
+ if (empty($aroPath) || empty($acoPath)) {
+ trigger_error(__d('cake_dev', "DbAcl::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+ return false;
+ }
+
+ if ($acoPath == null || $acoPath == array()) {
+ trigger_error(__d('cake_dev', "DbAcl::check() - Failed ACO node lookup in permissions check. Node references:\nAro: ") . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+ return false;
+ }
+
+ if ($action != '*' && !in_array('_' . $action, $permKeys)) {
+ trigger_error(__d('cake_dev', "ACO permissions key %s does not exist in DbAcl::check()", $action), E_USER_NOTICE);
+ return false;
+ }
+
+ $inherited = array();
+ $acoIDs = Set::extract($acoPath, '{n}.' . $this->Aco->alias . '.id');
+
+ $count = count($aroPath);
+ for ($i = 0 ; $i < $count; $i++) {
+ $permAlias = $this->alias;
+
+ $perms = $this->find('all', array(
+ 'conditions' => array(
+ "{$permAlias}.aro_id" => $aroPath[$i][$this->Aro->alias]['id'],
+ "{$permAlias}.aco_id" => $acoIDs
+ ),
+ 'order' => array($this->Aco->alias . '.lft' => 'desc'),
+ 'recursive' => 0
+ ));
+
+ if (empty($perms)) {
+ continue;
+ } else {
+ $perms = Set::extract($perms, '{n}.' . $this->alias);
+ foreach ($perms as $perm) {
+ if ($action == '*') {
+
+ foreach ($permKeys as $key) {
+ if (!empty($perm)) {
+ if ($perm[$key] == -1) {
+ return false;
+ } elseif ($perm[$key] == 1) {
+ $inherited[$key] = 1;
+ }
+ }
+ }
+
+ if (count($inherited) === count($permKeys)) {
+ return true;
+ }
+ } else {
+ switch ($perm['_' . $action]) {
+ case -1:
+ return false;
+ case 0:
+ continue;
+ break;
+ case 1:
+ return true;
+ break;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
+/**
+ * Allow $aro to have access to action $actions in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $actions Action (defaults to *)
+ * @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
+ * @return boolean Success
+ */
+ public function allow($aro, $aco, $actions = "*", $value = 1) {
+ $perms = $this->getAclLink($aro, $aco);
+ $permKeys = $this->getAcoKeys($this->schema());
+ $save = array();
+
+ if ($perms == false) {
+ trigger_error(__d('cake_dev', 'DbAcl::allow() - Invalid node'), E_USER_WARNING);
+ return false;
+ }
+ if (isset($perms[0])) {
+ $save = $perms[0][$this->alias];
+ }
+
+ if ($actions == "*") {
+ $save = array_combine($permKeys, array_pad(array(), count($permKeys), $value));
+ } else {
+ if (!is_array($actions)) {
+ $actions = array('_' . $actions);
+ }
+ if (is_array($actions)) {
+ foreach ($actions as $action) {
+ if ($action{0} != '_') {
+ $action = '_' . $action;
+ }
+ if (in_array($action, $permKeys)) {
+ $save[$action] = $value;
+ }
+ }
+ }
+ }
+ list($save['aro_id'], $save['aco_id']) = array($perms['aro'], $perms['aco']);
+
+ if ($perms['link'] != null && !empty($perms['link'])) {
+ $save['id'] = $perms['link'][0][$this->alias]['id'];
+ } else {
+ unset($save['id']);
+ $this->id = null;
+ }
+ return ($this->save($save) !== false);
+ }
+
+/**
+ * Get an array of access-control links between the given Aro and Aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @return array Indexed array with: 'aro', 'aco' and 'link'
+ */
+ public function getAclLink($aro, $aco) {
+ $obj = array();
+ $obj['Aro'] = $this->Aro->node($aro);
+ $obj['Aco'] = $this->Aco->node($aco);
+
+ if (empty($obj['Aro']) || empty($obj['Aco'])) {
+ return false;
+ }
+
+ return array(
+ 'aro' => Set::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id'),
+ 'aco' => Set::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id'),
+ 'link' => $this->find('all', array('conditions' => array(
+ $this->alias . '.aro_id' => Set::extract($obj, 'Aro.0.' . $this->Aro->alias . '.id'),
+ $this->alias . '.aco_id' => Set::extract($obj, 'Aco.0.' . $this->Aco->alias . '.id')
+ )))
+ );
+ }
+
+/**
+ * Get the crud type keys
+ *
+ * @param array $keys Permission schema
+ * @return array permission keys
+ */
+ public function getAcoKeys($keys) {
+ $newKeys = array();
+ $keys = array_keys($keys);
+ foreach ($keys as $key) {
+ if (!in_array($key, array('id', 'aro_id', 'aco_id'))) {
+ $newKeys[] = $key;
+ }
+ }
+ return $newKeys;
+ }
}
Oops, something went wrong.

0 comments on commit a495216

Please sign in to comment.