Skip to content

CO-2987_Remove_hardcoded_CO_ID_for_API_user_platform_privileges #760

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
ioigoume wants to merge 1 commit into
base: hotfix-4.6.x
Choose a base branch
from
Open

CO-2987_Remove_hardcoded_CO_ID_for_API_user_platform_privileges #760

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
9 changes: 6 additions & 3 deletions app/Controller/Component/RoleComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,12 @@ public function calculateCMRoles() {

$authCoId = $this->Session->read('Auth.User.co_id');
$privd = $this->Session->read('Auth.User.privileged');

if($authCoId == 1) {
// API users in CO 1 are given platform privileges

$Co = ClassRegistry::init('Co');
$comanageCoId = $Co->getCOmanageCOID();

if($comanageCoId && ((int)$authCoId === (int)$comanageCoId)) {
// API users in the COmanage CO are given platform privileges
$ret['cmadmin'] = true;
} elseif(($coId == $authCoId) && $privd) {
// Privileged users in other COs are given CO privileges
Expand Down
5 changes: 3 additions & 2 deletions app/Controller/StandardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,8 +319,9 @@ function beforeFilter() {
// Apply the rule only when the validateExtendedType function is used as a custom rule
$model = $this->modelClass;
if(!empty($this->$model->validate['type']['content']['rule'])
&& array_search('validateExtendedType', $this->$model->validate['type']['content']['rule'], true) !== null
&& !empty($this->cur_co['Co']['id'])) {
&& in_array('validateExtendedType', $this->$model->validate['type']['content']['rule'])
&& !empty($this->cur_co['Co']['id'])
) {
$vrule = $this->$model->validate['type']['content']['rule'];
$vrule[1]['coid'] = $this->cur_co['Co']['id'];
$this->$model->validator()->getField('type')->getRule('content')->rule = $vrule;
Expand Down