AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rewrite of the authentication and authorization system

Browse Source
This commit is contained in:
Frederic Guillot
2015-12-05 20:31:27 -05:00
parent 346b8312e5
commit e9fedf3e5c
255 changed files with 14114 additions and 9820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helper/Url.php
View File

@@ -125,7 +125,7 @@ class Url extends Base
return 'http://localhost/';
}
$url = Request::isHTTPS() ? 'https://' : 'http://';
$url = $this->request->isHTTPS() ? 'https://' : 'http://';
$url .= $_SERVER['SERVER_NAME'];
$url .= $_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443 ? '' : ':'.$_SERVER['SERVER_PORT'];
$url .= $this->dir() ?: '/';

70
app/Helper/User.php
View File

@@ -2,6 +2,8 @@
namespace Kanboard\Helper;
use Kanboard\Core\Security\Role;
/**
* User helpers
*
@@ -65,6 +67,7 @@ class User extends \Kanboard\Core\Base
array('user_id' => $this->userSession->getId())
);
}
/**
* Check if the given user_id is the connected user
*
@@ -88,44 +91,77 @@ class User extends \Kanboard\Core\Base
}
/**
* Return if the logged user is project admin
* Get role name
*
* @access public
* @return boolean
* @param string $role
* @return string
*/
public function isProjectAdmin()
public function getRoleName($role = '')
{
return $this->userSession->isProjectAdmin();
return $this->role->getRoleName($role ?: $this->userSession->getRole());
}
/**
* Check for project administration actions access (Project Admin group)
* Check application access
*
* @access public
* @return boolean
* @param string $controller
* @param string $action
* @return bool
*/
public function isProjectAdministrationAllowed($project_id)
public function hasAccess($controller, $action)
{
$key = 'app_access:'.$controller.$action;
$result = $this->memoryCache->get($key);
if ($result === null) {
$result = $this->applicationAuthorization->isAllowed($controller, $action, $this->userSession->getRole());
$this->memoryCache->set($key, $result);
}
return $result;
}
/**
* Check project access
*
* @param string $controller
* @param string $action
* @param integer $project_id
* @return bool
*/
public function hasProjectAccess($controller, $action, $project_id)
{
if ($this->userSession->isAdmin()) {
return true;
}
return $this->memoryCache->proxy($this->container['acl'], 'handleProjectAdminPermissions', $project_id);
if (! $this->hasAccess($controller, $action)) {
return false;
}
$key = 'project_access:'.$controller.$action.$project_id;
$result = $this->memoryCache->get($key);
if ($result === null) {
$role = $this->getProjectUserRole($project_id);
$result = $this->projectAuthorization->isAllowed($controller, $action, $role);
$this->memoryCache->set($key, $result);
}
return $result;
}
/**
* Check for project management actions access (Regular users who are Project Managers)
* Get project role for the current user
*
* @access public
* @return boolean
* @param integer $project_id
* @return string
*/
public function isProjectManagementAllowed($project_id)
public function getProjectUserRole($project_id)
{
if ($this->userSession->isAdmin()) {
return true;
}
return $this->memoryCache->proxy($this->container['acl'], 'handleProjectManagerPermissions', $project_id);
return $this->memoryCache->proxy($this->projectUserRole, 'getUserRole', $project_id, $this->userSession->getId());
}
/**