mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24564 from nextcloud/backport/24552/stable19 

[stable19] Remember me is not an app_password
This commit is contained in:
Roeland Jago Douma 2020-12-07 11:56:43 +01:00 committed by GitHub
parent 71e406627e ec270ce35e
commit 7bff8a4c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/private/User/Session.php
View File

@ -825,8 +825,18 @@ class Session implements IUserSession, Emitter {
return false; return false;
} }
// Set the session variable so we know this is an app password try {
$this->session->set('app_password', $token); $dbToken = $this->tokenProvider->getToken($token);
} catch (InvalidTokenException $e) {
// Can't really happen but better save than sorry
return true;
}
// Remember me tokens are not app_passwords
if ($dbToken->getRemember() === IToken::DO_NOT_REMEMBER) {
// Set the session variable so we know this is an app password
$this->session->set('app_password', $token);
}
return true; return true;
} }