Skip to content

[stable10] backport auth last check #28298

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

Merged
PVince81 merged 3 commits into from
Jul 5, 2017
Merged

[stable10] backport auth last check #28298

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
082fc33
add last_check_timeout for core appconfig
cornelinux Jun 30, 2017
88fa5bc
Fix typo timeFacory -> timeFactory
cornelinux Jun 30, 2017
efba7da
Fix missing appname
cornelinux Jun 30, 2017
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
19 changes: 11 additions & 8 deletions lib/private/User/Session.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ class Session implements IUserSession, Emitter {
private $session;

/** @var ITimeFactory */
private $timeFacory;
private $timeFactory;

/** @var IProvider */
private $tokenProvider;
Expand All @@ -100,14 +100,14 @@ class Session implements IUserSession, Emitter {
/**
* @param IUserManager $manager
* @param ISession $session
* @param ITimeFactory $timeFacory
* @param ITimeFactory $timeFactory
* @param IProvider $tokenProvider
* @param IConfig $config
*/
public function __construct(IUserManager $manager, ISession $session, ITimeFactory $timeFacory, $tokenProvider, IConfig $config) {
public function __construct(IUserManager $manager, ISession $session, ITimeFactory $timeFactory, $tokenProvider, IConfig $config) {
$this->manager = $manager;
$this->session = $session;
$this->timeFacory = $timeFacory;
$this->timeFactory = $timeFactory;
$this->tokenProvider = $tokenProvider;
$this->config = $config;
}
Expand Down Expand Up @@ -345,7 +345,7 @@ protected function supportsCookies(IRequest $request) {
if (!is_null($request->getCookie('cookie_test'))) {
return true;
}
setcookie('cookie_test', 'test', $this->timeFacory->getTime() + 3600);
setcookie('cookie_test', 'test', $this->timeFactory->getTime() + 3600);
return false;
}

Expand Down Expand Up @@ -603,10 +603,13 @@ private function getPassword($password) {
*/
private function checkTokenCredentials(IToken $dbToken, $token) {
// Check whether login credentials are still valid and the user was not disabled
// This check is performed each 5 minutes
// This check is performed each 5 minutes per default
// However, we try to read last_check_timeout from the appconfig table so the
// administrator could change this 5 minutes timeout
$lastCheck = $dbToken->getLastCheck() ? : 0;
$now = $this->timeFacory->getTime();
if ($lastCheck > ($now - 60 * 5)) {
$now = $this->timeFactory->getTime();
$last_check_timeout = intval($this->config->getAppValue('core', 'last_check_timeout', 5));
if ($lastCheck > ($now - 60 * $last_check_timeout)) {
// Checked performed recently, nothing to do now
return true;
}
Expand Down