MAGETWO-58862: Admin session lifetime is always 0

Author: AVoskoboinikov

app/code/Magento/Backend/Model/Auth/Session.php

@@ -168,10 +168,13 @@ public function isLoggedIn()
      */
     public function prolong()
     {
+        $lifetime = $this->_config->getValue(self::XML_PATH_SESSION_LIFETIME);
         $cookieValue = $this->cookieManager->getCookie($this->getName());
+
         if ($cookieValue) {
             $this->setUpdatedAt(time());
             $cookieMetadata = $this->cookieMetadataFactory->createPublicCookieMetadata()
+                ->setDuration($lifetime)
                 ->setPath($this->sessionConfig->getCookiePath())
                 ->setDomain($this->sessionConfig->getCookieDomain())
                 ->setSecure($this->sessionConfig->getCookieSecure())

app/code/Magento/Backend/Test/Unit/Model/Auth/SessionTest.php

@@ -158,12 +158,21 @@ public function testProlong()
     {
         $name = session_name();
         $cookie = 'cookie';
+        $lifetime = 900;
         $path = '/';
         $domain = 'magento2';
         $secure = true;
         $httpOnly = true;
 
+        $this->config->expects($this->once())
+            ->method('getValue')
+            ->with(\Magento\Backend\Model\Auth\Session::XML_PATH_SESSION_LIFETIME)
+            ->willReturn($lifetime);
         $cookieMetadata = $this->getMock(\Magento\Framework\Stdlib\Cookie\PublicCookieMetadata::class);
+        $cookieMetadata->expects($this->once())
+            ->method('setDuration')
+            ->with($lifetime)
+            ->will($this->returnSelf());
         $cookieMetadata->expects($this->once())
             ->method('setPath')
             ->with($path)

lib/internal/Magento/Framework/Session/Config.php

@@ -133,7 +133,8 @@ public function __construct(
         /**
          * Cookie settings: lifetime, path, domain, httpOnly. These govern settings for the session cookie.
          */
-        $this->configureCookieLifetime();
+        $lifetime = $this->_scopeConfig->getValue($this->lifetimePath, $this->_scopeType);
+        $this->setCookieLifetime($lifetime, self::COOKIE_LIFETIME_DEFAULT);
 
         $path = $this->_scopeConfig->getValue(self::XML_PATH_COOKIE_PATH, $this->_scopeType);
         $path = empty($path) ? $this->_httpRequest->getBasePath() : $path;
@@ -515,15 +516,4 @@ public function __call($method, $args)
             throw new \BadMethodCallException(sprintf('Method "%s" does not exist in %s', $method, get_class($this)));
         }
     }
-
-    /**
-     * Set session cookie lifetime according to configuration
-     *
-     * @return $this
-     */
-    protected function configureCookieLifetime()
-    {
-        $lifetime = $this->_scopeConfig->getValue($this->lifetimePath, $this->_scopeType);
-        return $this->setCookieLifetime($lifetime, self::COOKIE_LIFETIME_DEFAULT);
-    }
 }

lib/internal/Magento/Framework/Session/Test/Unit/ConfigTest.php

@@ -351,7 +351,7 @@ public function constructorDataProvider()
                 true,
                 [
                     'session.cache_limiter' => 'files',
-                    'session.cookie_lifetime' => 0,
+                    'session.cookie_lifetime' => 7200,
                     'session.cookie_path' => '/',
                     'session.cookie_domain' => 'init.host',
                     'session.cookie_httponly' => false,
@@ -419,6 +419,7 @@ protected function getModel($validator)
 
         $this->configMock = $this->getMock(\Magento\Framework\App\Config\ScopeConfigInterface::class);
         $getValueReturnMap = [
+            ['test_web/test_cookie/test_cookie_lifetime', 'store', null, 7200],
             ['web/cookie/cookie_path', 'store', null, ''],
         ];
         $this->configMock->method('getValue')