aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/security/LoginManager.php
diff options
context:
space:
mode:
authorArthurHoaro <arthur@hoa.ro>2019-02-09 12:36:31 +0100
committerGitHub <noreply@github.com>2019-02-09 12:36:31 +0100
commit905f8675a728841b03b300d2c7dc909a1c4f7f03 (patch)
treec587dd4e34acfe784153fb34a3014bb7fb6573d8 /application/security/LoginManager.php
parent7417e8ac4a4cf742ace1679c046425bb3f2bac2c (diff)
parentd9ba1cdd44a7eec9e7f4d429087c6ba838ad473e (diff)
downloadShaarli-905f8675a728841b03b300d2c7dc909a1c4f7f03.tar.gz
Shaarli-905f8675a728841b03b300d2c7dc909a1c4f7f03.tar.zst
Shaarli-905f8675a728841b03b300d2c7dc909a1c4f7f03.zip
Merge pull request #1182 from ArthurHoaro/feature/session-protection-stay-login
Do not check the IP address with session protection disabled
Diffstat (limited to 'application/security/LoginManager.php')
-rw-r--r--application/security/LoginManager.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/application/security/LoginManager.php b/application/security/LoginManager.php
index 0f315483..1ff3d0be 100644
--- a/application/security/LoginManager.php
+++ b/application/security/LoginManager.php
@@ -58,6 +58,9 @@ class LoginManager
58 */ 58 */
59 public function generateStaySignedInToken($clientIpAddress) 59 public function generateStaySignedInToken($clientIpAddress)
60 { 60 {
61 if ($this->configManager->get('security.session_protection_disabled') === true) {
62 $clientIpAddress = '';
63 }
61 $this->staySignedInToken = sha1( 64 $this->staySignedInToken = sha1(
62 $this->configManager->get('credentials.hash') 65 $this->configManager->get('credentials.hash')
63 . $clientIpAddress 66 . $clientIpAddress