Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Updates permission validation method on AccessControl

Browse Source 
Adds/updates unit tests
This commit is contained in:
Vlad
2017-08-23 09:53:54 -04:00
parent 48f3ae4ea1
commit 28320cdbb6
4 changed files with 123 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/API/JSON/API.php
View File

@ -147,14 +147,10 @@ class API {
}
function validatePermissions($request_method, $permissions) {
// if method permission is defined, validate it
if (!empty($permissions['methods'][$request_method])) {
return ($permissions['methods'][$request_method] === AccessControl::NO_ACCESS_RESTRICTION) ?
true :
$this->access_control->validatePermission($permissions['methods'][$request_method]);
}
// use global permission
return $this->access_control->validatePermission($permissions['global']);
// validate method permission if defined, otherwise validate global permission
return(!empty($permissions['methods'][$request_method])) ?
$this->access_control->validatePermission($permissions['methods'][$request_method]) :
$this->access_control->validatePermission($permissions['global']);
}
function checkToken() {