[SecurityBundle] Move cache of the firewall context into the request parameters #22943
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stof
requested changes
May 29, 2017
| private function getFirewallContext(Request $request) | ||
| { | ||
| if ($this->contexts->contains($request)) { | ||
| return $this->contexts[$request]; | ||
| if ($request->attributes->has('_firewall_context')) { |
There was a problem hiding this comment.
you should validate that $request->attributes->get('_firewall_context') is a valid key of $this->map
There was a problem hiding this comment.
Done. And added test assertions on the value of this attribute.
|
why is it opened against the master branch if you want it for 3.4 ? master is 4.0 |
ogizanagi
approved these changes
May 29, 2017
chalasr
requested changes
May 30, 2017
| return $this->contexts[$request]; | ||
| if ($request->attributes->has('_firewall_context')) { | ||
| $contextId = $request->attributes->get('_firewall_context'); | ||
| if (array_key_exists($contextId, $this->map)) { |
There was a problem hiding this comment.
$this->map can be Traversable (and it is)
|
Is it possible that a sub-request get created with all the attributes of its master request? In that case, using the request attributes as a cache would be wrong. |
fabpot
requested changes
Jun 9, 2017
| @@ -141,15 +139,29 @@ public function getFirewallConfig(Request $request) | |||
| return $context->getConfig(); | |||
| } | |||
|
|
|||
| /** | |||
| * @param Request $request | |||
| /** | ||
| * @param Request $request | ||
| * | ||
| * @return \Symfony\Bundle\SecurityBundle\Security\FirewallContext |
There was a problem hiding this comment.
You should add a use statement and use FirewallContext here instead.
There was a problem hiding this comment.
After this change, fabbot reports is as an unused import and removes the use statement.
f335537 to
e306ec0
Compare
|
@fabpot The cache was introduced in 3.2. I've updated the PR. |
fabpot
requested changes
Jun 10, 2017
| @@ -11,6 +11,8 @@ | |||
|
|
|||
| namespace Symfony\Bundle\SecurityBundle\Security; | |||
|
|
|||
| use Psr\Container\ContainerInterface; | |||
| use Symfony\Bundle\SecurityBundle\Security\FirewallContext | |||
aa9745d to
3108023
Compare
Validate that _firewall_context attribute is in the map keys
3108023 to
ffaceb1
Compare
|
Tests are broken. |
GromNaN
commented
Jun 10, 2017
|
|
||
| $firewallContext = $this->getMockBuilder(FirewallContext::class)->disableOriginalConstructor()->getMock(); | ||
| $firewallContext->expects($this->once())->method('getConfig')->willReturn('CONFIG'); | ||
| $firewallContext->expects($this->once())->method('getContext')->willReturn(array('LISTENERS', 'EXCEPTION LISTENER')); |
There was a problem hiding this comment.
After merging into 3.3, getContext is replaced by getListeners and getExceptionListener, update this line to:
$firewallContext->expects($this->once())->method('getListeners')->willReturn('LISTENERS');
$firewallContext->expects($this->once())->method('getExceptionListener')->willReturn('EXCEPTION LISTENER');
fabpot
approved these changes
Jun 14, 2017
|
Thank you @GromNaN. |
fabpot
added a commit
that referenced
this pull request
Jun 14, 2017
…he request parameters (GromNaN) This PR was squashed before being merged into the 3.2 branch (closes #22943). Discussion ---------- [SecurityBundle] Move cache of the firewall context into the request parameters Following [this proposal](#22605 (comment)). Since the matching context relates to the request, this information should have been cached inside the request parameters. | Q | A | ------------- | --- | Branch? | 3.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #22605 | License | MIT | Doc PR | n/a * Avoid memory leak when handling multiple requests * Adding the new request parameter `_firewall_context` might be considered as a breaking change. That adds a new "public" property that could be used by end developers. Commits ------- b3203cb [SecurityBundle] Move cache of the firewall context into the request parameters
|
should be closed |
nicolas-grekas
added a commit
that referenced
this pull request
Dec 13, 2019
…ncyweb) This PR was merged into the 3.4 branch. Discussion ---------- [SecurityBundle][FirewallMap] Remove unused property | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | no | License | MIT | Doc PR | - This property is unused. It was removed in #22943. It was likely reintroduced in a merge commit. It is still on master. Commits ------- 0904e57 [SecurityBundle][FirewallMap] Remove unused property
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Following this proposal. Since the matching context relates to the request, this information should have been cached inside the request parameters.
_firewall_contextmight be considered as a breaking change. That adds a new "public" property that could be used by end developers.