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

Fix #2427 by converting $remember to integer #2428

Merged
merged 3 commits into from
Dec 3, 2016
Merged

Fix #2427 by converting $remember to integer #2428

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9ee9d21
Fix #2427 by converting $remember to integer
justin-sleep Nov 30, 2016
bcadd22
Explicitly cast $remember to int rather than using identity operator
justin-sleep Dec 1, 2016
25a5c65
Move integer casting to the top of the chain
justin-sleep Dec 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public function createSessionToken(IRequest $request, $uid, $loginName, $passwor
try {
$sessionId = $this->session->getId();
$pwd = $this->getPassword($password);
$this->tokenProvider->generateToken($sessionId, $uid, $loginName, $pwd, $name, IToken::TEMPORARY_TOKEN, $remember);
$this->tokenProvider->generateToken($sessionId, $uid, $loginName, $pwd, $name, IToken::TEMPORARY_TOKEN, (int)$remember);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should either be at the top of the chain (LoginController:

server/core/Controller/LoginController.php

Line 243 in d75e35b

$this->userSession->createSessionToken($this->request, $loginResult->getUID(), $user, $password, $remember_login);
)
or the bottom (DefaultTokenProvider:

server/lib/private/Authentication/Token/DefaultTokenProvider.php

Line 94 in 2183a1f

$dbToken->setRemember($remember);
)

but not in the middle?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And I think top is the way to go, because also this method states that it should be called with an integer only.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup sounds good!

return true;
} catch (SessionNotAvailableException $ex) {
// This can happen with OCC, where a memory session is used
Expand Down