-
Notifications
You must be signed in to change notification settings - Fork 56
Prevent parallel login flows after logout #1410
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
f2cd34d
fix: only redirect to the login flow when the request comes from a 'n…
julien-nc 2a7b869
make isTopLevelHtmlNavigation less restrictive
julien-nc 8a3cb0e
allow storing multiple states, cleanup on failure is still missing
julien-nc f1b7775
delete flow session values when the code endpoint fails or succeeds
julien-nc 08a4855
check if user is logged in at the beginning of the code endpoint. if …
julien-nc ca67713
adjust isTopLevelHtmlNavigation tests
julien-nc File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| namespace OCA\UserOIDC\Service; | ||
|
|
||
| use OCP\IRequest; | ||
|
|
||
| class RequestClassificationService { | ||
| public static function isTopLevelHtmlNavigation(IRequest $request): bool { | ||
| if (strtoupper($request->getMethod()) !== 'GET') { | ||
| return false; | ||
| } | ||
|
|
||
| if ($request->getHeader('OCS-apirequest') !== '') { | ||
| return false; | ||
| } | ||
|
|
||
| if ($request->getHeader('X-Requested-With') === 'XMLHttpRequest') { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
| } | ||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| <?php | ||
|
|
||
| /** | ||
| * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors | ||
| * SPDX-License-Identifier: AGPL-3.0-or-later | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| use OCA\UserOIDC\Service\RequestClassificationService; | ||
| use OCP\IRequest; | ||
| use PHPUnit\Framework\Attributes\DataProvider; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| class RequestClassificationServiceTest extends TestCase { | ||
| #[DataProvider('topLevelHtmlNavigationProvider')] | ||
| public function testIsTopLevelHtmlNavigation(string $method, array $headers, bool $expected): void { | ||
| $request = $this->createMock(IRequest::class); | ||
| $request->method('getMethod') | ||
| ->willReturn($method); | ||
| $request->method('getHeader') | ||
| ->willReturnCallback(static function (string $name) use ($headers): string { | ||
| return $headers[$name] ?? ''; | ||
| }); | ||
|
|
||
| self::assertSame($expected, RequestClassificationService::isTopLevelHtmlNavigation($request)); | ||
| } | ||
|
|
||
| public static function topLevelHtmlNavigationProvider(): array { | ||
| return [ | ||
| 'top level navigation' => [ | ||
| 'GET', | ||
| [], | ||
| true, | ||
| ], | ||
| 'xhr request' => [ | ||
| 'GET', | ||
| [ | ||
| 'X-Requested-With' => 'XMLHttpRequest', | ||
| ], | ||
| false, | ||
| ], | ||
| 'ocs api request' => [ | ||
| 'GET', | ||
| [ | ||
| 'OCS-apirequest' => 'true', | ||
| ], | ||
| false, | ||
| ], | ||
| 'non get request' => [ | ||
| 'POST', | ||
| [], | ||
| false, | ||
| ], | ||
| ]; | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.