Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

we can't invalidate the token if there isn't a user session active #36153

Merged
merged 1 commit into from
Sep 4, 2019
Merged

we can't invalidate the token if there isn't a user session active #36153

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,10 @@ public static function initSession() {
// if this is a new session, invalidate any previously stored auth token.
// this could happen if the session disappears / expires in the server but the user
// didn't log out explicitly
\OC::$server->getUserSession()->invalidateSessionToken();
if (\OC::$server->getUserSession() !== null) {
// web installer doesn't have a valid userSession at this point
\OC::$server->getUserSession()->invalidateSessionToken();
}
} else {
if (\time() - $session->get('LAST_ACTIVITY') > $sessionLifeTime) {
// session timeout
Expand Down