Skip to content
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

add support for filtering by sids #32

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

add support for filtering by sids #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
99632bc
add support for filtering by sids
BirdyDevs Mar 15, 2017
09c41a2
added replace
Mar 15, 2017
1638491
existing acl entries are not always numbered consecutively
BirdyDevs Mar 15, 2017
3394614
Merge remote-tracking branch 'origin/master'
BirdyDevs Mar 15, 2017
38741fa
removed replace
Mar 16, 2017
82c2357
existing acl entries are not always numbered consecutively
BirdyDevs Mar 15, 2017
2d6a94b
existing acl entries are not always numbered consecutively
BirdyDevs Mar 27, 2017
a8b2509
existing acl entries are not always numbered consecutively - part 3
BirdyDevs Mar 28, 2017
9514e12
rework for pull request comments
BirdyDevs Sep 19, 2019
33c2cc6
Merge branch 'master' into feature/add_support_for_filtering_by_sids
BirdyDevs Sep 19, 2019
7034bef
Merge branch 'master' of https://github.com/symfony/security-acl into…
BirdyDevs Sep 19, 2019
1230212
add back mapping to role
BirdyDevs Sep 19, 2019
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
34 changes: 30 additions & 4 deletions Dbal/AclProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
use Symfony\Component\Security\Acl\Model\AclProviderInterface;
use Symfony\Component\Security\Acl\Model\ObjectIdentityInterface;
use Symfony\Component\Security\Acl\Model\PermissionGrantingStrategyInterface;
use Symfony\Component\Security\Acl\Model\SecurityIdentityInterface;

/**
* An ACL provider implementation.
Expand All @@ -37,6 +38,7 @@
class AclProvider implements AclProviderInterface
{
const MAX_BATCH_SIZE = 30;
const TOKEN_FILTER_PREFIX = 'IS_AUTHENTICATED_';

/**
* @var AclCacheInterface|null
Expand Down Expand Up @@ -228,9 +230,12 @@ public function findAcls(array $oids, array $sids = array())
*
* @return string
*/
protected function getLookupSql(array $ancestorIds)
protected function getLookupSql(array $ancestorIds/*, array $identityIds = []*/)
{
// FIXME: add support for filtering by sids (right now we select all sids)
$identityIds = [];
if (\func_num_args() > 1) {
$identityIds = \func_get_arg(1);
}

$sql = <<<SELECTCLAUSE
SELECT
Expand Down Expand Up @@ -264,6 +269,9 @@ protected function getLookupSql(array $ancestorIds)
SELECTCLAUSE;

$sql .= implode(' OR o.id = ', $ancestorIds).')';
if (!empty($identityIds)) {
$sql .= ' AND (s.identifier = "' . implode('" OR s.identifier = "', $identityIds) . '")';
}

return $sql;
}
Expand Down Expand Up @@ -466,7 +474,7 @@ private function doUpdateAceIdentityMap(array &$aces)
* from the cache, and for which thus a database query is required.
*
* @param array $batch
* @param array $sids
* @param SecurityIdentityInterface[] $sids
* @param array $oidLookup
*
* @return \SplObjectStorage mapping object identities to ACL instances
Expand All @@ -480,7 +488,7 @@ private function lookupObjectIdentities(array $batch, array $sids, array $oidLoo
throw new AclNotFoundException('There is no ACL for the given object identity.');
}

$sql = $this->getLookupSql($ancestorIds);
$sql = $this->getLookupSql($ancestorIds, $this->getIdentityIds($sids));
$stmt = $this->connection->executeQuery($sql);

return $this->hydrateObjectIdentities($stmt, $oidLookup, $sids);
Expand Down Expand Up @@ -692,4 +700,22 @@ private function hydrateObjectIdentities(Statement $stmt, array $oidLookup, arra

return $result;
}

/**
* Retrieves all the security identity ids which need to be queried from the database
*
* @param SecurityIdentityInterface[] $sids
*
* @return array
*/
private function getIdentityIds(array $sids)
{
$filteredSids = \array_filter($sids, function ($sid) {
return false === \strpos($sid->getRole(), self::TOKEN_FILTER_PREFIX);
});

return \array_map(function ($sid) {
return $sid->getRole();
}, $filteredSids);
}
}
20 changes: 10 additions & 10 deletions Dbal/MutableAclProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,8 +854,8 @@ private function updateNewFieldAceProperty($name, array $changes)
$sids = new \SplObjectStorage();
$classIds = new \SplObjectStorage();
foreach ($changes[1] as $field => $new) {
for ($i = 0, $c = count($new); $i < $c; ++$i) {
$ace = $new[$i];
foreach($new as $aceOrder => $newEntry) {
$ace = $newEntry;

if (null === $ace->getId()) {
if ($sids->contains($ace->getSecurityIdentity())) {
Expand All @@ -873,8 +873,8 @@ private function updateNewFieldAceProperty($name, array $changes)

$objectIdentityId = $name === 'classFieldAces' ? null : $ace->getAcl()->getId();

$this->connection->executeQuery($this->getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $i, $sid, $ace->getStrategy(), $ace->getMask(), $ace->isGranting(), $ace->isAuditSuccess(), $ace->isAuditFailure()));
$aceId = $this->connection->executeQuery($this->getSelectAccessControlEntryIdSql($classId, $objectIdentityId, $field, $i))->fetchColumn();
$this->connection->executeQuery($this->getInsertAccessControlEntrySql($classId, $objectIdentityId, $field, $aceOrder, $sid, $ace->getStrategy(), $ace->getMask(), $ace->isGranting(), $ace->isAuditSuccess(), $ace->isAuditFailure()));
$aceId = $this->connection->executeQuery($this->getSelectAccessControlEntryIdSql($classId, $objectIdentityId, $field, $aceOrder))->fetchColumn();
$this->loadedAces[$aceId] = $ace;

$aceIdProperty = new \ReflectionProperty('Symfony\Component\Security\Acl\Domain\Entry', 'id');
Expand All @@ -895,8 +895,8 @@ private function updateOldFieldAceProperty($name, array $changes)
{
$currentIds = array();
foreach ($changes[1] as $field => $new) {
for ($i = 0, $c = count($new); $i < $c; ++$i) {
$ace = $new[$i];
foreach($new as $newEntry) {
$ace = $newEntry;

if (null !== $ace->getId()) {
$currentIds[$ace->getId()] = true;
Expand All @@ -905,8 +905,8 @@ private function updateOldFieldAceProperty($name, array $changes)
}

foreach ($changes[0] as $old) {
for ($i = 0, $c = count($old); $i < $c; ++$i) {
$ace = $old[$i];
foreach($old as $oldEntry) {
$ace = $oldEntry;

if (!isset($currentIds[$ace->getId()])) {
$this->connection->executeQuery($this->getDeleteAccessControlEntrySql($ace->getId()));
Expand Down Expand Up @@ -977,8 +977,8 @@ private function updateOldAceProperty($name, array $changes)
}
}

for ($i = 0, $c = count($old); $i < $c; ++$i) {
$ace = $old[$i];
foreach($old as $oldEntry) {
$ace = $oldEntry;

if (!isset($currentIds[$ace->getId()])) {
$this->connection->executeQuery($this->getDeleteAccessControlEntrySql($ace->getId()));
Expand Down