fix priority ordering of security voters

This commit is contained in:
Christian Flothmann 2017-02-20 08:38:24 +01:00
parent 50324777bf
commit dcd19f3cf9
2 changed files with 62 additions and 5 deletions

View File

@ -31,15 +31,15 @@ class AddSecurityVotersPass implements CompilerPassInterface
return; return;
} }
$voters = new \SplPriorityQueue(); $voters = array();
foreach ($container->findTaggedServiceIds('security.voter') as $id => $attributes) { foreach ($container->findTaggedServiceIds('security.voter') as $id => $attributes) {
$priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0; $priority = isset($attributes[0]['priority']) ? $attributes[0]['priority'] : 0;
$voters->insert(new Reference($id), $priority); $voters[$priority][] = new Reference($id);
} }
$voters = iterator_to_array($voters); krsort($voters);
ksort($voters); $voters = call_user_func_array('array_merge', $voters);
$container->getDefinition('security.access.decision_manager')->replaceArgument(0, array_values($voters)); $container->getDefinition('security.access.decision_manager')->replaceArgument(0, $voters);
} }
} }

View File

@ -0,0 +1,57 @@
<?php
/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Symfony\Bundle\SecurityBundle\Tests\DependencyInjection\Compiler;
use PHPUnit\Framework\TestCase;
use Symfony\Bundle\SecurityBundle\DependencyInjection\Compiler\AddSecurityVotersPass;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Reference;
class AddSecurityVotersPassTest extends TestCase
{
public function testThatSecurityVotersAreProcessedInPriorityOrder()
{
$container = new ContainerBuilder();
$container
->register('security.access.decision_manager', 'Symfony\Component\Security\Core\Authorization\AccessDecisionManager')
->addArgument(array())
;
$container
->register('no_prio_service')
->addTag('security.voter')
;
$container
->register('lowest_prio_service')
->addTag('security.voter', array('priority' => 100))
;
$container
->register('highest_prio_service')
->addTag('security.voter', array('priority' => 200))
;
$container
->register('zero_prio_service')
->addTag('security.voter', array('priority' => 0))
;
$compilerPass = new AddSecurityVotersPass();
$compilerPass->process($container);
$this->assertEquals(
array(
new Reference('highest_prio_service'),
new Reference('lowest_prio_service'),
new Reference('no_prio_service'),
new Reference('zero_prio_service'),
),
$container->getDefinition('security.access.decision_manager')->getArgument(0)
);
}
}