php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-02 21:41:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix #18196: yii\rbac\DbManager::$checkAccessAssignments is now protected

Browse Source
This commit is contained in:
Alex
2020-09-08 10:16:39 +01:00
committed by GitHub
parent db4beebe23
commit 287476465d
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
framework/rbac/DbManager.php
View File

@ -100,7 +100,11 @@ class DbManager extends BaseManager
* @var array auth item parent-child relationships (childName => list of parents)
*/
protected $parents;
/**
* @var array user assignments (user id => Assignment[])
* @since `protected` since 2.0.38
*/
protected $checkAccessAssignments = [];
/**
* Initializes the application component.
@ -115,18 +119,16 @@ class DbManager extends BaseManager
}
}
private $_checkAccessAssignments = [];
/**
* {@inheritdoc}
*/
public function checkAccess($userId, $permissionName, $params = [])
{
if (isset($this->_checkAccessAssignments[(string) $userId])) {
$assignments = $this->_checkAccessAssignments[(string) $userId];
if (isset($this->checkAccessAssignments[(string) $userId])) {
$assignments = $this->checkAccessAssignments[(string) $userId];
} else {
$assignments = $this->getAssignments($userId);
$this->_checkAccessAssignments[(string) $userId] = $assignments;
$this->checkAccessAssignments[(string) $userId] = $assignments;
}
if ($this->hasNoAssignments($assignments)) {
@ -857,7 +859,7 @@ class DbManager extends BaseManager
'created_at' => $assignment->createdAt,
])->execute();
unset($this->_checkAccessAssignments[(string) $userId]);
unset($this->checkAccessAssignments[(string) $userId]);
return $assignment;
}
@ -870,7 +872,7 @@ class DbManager extends BaseManager
return false;
}
unset($this->_checkAccessAssignments[(string) $userId]);
unset($this->checkAccessAssignments[(string) $userId]);
return $this->db->createCommand()
->delete($this->assignmentTable, ['user_id' => (string) $userId, 'item_name' => $role->name])
->execute() > 0;
@ -885,7 +887,7 @@ class DbManager extends BaseManager
return false;
}
unset($this->_checkAccessAssignments[(string) $userId]);
unset($this->checkAccessAssignments[(string) $userId]);
return $this->db->createCommand()
->delete($this->assignmentTable, ['user_id' => (string) $userId])
->execute() > 0;
@ -970,7 +972,7 @@ class DbManager extends BaseManager
*/
public function removeAllAssignments()
{
$this->_checkAccessAssignments = [];
$this->checkAccessAssignments = [];
$this->db->createCommand()->delete($this->assignmentTable)->execute();
}
@ -982,7 +984,7 @@ class DbManager extends BaseManager
$this->rules = null;
$this->parents = null;
}
$this->_checkAccessAssignments = [];
$this->checkAccessAssignments = [];
}
public function loadFromCache()