*/
class LoginManager
{
+ /** @var string Name of the cookie set after logging in **/
+ public static $STAY_SIGNED_IN_COOKIE = 'shaarli_staySignedIn';
+
/** @var array A reference to the $_GLOBALS array */
protected $globals = [];
/** @var bool Whether the Shaarli instance is open to public edition **/
protected $openShaarli = false;
+ /** @var string User sign-in token depending on remote IP and credentials */
+ protected $staySignedInToken = '';
+
/**
* Constructor
*
$this->sessionManager = $sessionManager;
$this->banFile = $this->configManager->get('resource.ban_file', 'data/ipbans.php');
$this->readBanFile();
- if ($this->configManager->get('security.open_shaarli')) {
+ if ($this->configManager->get('security.open_shaarli') === true) {
$this->openShaarli = true;
}
}
+ /**
+ * Generate a token depending on deployment salt, user password and client IP
+ *
+ * @param string $clientIpAddress The remote client IP address
+ */
+ public function generateStaySignedInToken($clientIpAddress)
+ {
+ $this->staySignedInToken = sha1(
+ $this->configManager->get('credentials.hash')
+ . $clientIpAddress
+ . $this->configManager->get('credentials.salt')
+ );
+ }
+
+ /**
+ * Return the user's client stay-signed-in token
+ *
+ * @return string User's client stay-signed-in token
+ */
+ public function getStaySignedInToken()
+ {
+ return $this->staySignedInToken;
+ }
+
/**
* Check user session state and validity (expiration)
*
* @param array $cookie The $_COOKIE array
- * @param string $webPath Path on the server in which the cookie will be available on
* @param string $clientIpId Client IP address identifier
- * @param string $token Session token
- *
- * @return bool true if the user session is valid, false otherwise
*/
- public function checkLoginState($cookie, $webPath, $clientIpId, $token)
+ public function checkLoginState($cookie, $clientIpId)
{
if (! $this->configManager->exists('credentials.login')) {
// Shaarli is not configured yet
return;
}
- if (isset($cookie[SessionManager::$LOGGED_IN_COOKIE])
- && $cookie[SessionManager::$LOGGED_IN_COOKIE] === $token
+ if (isset($cookie[self::$STAY_SIGNED_IN_COOKIE])
+ && $cookie[self::$STAY_SIGNED_IN_COOKIE] === $this->staySignedInToken
) {
+ // The user client has a valid stay-signed-in cookie
+ // Session information is updated with the current client information
$this->sessionManager->storeLoginInfo($clientIpId);
- $this->isLoggedIn = true;
- }
-
- if ($this->sessionManager->hasSessionExpired()
+ } elseif ($this->sessionManager->hasSessionExpired()
|| $this->sessionManager->hasClientIpChanged($clientIpId)
) {
- $this->sessionManager->logout($webPath);
+ $this->sessionManager->logout();
$this->isLoggedIn = false;
return;
}
+ $this->isLoggedIn = true;
$this->sessionManager->extendSession();
}