mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-09 17:15:19 +02:00
Implemented strict check for cached user permissions and existing ACL options. This fix makes sure cached permissions are valid, even if they got already cached.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8985 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
aa27ec5ebb
commit
ab5146a72a
@ -71,7 +71,46 @@ class auth
|
||||
$this->acl_cache($userdata);
|
||||
}
|
||||
|
||||
$user_permissions = explode("\n", $userdata['user_permissions']);
|
||||
// Fill ACL array
|
||||
$this->_fill_acl($userdata['user_permissions']);
|
||||
|
||||
// Verify bitstring length with options provided...
|
||||
$renew = false;
|
||||
$global_length = sizeof($this->acl_options['global']);
|
||||
$local_length = sizeof($this->acl_options['local']);
|
||||
|
||||
// Specify comparing length (bitstring is padded to 31 bits)
|
||||
$global_length = ($global_length % 31) ? ($global_length - ($global_length % 31) + 31) : $global_length;
|
||||
$local_length = ($local_length % 31) ? ($local_length - ($local_length % 31) + 31) : $local_length;
|
||||
|
||||
// You thought we are finished now? Noooo... now compare them.
|
||||
foreach ($this->acl as $forum_id => $bitstring)
|
||||
{
|
||||
if (($forum_id && strlen($bitstring) != $local_length) || (!$forum_id && strlen($bitstring) != $global_length))
|
||||
{
|
||||
$renew = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// If a bitstring within the list does not match the options, we have a user with incorrect permissions set and need to renew them
|
||||
if ($renew)
|
||||
{
|
||||
$this->acl_cache($userdata);
|
||||
$this->_fill_acl($userdata['user_permissions']);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fill ACL array with relevant bitstrings from user_permissions column
|
||||
* @access private
|
||||
*/
|
||||
function _fill_acl($user_permissions)
|
||||
{
|
||||
$this->acl = array();
|
||||
$user_permissions = explode("\n", $user_permissions);
|
||||
|
||||
foreach ($user_permissions as $f => $seq)
|
||||
{
|
||||
@ -92,8 +131,6 @@ class auth
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user