[Security] Fixed auth provider authenticate() cannot return void #24644
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
Oct 20, 2017
| @@ -26,12 +26,15 @@ public function testSupports() | |||
| $this->assertFalse($provider->supports($this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\TokenInterface')->getMock())); | |||
| } | |||
|
|
|||
| /** | |||
| * @expectedException \Symfony\Component\Security\Core\Exception\BadCredentialsException | |||
There was a problem hiding this comment.
you should also use @expectedExceptionMessage to be sure it is the right one being thrown
| @@ -38,7 +38,7 @@ public function __construct($key) | |||
| public function authenticate(TokenInterface $token) | |||
| { | |||
| if (!$this->supports($token)) { | |||
| return; | |||
| throw new BadCredentialsException('The token is not supported by this authentication provider.'); | |||
There was a problem hiding this comment.
I would use AuthenticationException, not BadCredentialsException, as it is not a case of bad credentials (it is a case of a bug in the supports implementation or in the calling code ignoring supports)
|
Update: Use |
stof
approved these changes
Oct 20, 2017
|
@glye if you want to have the PR appearing as merged rather than closed, I suggest you to squash your fixup commit yourselves. |
The AuthenticationManagerInterface requires that authenticate() must return a TokenInterface, never null. Several authentication providers are violating this. Changed to throw exception instead.
8eabff8 to
6e18b56
Compare
|
Right! Squashed. |
4 tasks
chalasr
approved these changes
Oct 20, 2017
fabpot
approved these changes
Oct 20, 2017
|
Thank you @glye. |
fabpot
added a commit
that referenced
this pull request
Oct 20, 2017
…n void (glye) This PR was merged into the 2.7 branch. Discussion ---------- [Security] Fixed auth provider authenticate() cannot return void | Q | A | ------------- | --- | Branch? | 2.7 and up | Bug fix? | yes | New feature? | no | BC breaks? | no (arguably) | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | The `AuthenticationManagerInterface` [requires](https://github.com/symfony/symfony/blob/2.7/src/Symfony/Component/Security/Core/Authentication/AuthenticationManagerInterface.php#L30) that `authenticate()` must return a TokenInterface, never null. Several authentication providers are violating this. Changed to throw exception instead. See discussion in earlier PR #24585 which was changing the docblock rather than the implementations. Commits ------- 6e18b56 [Security] Fixed auth provider authenticate() cannot return void
This was referenced Oct 30, 2017
Merged
Merged
This was referenced Nov 10, 2017
Merged
Merged
Merged
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.
The
AuthenticationManagerInterfacerequires thatauthenticate()must return a TokenInterface, never null. Several authentication providers are violating this. Changed to throw exception instead.See discussion in earlier PR #24585 which was changing the docblock rather than the implementations.