Apptoken v3: imrpove token handling on external password change #11390
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
rullzer
added
enhancement
2. developing
| @@ -338,4 +338,10 @@ private function decryptPassword(string $password, string $token): string { | |||
| } | |||
| } | |||
|
|
|||
| public function markPasswordInvalid(IToken $token, string $tokenId) { | |||
| //No need to mark as invalid. We just invalide default tokens | |||
| $this->invalidateToken($tokenId); | |||
There was a problem hiding this comment.
You don't check the concrete class here …
There was a problem hiding this comment.
I should be consitent yes. However I do check it in the PublicKeyTokenProvider since we use a function that is only available on this function always works. Anyway let me be consistent ;)
|
|
||
| $token->setPasswordInvalid(true); | ||
| $this->mapper->update($token); | ||
| return $token; |
There was a problem hiding this comment.
return value is neither in the interface nor does the manager pass it on
lib/private/User/Session.php
Outdated
| @@ -694,12 +694,18 @@ private function checkTokenCredentials(IToken $dbToken, $token) { | |||
| return true; | |||
| } | |||
|
|
|||
| if ($this->manager->checkPassword($dbToken->getLoginName(), $pwd) === false | |||
| || (!is_null($this->activeUser) && !$this->activeUser->isEnabled())) { | |||
| // Invalidate tken if the user is no longer active | |||
| @@ -922,5 +922,9 @@ public function updateSessionTokenPassword($password) { | |||
| } | |||
| } | |||
|
|
|||
| public function updateTokens(string $uid, string $password) { | |||
There was a problem hiding this comment.
At some point we should discuss a refactoring of this user session class. This will soon be unmaintainable due to its complexity 🙈
rullzer
force-pushed
the
feature/11043/apptoken_v3
branch
from
ab9c5ec to
0c7d5ee
Compare
|
@blizzz could you give this a test with LDAP?
|
Will do today. |
|
@rullzer tested, workz! |
rullzer
force-pushed
the
feature/11043/apptoken_v3
branch
from
000dae4 to
6477843
Compare
rullzer
added
3. to review
|
Ready for review :) |
ChristophWurst
approved these changes
Oct 2, 2018
| $qb->select('*') | ||
| ->from('authtoken') | ||
| ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) | ||
| ->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true))) |
There was a problem hiding this comment.
better specify the type (bool) here
Signed-off-by: Roeland Jago Douma <[email protected]>
Signed-off-by: Roeland Jago Douma <[email protected]>
* On weblogin check if we have invalid public key tokens * If so update them all with the new token This ensures that your marked as invalid tokens work again if you once login on the web. Signed-off-by: Roeland Jago Douma <[email protected]>
Signed-off-by: Roeland Jago Douma <[email protected]>
rullzer
force-pushed
the
feature/11043/apptoken_v3
branch
from
6477843 to
19f84f7
Compare
MorrisJobke
added
4. to release
This was referenced Oct 2, 2018
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.
Fixes #11043
Easiest to review per commit
Todo: