Repository navigation
Keep Router::getRequest() in sync with the authenticated request - #826
Merged
Merged
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
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.
Problem
AuthenticationMiddlewareadds theidentity,authenticationandauthenticationResultattributes to the request, but does not store the new request inRouter. UntilBaseApplication::handle()callsRouter::setRequest(),Router::getRequest()returns the request stored byRoutingMiddleware, which has no identity.ErrorHandlerMiddlewarerenders exceptions forRouter::getRequest() ?? $request. So when a middleware placed afterAuthenticationMiddlewarethrows, the error page is rendered without the identity:ErrorControllerhas noauthenticationattribute,IdentityHelperreports a guest, and error trackers get no user. Session users can be recovered by reading the session again. Users of stateless authenticators (token, HTTP Basic, environment) cannot.AuthenticationComponenthas the same gap. Methods that replace the controller's request don't updateRouter. If an action throws aftersetIdentity()orlogout(), the error page shows the identity from before the change.Changes
AuthenticationMiddleware::process()callsRouter::setRequest()after setting the attributes. As inAuthenticationService, it does this only for aServerRequestand only whenRouterexists, so the middleware still works outside the CakePHP framework.AuthenticationComponentgets a protectedupdateRequest()helper that sets the request on the controller and onRouter. It is used bysetIdentity(),replaceIdentity(),logout(),impersonate()andstopImpersonating().Tests
AuthenticationMiddlewareTest::testRouterRequestIsUpdatedchecks thatRouter::getRequest()has the authenticated identity, the service and the result after the middleware runs.testSetIdentity,testReplaceIdentityandtestLogoutinAuthenticationComponentTestnow also check thatRouter::getRequest()matches the controller's request.Notes
Overlaps with #802 in
setIdentity().