sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24552 from nextcloud/enh/remember_me_is_not_app_password 

Remember me is not an app_password
pull/24416/head
Roeland Jago Douma 2020-12-04 16:35:44 +07:00 committed by GitHub
parent 0d7819eb6c 5cc348ae72
commit f0862dcfaa
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
Unescape Escape View File

@ -832,8 +832,18 @@ class Session implements IUserSession, Emitter {
return false;
}
// Set the session variable so we know this is an app password
$this->session->set('app_password', $token);
try {
$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;
}