8000 [Security] AccessDecisionManager refactoring by hhamon · Pull Request #942 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Security] AccessDecisionManager refactoring #942

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

Closed
wants to merge 3 commits into from
Closed

[Security] AccessDecisionManager refactoring #942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fea6b5b
[Security] refactored Security component. Split access decision strat…
May 14, 2011
6b84ceb
[Security] fixed security.xml and SecurityExtension to match with the…
May 14, 2011
34a8c27
[Security] fixed classes namespaces in SecurityExtension.
May 14, 2011
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
Prev Previous commit
Next Next commit
[Security] fixed security.xml and SecurityExtension to match with the… 
… previous refactoring.
  • Loading branch information
Hugo Hamon committed May 14, 2011
commit 6b84ceb94ba16fa35ddd1803ce670caf2df329cc
27 changes: 14 additions & 13 deletions src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ public function load(array $configs, ContainerBuilder $container)

// set some global scalars
$container->setParameter('security.access.denied_url', $config['access_denied_url']);
$container->setParameter('security.access.allow_if_all_abstain', $config['access_decision_manager']['allow_if_all_abstain']);
$container->setParameter('security.access.allow_if_equal_granted_denied', $config['access_decision_manager']['allow_if_equal_granted_denied']);

$strategy = sprintf('security.access.%s_access_strategy', $config['access_decision_manager']['strategy']);
$container->setAlias('security.access.strategy', $strategy);

$container->getDefinition('security.authentication.session_strategy')->replaceArgument(0, $config['session_fixation_strategy']);
$container
->getDefinition('security.access.decision_manager')
->addArgument($config['access_decision_manager']['strategy'])
->addArgument($config['access_decision_manager']['allow_if_all_abstain'])
->addArgument($config['access_decision_manager']['allow_if_equal_granted_denied'])
;
$container->setParameter('security.access.always_authenticate_before_granting', $config['always_authenticate_before_granting']);

$this->createFirewalls($config, $container);
Expand All @@ -86,6 +86,9 @@ public function load(array $configs, ContainerBuilder $container)

// add some required classes for compilation
$this->addClassesToCompile(array(
'Symfony\\Component\\HttpFoundation\\RequestMatcher',
'Symfony\\Component\\HttpFoundation\\RequestMatcherInterface',

'Symfony\\Component\\Security\\Http\\Firewall',
'Symfony\\Component\\Security\\Http\\FirewallMapInterface',
'Symfony\\Component\\Security\\Core\\SecurityContext',
Expand All @@ -95,16 +98,14 @@ public function load(array $configs, ContainerBuilder $container)
'Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationManagerInterface',
'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManager',
'Symfony\\Component\\Security\\Core\\Authorization\\AccessDecisionManagerInterface',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\AccessStrategyInterface',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\AccessStrategy',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\AffirmativeAccessStrategy',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\ConsensusAccessStrategy',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\UnanimousAccessStrategy', 'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\AccessStrategyInterface',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\AffirmativeAccessStrategy',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\ConsensusAccessStrategy',
'Symfony\\Component\\Security\\Core\\Authorization\\Strategy\UnanimousAccessStrategy',
'Symfony\\Component\\Security\\Core\\Authorization\\Voter\\VoterInterface',
'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallMap',
'Symfony\\Bundle\\SecurityBundle\\Security\\FirewallContext',

'Symfony\\Component\\HttpFoundation\\RequestMatcher',
'Symfony\\Component\\HttpFoundation\\RequestMatcherInterface',
));
}

Expand Down
20 changes: 10 additions & 10 deletions src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<parameter key="security.access.affirmative_access_strategy.class">Symfony\Component\Security\Core\Authorization\Strategy\AffirmativeAccessStrategy</parameter>
<parameter key="security.access.consensus_access_strategy.class">Symfony\Component\Security\Core\Authorization\Strategy\ConsensusAccessStrategy</parameter>
<parameter key="security.access.unanimous_access_strategy.class">Symfony\Component\Security\Core\Authorization\Strategy\UnanimousAccessStrategy</parameter>
<parameter key="security.access.allow_if_all_abstain_decisions">false</parameter>
<parameter key="security.access.allow_if_equal_granted_denied_decisions">true</parameter>
<parameter key="security.access.allow_if_all_abstain">false</parameter>
<parameter key="security.access.allow_if_equal_granted_denied">true</parameter>

<parameter key="security.access.simple_role_voter.class">Symfony\Component\Security\Core\Authorization\Voter\RoleVoter</parameter>
<parameter key="security.access.authenticated_voter.class">Symfony\Component\Security\Core\Authorization\Voter\AuthenticatedVoter</parameter>
Expand Down Expand Up @@ -78,25 +78,25 @@

<!-- Authorization related services -->
<service id="security.access.decision_manager" class="%security.access.decision_manager.class%" public="false">
<argument type="service">%security.access.affirmative_access_strategy%</argument>
<argument type="service" id="security.access.strategy"/>
</service>


<!-- Access strategies -->
<service id="security.access.affirmative_access_strategy" public="false">
<service id="security.access.affirmative_access_strategy" class="%security.access.affirmative_access_strategy.class%" public="false">
<argument type="collection"></argument>
<argument>%security.access.allow_if_all_abstain_decisions%</argument>
<argument>%security.access.allow_if_all_abstain%</argument>
</service>

<service id="security.access.consensus_access_strategy" public="false">
<service id="security.access.consensus_access_strategy" class="%security.access.consensus_access_strategy.class%" public="false">
<argument type="collection"></argument>
<argument>%security.access.allow_if_all_abstain_decisions%</argument>
<argument>%security.access.allow_if_equal_granted_denied_decisions%</argument>
<argument>%security.access.allow_if_all_abstain%</argument>
<argument>%security.access.allow_if_equal_granted_denied%</argument>
</service>

<service id="security.access.unanimous_access_strategy" public="false">
<service id="security.access.unanimous_access_strategy" class="%security.access.unanimous_access_strategy.class%" public="false">
<argument type="collection"></argument>
<argument>%security.access.allow_if_all_abstain_decisions%</argument>
<argument>%security.access.allow_if_all_abstain%</argument>
</service>

<service id="security.role_hierarchy" class="%security.role_hierarchy.class%" public="false">
Expand Down
0