Merge remote-tracking branch 'ext/MAGETWO-45159-insecure-admin-cookie' into MAGETWO-45093-Magento-is-stuck-in-Maintenance-mode-if-Backup-is-created-during-disabling-module-via-Web-Setup-Wizard

Author: Ivan Gavryshko

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

@@ -84,6 +84,7 @@ public function __construct(
         $adminPath = $this->extractAdminPath();
         $this->setCookiePath($adminPath);
         $this->setName($sessionName);
+        $this->setCookieSecure($this->_httpRequest->isSecure());
     }
 
     /**

app/code/Magento/Backend/Test/Unit/Model/Session/AdminConfigTest.php

@@ -105,12 +105,14 @@ public function testSetCookiePathNonDefault()
     }
 
     /**
-     * Test for setting session name for admin
-     *
+     * Test for setting session name and secure_cookie for admin
+     * @dataProvider requestSecureDataProvider
+     * @param $secureRequest
      */
-    public function testSetSessionNameByConstructor()
+    public function testSetSessionSettingsByConstructor($secureRequest)
     {
         $sessionName = 'admin';
+        $this->requestMock->expects($this->once())->method('isSecure')->willReturn($secureRequest);
 
         $validatorMock = $this->getMockBuilder('Magento\Framework\Validator\ValidatorInterface')
             ->disableOriginalConstructor()
@@ -136,5 +138,11 @@ public function testSetSessionNameByConstructor()
             ]
         );
         $this->assertSame($sessionName, $adminConfig->getName());
+        $this->assertSame($secureRequest, $adminConfig->getCookieSecure());
+    }
+
+    public function requestSecureDataProvider()
+    {
+        return [[true], [false]];
     }
 }