fix(session): Avoid useless authtoken DB queries for anonymous requests #42607
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
juliushaertl
reviewed
Jan 8, 2024
lib/private/User/Session.php
Outdated
| $instanceId = $this->config->getSystemValueString('instanceid'); | ||
| if (is_null($request->getCookie($instanceId))) { | ||
| return false; | ||
| } |
There was a problem hiding this comment.
Without looking in depth, just from the following code lines I think that this could have unexpected side effects when just authenticating with an app password which is also a token but not necessarily has cookies if clients send it.
There was a problem hiding this comment.
Adjusted so that the token lookup by session id only happens if there is neither an Authrorization header nor session cookie
ChristophWurst
approved these changes
Jan 16, 2024
juliushaertl
approved these changes
Jan 16, 2024
|
/backport to stable28 |
|
/backport to stable27 |
|
/backport to stable26 |
solracsf
commented
Jan 16, 2024
lib/private/User/Session.php
Outdated
| @@ -842,13 +842,16 @@ public function tryTokenLogin(IRequest $request) { | |||
| $authHeader = $request->getHeader('Authorization'); | |||
| if (str_starts_with($authHeader, 'Bearer ')) { | |||
| $token = substr($authHeader, 7); | |||
| } else { | |||
| // No auth header, let's try session id | |||
| } else if ($request->getCookie($this->config->getSystemValueString('instanceid')) !== null) { | |||
There was a problem hiding this comment.
Suggested change
| } else if ($request->getCookie($this->config->getSystemValueString('instanceid')) !== null) { | |
| } elseif ($request->getCookie($this->config->getSystemValueString('instanceid')) !== null) { |
…ous request Co-Authored-By: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
ChristophWurst
force-pushed
the
tokenAnonReq
branch
from
5e342b6
to
72e0618
Compare
This was referenced Jan 17, 2024
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.
Checklist