fix(auth): Keep redirect URL during 2FA setup and challenge #44745
Conversation
This file contains 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
ChristophWurst
added
bug
3. to review
ChristophWurst
requested review from
miaulalala,
nickvergessen and
st3iny
as code owners
|
/backport to stable29 |
|
/backport to stable28 |
|
/backport to stable27 |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $params = [ | ||
| 'redirect_url' => $this->request->getParam('redirect_url'), | ||
| ]; | ||
| if (!isset($params['redirect_url']) && isset($this->request->server['REQUEST_URI'])) { |
Check notice
Code scanning / Psalm
NoInterfaceProperties Note
| $params = [ | ||
| 'redirect_url' => $this->request->getParam('redirect_url'), | ||
| ]; | ||
| if (!isset($params['redirect_url']) && isset($this->request->server['REQUEST_URI'])) { |
There was a problem hiding this comment.
I still find it disturbing that isset is false when the value is null...
nickvergessen
approved these changes
Apr 9, 2024
ChristophWurst
added
4. to release
ChristophWurst
force-pushed
the
fix/auth/2fa-redirect-url
branch
from
6083dad
to
8fbd8cc
Compare
| @@ -230,7 +231,7 @@ | |||
| * @NoCSRFRequired | |||
| */ | |||
| #[FrontpageRoute(verb: 'GET', url: 'login/setupchallenge/{providerId}')] | |||
| public function setupProvider(string $providerId) { | |||
| public function setupProvider(string $providerId, ?string $redirect_url = null) { | |||
Check notice
Code scanning / Psalm
MissingReturnType Note
| @@ -264,11 +266,12 @@ | |||
| * @todo handle the extreme edge case of an invalid provider ID and redirect to the provider selection page | |||
| */ | |||
| #[FrontpageRoute(verb: 'POST', url: 'login/setupchallenge/{providerId}')] | |||
| public function confirmProviderSetup(string $providerId) { | |||
| public function confirmProviderSetup(string $providerId, ?string $redirect_url = null) { | |||
Check notice
Code scanning / Psalm
MissingReturnType Note
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
ChristophWurst
force-pushed
the
fix/auth/2fa-redirect-url
branch
from
dc9f352
to
22dc278
Compare
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.
Summary
The redirect URL is crucial when a user is sent to Nextcloud to grant access for clients during the login flow. Without this, users will log in and land on the default page instead of the grant page for the setup.
How to test
Master: land at /apps/dashboard, /apps/files or whatever the default is
Here: land at /settings/user
TODO
Checklist