Skip to content

Added elements to remove some hardcoded primaryKey field name #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tranfuga25s wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

Added elements to remove some hardcoded primaryKey field name #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 54 additions & 53 deletions Controller/AclController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* @link http://github.com/FMCorz/AclManager
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/

class AclController extends AclManagerAppController {

public $paginate = array();
Expand All @@ -24,15 +24,15 @@ class AclController extends AclManagerAppController {
*/
public function beforeFilter() {
parent::beforeFilter();

/**
* Loading required Model
*/
$aros = Configure::read('AclManager.models');
foreach ($aros as $aro) {
$this->loadModel($aro);
}

/**
* Pagination
*/
Expand All @@ -56,7 +56,7 @@ public function drop() {
$this->Session->setFlash(__("Both ACOs and AROs have been dropped"));
$this->redirect(array("action" => "index"));
}

/**
* Delete all permissions
*/
Expand Down Expand Up @@ -98,9 +98,9 @@ public function permissions() {
$this->Acl->deny($node, $action);
}
}
}
}
}

$model = isset($this->request->params['named']['aro']) ? $this->request->params['named']['aro'] : null;
if (!$model || !in_array($model, Configure::read('AclManager.aros'))) {
$model = Configure::read('AclManager.aros');
Expand All @@ -110,7 +110,7 @@ public function permissions() {
$Aro = $this->{$model};
$aros = $this->paginate($Aro->alias);
$permKeys = $this->_getKeys();

/**
* Build permissions info
*/
Expand All @@ -121,7 +121,7 @@ public function permissions() {
$aco =& $acos[$key];
$aco = array('Aco' => $data['Aco'], 'Aro' => $data['Aro'], 'Action' => array());
$id = $aco['Aco']['id'];

// Generate path
if ($aco['Aco']['parent_id'] && isset($parents[$aco['Aco']['parent_id']])) {
$parents[$id] = $parents[$aco['Aco']['parent_id']] . '/' . $aco['Aco']['alias'];
Expand All @@ -135,7 +135,7 @@ public function permissions() {
foreach($aros as $aro) {
$aroId = $aro[$Aro->alias][$Aro->primaryKey];
$evaluate = $this->_evaluate_permissions($permKeys, array('id' => $aroId, 'alias' => $Aro->alias), $aco, $key);

$perms[str_replace('/', ':', $acoNode)][$Aro->alias . ":" . $aroId . '-inherit'] = $evaluate['inherited'];
$perms[str_replace('/', ':', $acoNode)][$Aro->alias . ":" . $aroId] = $evaluate['allowed'];
}
Expand All @@ -144,21 +144,22 @@ public function permissions() {
$this->request->data = array('Perms' => $perms);
$this->set('aroAlias', $Aro->alias);
$this->set('aroDisplayField', $Aro->displayField);
$this->set('aroPk', $Aro->primaryKey );
$this->set(compact('acos', 'aros'));
}

/**
* Recursive function to find permissions avoiding slow $this->Acl->check().
*/
private function _evaluate_permissions($permKeys, $aro, $aco, $aco_index) {
private function _evaluate_permissions($permKeys, $aro, $aco, $aco_index) {
$permissions = Set::extract("/Aro[model={$aro['alias']}][foreign_key={$aro['id']}]/Permission/.", $aco);
$permissions = array_shift($permissions);
$permissions = array_shift($permissions);

$allowed = false;
$inherited = false;
$inheritedPerms = array();
$allowedPerms = array();

/**
* Manually checking permission
* Part of this logic comes from DbAcl::check()
Expand All @@ -177,7 +178,7 @@ private function _evaluate_permissions($permKeys, $aro, $aco, $aco_index) {
$inheritedPerms[$key] = 0;
}
}

if (count($allowedPerms) === count($permKeys)) {
$allowed = true;
} elseif (count($inheritedPerms) === count($permKeys)) {
Expand All @@ -193,7 +194,7 @@ private function _evaluate_permissions($permKeys, $aro, $aco, $aco_index) {
}
else {
/**
* Do not use Set::extract here. First of all it is terribly slow,
* Do not use Set::extract here. First of all it is terribly slow,
* besides this we need the aco array index ($key) to cache are result.
*/
foreach ($this->acos as $key => $a) {
Expand All @@ -206,19 +207,19 @@ private function _evaluate_permissions($permKeys, $aro, $aco, $aco_index) {
if (isset($parent_aco['evaluated'][$aro['id']])) {
return $parent_aco['evaluated'][$aro['id']];
}

// Perform lookup of parent aco
$evaluate = $this->_evaluate_permissions($permKeys, $aro, $parent_aco, $key);

// Store result in acos array so we need less recursion for the next lookup
$this->acos[$key]['evaluated'][$aro['id']] = $evaluate;
$this->acos[$key]['evaluated'][$aro['id']]['inherited'] = true;

$allowed = $evaluate['allowed'];
}
$inherited = true;
}

return array(
'allowed' => $allowed,
'inherited' => $inherited,
Expand All @@ -230,28 +231,28 @@ private function _evaluate_permissions($permKeys, $aro, $aco, $aco_index) {
* Sets the missing actions in the database
*/
public function update_acos() {

$count = 0;
$knownAcos = $this->_getAcos();

// Root node
$aco = $this->_action(array(), '');
if (!$rootNode = $this->Acl->Aco->node($aco)) {
$rootNode = $this->_buildAcoNode($aco, null);
$count++;
}
$knownAcos = $this->_removeActionFromAcos($knownAcos, $aco);

// Loop around each controller and its actions
$allActions = $this->_getActions();
foreach ($allActions as $controller => $actions) {
if (empty($actions)) {
continue;
}

$parentNode = $rootNode;
list($plugin, $controller) = pluginSplit($controller);

// Plugin
$aco = $this->_action(array('plugin' => $plugin), '/:plugin/');
$aco = rtrim($aco, '/'); // Remove trailing slash
Expand All @@ -262,7 +263,7 @@ public function update_acos() {
}
$parentNode = $newNode;
$knownAcos = $this->_removeActionFromAcos($knownAcos, $aco);

// Controller
$aco = $this->_action(array('controller' => $controller, 'plugin' => $plugin), '/:plugin/:controller');
if (!$newNode = $this->Acl->Aco->node($aco)) {
Expand Down Expand Up @@ -292,7 +293,7 @@ public function update_acos() {
$acoIds = Set::extract('/Aco/id', $knownAcos);
$this->Acl->Aco->deleteAll(array('Aco.id' => $acoIds));
}

$this->Session->setFlash(sprintf(__("%d ACOs have been created/updated"), $count));
$this->redirect($this->request->referer());
}
Expand All @@ -302,40 +303,40 @@ public function update_acos() {
* Sets the missing AROs in the database
*/
public function update_aros() {

// Debug off to enable redirect
Configure::write('debug', 0);

$count = 0;
$type = 'Aro';

// Over each ARO Model
$objects = Configure::read("AclManager.aros");
foreach ($objects as $object) {

$Model = $this->{$object};

$items = $Model->find('all');
foreach ($items as $item) {

$item = $item[$Model->alias];
$Model->create();
$Model->id = $item['id'];
$Model->id = $item[$Model->primaryKey];

try {
$node = $Model->node();
} catch (Exception $e) {
$node = false;
}

// Node exists
if ($node) {
$parent = $Model->parentNode();
if (!empty($parent)) {
$parent = $Model->node($parent, $type);
}
$parent = isset($parent[0][$type]['id']) ? $parent[0][$type]['id'] : null;

// Parent is incorrect
if ($parent != $node[0][$type]['parent_id']) {
// Remove Aro here, otherwise we've got duplicate Aros
Expand All @@ -344,10 +345,10 @@ public function update_aros() {
$node = null;
}
}

// Missing Node or incorrect
if (empty($node)) {

// Extracted from AclBehavior::afterSave (and adapted)
$parent = $Model->parentNode();
if (!empty($parent)) {
Expand All @@ -358,15 +359,15 @@ public function update_aros() {
'model' => $Model->name,
'foreign_key' => $Model->id
);

// Creating ARO
$this->Acl->{$type}->create($data);
$this->Acl->{$type}->save();
$count++;
}
}
}

$this->Session->setFlash(sprintf(__("%d AROs have been created"), $count));
$this->redirect($this->request->referer());
}
Expand All @@ -378,7 +379,7 @@ protected function _action($request = array(), $path = '/:plugin/:controller/:ac
$plugin = empty($request['plugin']) ? null : Inflector::camelize($request['plugin']) . '/';
$params = array_merge(array('controller' => null, 'action' => null, 'plugin' => null), $request);
$request = new CakeRequest(null, false);
$request->addParams($params);
$request->addParams($params);
$authorizer = $this->_getAuthorizer();
return $authorizer->action($request, $path);
}
Expand All @@ -399,12 +400,12 @@ protected function _buildAcoNode($alias, $parent_id = null) {

/**
* Returns all the Actions found in the Controllers
*
*
* Ignores:
* - protected and private methods (starting with _)
* - Controller methods
* - methods matching Configure::read('AclManager.ignoreActions')
*
*
* @return array('Controller' => array('action1', 'action2', ... ))
*/
protected function _getActions() {
Expand All @@ -413,13 +414,13 @@ protected function _getActions() {
foreach($methods as $method) {
$ignore[] = $method;
}

$controllers = $this->_getControllers();
$actions = array();
foreach ($controllers as $controller) {

list($plugin, $name) = pluginSplit($controller);

$methods = get_class_methods($name . "Controller");
$methods = array_diff($methods, $ignore);
foreach ($methods as $key => $method) {
Expand All @@ -429,7 +430,7 @@ protected function _getActions() {
}
$actions[$controller] = $methods;
}

return $actions;
}

Expand All @@ -440,10 +441,10 @@ protected function _getAcos() {
$acos = $this->Acl->Aco->find('all', array('order' => 'Aco.lft ASC', 'recursive' => -1));
$parents = array();
foreach ($acos as $key => $data) {

$aco =& $acos[$key];
$id = $aco['Aco']['id'];

// Generate path
if ($aco['Aco']['parent_id'] && isset($parents[$aco['Aco']['parent_id']])) {
$parents[$id] = $parents[$aco['Aco']['parent_id']] . '/' . $aco['Aco']['alias'];
Expand All @@ -467,7 +468,7 @@ protected function _getAuthorizer() {
if (!$object instanceOf ActionsAuthorize) {
continue;
}
$this->_authorizer = $object;
$this->_authorizer = $object;
break;
}
if (empty($this->_authorizer)) {
Expand All @@ -484,20 +485,20 @@ protected function _getAuthorizer() {
* @return array('Controller1', 'Plugin.Controller2')
*/
protected function _getControllers() {

// Getting Cake controllers
$objects = array('Cake' => array());
$objects['Cake'] = App::objects('Controller');
$unsetIndex = array_search("AppController", $objects['Cake']);
if ($unsetIndex !== false) {
unset($objects['Cake'][$unsetIndex]);
}

// App::objects does not return PagesController
if (!in_array('PagesController', $objects['Cake'])) {
array_unshift($objects['Cake'], 'PagesController');
}

// Getting Plugins controllers
$plugins = CakePlugin::loaded();
foreach ($plugins as $plugin) {
Expand Down Expand Up @@ -540,7 +541,7 @@ protected function _getKeys() {
}
return $newKeys;
}

/**
* Returns an array without the corresponding action
*/
Expand Down
Loading