Update existing auth token on apache login #4002
Closed
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
regenerate session ID on apache login ocs needs to be able to login via apache Signed-off-by: Morris Jobke <hey@morrisjobke.de>
MorrisJobke
requested review from
ChristophWurst,
LukasReschke,
blizzz,
icewind1991,
nickvergessen and
rullzer
|
@MorrisJobke, thanks for your PR! By analyzing the history of the files in this pull request, we identified @icewind1991, @tomneedham and @LukasReschke to be potential reviewers. |
MorrisJobke
commented
Mar 23, 2017
| $loginSuccess = $userSession->tryTokenLogin($request); | ||
| if (!$loginSuccess) { | ||
| $loginSuccess = $userSession->tryBasicAuthLogin($request, \OC::$server->getBruteForceThrottler()); | ||
| if (OC_User::handleApacheAuth()) { |
Member
Author
There was a problem hiding this comment.
This handleApacheAuth() was basically added here.
MorrisJobke
commented
Mar 23, 2017
| } | ||
| self::getUserSession()->setLoginName($uid); | ||
| $userSession = self::getUserSession(); | ||
| $userSession->getSession()->regenerateId(); |
Member
Author
There was a problem hiding this comment.
This is the only changed line here.
Member
|
How can I (easily) test stuff like this? Do we have a testing setup, e.g. with docker images somewhere, similar to LDAP? |
Member
Author
🙈 |
Member
Author
|
@LukasReschke Any idea how to test this? |
Member
Author
|
I noticed that this code is not called in our code base: so I removed it #4430 |
Member
Author
|
And here is the cleaned up version: #4539 |
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.
@LukasReschke @ChristophWurst @icewind1991 Please have an in detail look into this. Does this make sense? I only resolved one conflict and naively ported this. Login still works, but I can't judge on this change.