diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php index c845c71b9232fb537e86354fa00bd468bc4c9ea0..37ce4898fc46792112642f7d3bde9d68c28cd594 100644 --- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php +++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php @@ -950,11 +950,6 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface return false; } - // Fail if user session is not in current IPLock Range - if ($sessionRecord['ses_iplock'] !== $this->ipLockClause_remoteIPNumber($this->lockIP) && $sessionRecord['ses_iplock'] !== '[DISABLED]') { - return false; - } - $this->sessionData = unserialize($sessionRecord['ses_data']); // Session is anonymous so no need to fetch user if ($sessionRecord['ses_anonymous']) { @@ -1058,7 +1053,16 @@ abstract class AbstractUserAuthentication implements LoggerAwareInterface public function isExistingSessionRecord($id) { try { - return !empty($this->getSessionBackend()->get($id)); + $sessionRecord = $this->getSessionBackend()->get($id); + if (empty($sessionRecord)) { + return false; + } + // If the session does not match the current IP lock, it should be treated as invalid + // and a new session should be created. + if ($sessionRecord['ses_iplock'] !== $this->ipLockClause_remoteIPNumber($this->lockIP) && $sessionRecord['ses_iplock'] !== '[DISABLED]') { + return false; + } + return true; } catch (SessionNotFoundException $e) { return false; }