composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-16 22:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Computation of user rights: added a config flag to force the legacy algorithm (user_rights_legacy, defaulting to false)

Browse Source 
SVN:trunk[3366]
This commit is contained in:
Romain Quetiez
2014-10-16 10:14:17 +00:00
parent 1f8d4d379f
commit 37ebb51a2b
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/config.class.inc.php
View File

@@ -769,6 +769,14 @@ class Config
'source_of_value' => '',
'show_in_conf_sample' => false,
),
'user_rights_legacy' => array(
'type' => 'bool',
'description' => 'Set to true to restore the buggy algorithm for the computation of user rights (within the same profile, ALLOW on the class itself has precedence on DENY of a parent class)',
'default' => false,
'value' => '',
'source_of_value' => '',
'show_in_conf_sample' => false,
),
);
public function IsProperty($sPropCode)

6
setup/compiler.class.inc.php
View File

@@ -1650,6 +1650,8 @@ class ProfilesConfig
public static function GetProfileActionGrant(\$iProfileId, \$sClass, \$sAction)
{
\$bLegacyBehavior = MetaModel::GetConfig()->Get('user_rights_legacy');
// Search for a grant, stoping if any deny is encountered (allowance implies the verification of all paths)
\$bAllow = null;
@@ -1659,6 +1661,7 @@ class ProfilesConfig
if (isset(self::\$aGRANTS[\$sGrantKey]))
{
\$bAllow = self::\$aGRANTS[\$sGrantKey];
if (\$bLegacyBehavior) return \$bAllow;
if (!\$bAllow) return false;
}
@@ -1670,6 +1673,7 @@ class ProfilesConfig
if (isset(self::\$aGRANTS[\$sGrantKey]))
{
\$bAllow = self::\$aGRANTS[\$sGrantKey];
if (\$bLegacyBehavior) return \$bAllow;
if (!\$bAllow) return false;
}
}
@@ -1680,6 +1684,7 @@ class ProfilesConfig
if (!is_null(\$bGrant))
{
\$bAllow = \$bGrant;
if (\$bLegacyBehavior) return \$bAllow;
if (!\$bAllow) return false;
}
@@ -1689,6 +1694,7 @@ class ProfilesConfig
if (isset(self::\$aGRANTS[\$sGrantKey]))
{
\$bAllow = self::\$aGRANTS[\$sGrantKey];
if (\$bLegacyBehavior) return \$bAllow;
if (!\$bAllow) return false;
}