diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Security] made a unique name required for each firewall

Browse Source
This commit is contained in:
Johannes M. Schmitt 2011-01-28 21:02:54 +01:00 committed by Fabien Potencier
parent 2539da5e6a
commit f2a3135bd0
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
View File

@ -185,11 +185,19 @@ class SecurityExtension extends Extension
// load firewall map
$mapDef = $container->getDefinition('security.firewall.map');
$map = array();
foreach ($firewalls as $firewall) {
list($matcher, $listeners, $exceptionListener) = $this->createFirewall($container, $firewall, $providerIds, $factories);
$names = $map = array();
foreach ($firewalls as $name => $firewall) {
if (isset($firewall['name'])) {
$name = $firewall['name'];
}
if (in_array($name, $names)) {
throw new \RuntimeException(sprintf('The firewall name must be unique. Duplicate found: "%s"', $name));
}
$names[] = $name;
$contextId = 'security.firewall.map.context.'.count($map);
list($matcher, $listeners, $exceptionListener) = $this->createFirewall($container, $name, $firewall, $providerIds, $factories);
$contextId = 'security.firewall.map.context.'.$name;
$context = $container->setDefinition($contextId, new DefinitionDecorator('security.firewall.context'));
$context
->setArgument(0, $listeners)
@ -200,11 +208,8 @@ class SecurityExtension extends Extension
$mapDef->setArgument(1, $map);
}
protected function createFirewall(ContainerBuilder $container, $firewall, $providerIds, array $factories)
protected function createFirewall(ContainerBuilder $container, $id, $firewall, $providerIds, array $factories)
{
// unique id for this firewall
$id = md5(serialize($firewall));
// Matcher
$i = 0;
$matcher = null;