From 0b54186340447ccd74fe608f96f72feb7042ed79 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerg=C5=91=20Tisza?= Date: Wed, 10 Feb 2016 13:55:35 -0800 Subject: [PATCH] Fix invalid key warning in CookieSessionProvider error handling code Change-Id: I68172ff5fcd6acaab7ecf298ed4a47f23cb8c9f7 --- includes/session/CookieSessionProvider.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/session/CookieSessionProvider.php b/includes/session/CookieSessionProvider.php index 3177dc2363..f55c589036 100644 --- a/includes/session/CookieSessionProvider.php +++ b/includes/session/CookieSessionProvider.php @@ -103,15 +103,15 @@ class CookieSessionProvider extends SessionProvider { } public function provideSessionInfo( WebRequest $request ) { + $sessionId = $this->getCookie( $request, $this->params['sessionName'], '' ); $info = array( - 'id' => $this->getCookie( $request, $this->params['sessionName'], '' ), 'provider' => $this, 'forceHTTPS' => $this->getCookie( $request, 'forceHTTPS', '', false ) ); - if ( !SessionManager::validateSessionId( $info['id'] ) ) { - unset( $info['id'] ); + if ( SessionManager::validateSessionId( $sessionId ) ) { + $info['id'] = $sessionId; + $info['persisted'] = true; } - $info['persisted'] = isset( $info['id'] ); list( $userId, $userName, $token ) = $this->getUserInfoFromCookies( $request ); if ( $userId !== null ) { @@ -126,7 +126,7 @@ class CookieSessionProvider extends SessionProvider { $this->logger->warning( 'Session "{session}" requested with mismatched UserID and UserName cookies.', array( - 'session' => $info['id'], + 'session' => $sessionId, 'mismatch' => array( 'userid' => $userId, 'cookie_username' => $userName, @@ -141,7 +141,7 @@ class CookieSessionProvider extends SessionProvider { $this->logger->warning( 'Session "{session}" requested with invalid Token cookie.', array( - 'session' => $info['id'], + 'session' => $sessionId, 'userid' => $userId, 'username' => $userInfo->getName(), ) ); -- 2.20.1