Merge remote-tracking branch 'origin/MAGETWO-43691-custom-admin-hostname-2' into PR_Branch

Author: Ivan Gavryshko

app/code/Magento/Backend/App/Area/FrontNameResolver.php

@@ -8,7 +8,10 @@
 namespace Magento\Backend\App\Area;
 
 use Magento\Backend\Setup\ConfigOptionsList;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\DeploymentConfig;
+use Magento\Store\Model\ScopeInterface;
+use Magento\Store\Model\Store;
 
 class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolverInterface
 {
@@ -38,27 +41,51 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
      */
     protected $deploymentConfig;
 
+    /** @var ScopeConfigInterface */
+    private $configInterface;
+
     /**
      * @param \Magento\Backend\App\Config $config
      * @param DeploymentConfig $deploymentConfig
+     * @param ScopeConfigInterface $configInterface
      */
-    public function __construct(\Magento\Backend\App\Config $config, DeploymentConfig $deploymentConfig)
-    {
+    public function __construct(
+        \Magento\Backend\App\Config $config,
+        DeploymentConfig $deploymentConfig,
+        ScopeConfigInterface $configInterface
+    ) {
         $this->config = $config;
         $this->defaultFrontName = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME);
+        $this->configInterface = $configInterface;
     }
 
     /**
      * Retrieve area front name
      *
-     * @return string
+     * @param bool $checkHost If true, verify front name is valid for this url (hostname is correct)
+     * @return string|bool
      */
-    public function getFrontName()
+    public function getFrontName($checkHost = false)
     {
+        if ($checkHost && !$this->isHostBackend()) {
+            return false;
+        }
         $isCustomPathUsed = (bool)(string)$this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
         if ($isCustomPathUsed) {
             return (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
         }
         return $this->defaultFrontName;
     }
+
+    /**
+     * Return whether the host from request is the backend host
+     * @return bool
+     */
+    public function isHostBackend()
+    {
+        $backendUrl = $this->configInterface->getValue(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
+        $backendHost = parse_url(trim($backendUrl), PHP_URL_HOST);
+        $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
+        return (strcasecmp($backendHost, $host) === 0);
+    }
 }

app/code/Magento/Backend/App/Router/NoRouteHandler.php

@@ -42,7 +42,7 @@ public function process(\Magento\Framework\App\RequestInterface $request)
         $requestPathParams = explode('/', trim($request->getPathInfo(), '/'));
         $areaFrontName = array_shift($requestPathParams);
 
-        if ($areaFrontName == $this->helper->getAreaFrontName()) {
+        if ($areaFrontName === $this->helper->getAreaFrontName(true)) {
             $moduleName = $this->routeConfig->getRouteFrontName('adminhtml');
             $actionNamespace = 'noroute';
             $actionName = 'index';

app/code/Magento/Backend/Helper/Data.php

@@ -198,10 +198,11 @@ public function getHomePageUrl()
     /**
      * Return Backend area front name
      *
-     * @return string
+     * @param bool $checkHost
+     * @return bool|string
      */
-    public function getAreaFrontName()
+    public function getAreaFrontName($checkHost = false)
     {
-        return $this->_frontNameResolver->getFrontName();
+        return $this->_frontNameResolver->getFrontName($checkHost);
     }
 }

app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

@@ -33,7 +33,8 @@ protected function setUp()
             ->with(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             ->will($this->returnValue($this->_defaultFrontName));
         $this->_configMock = $this->getMock('\Magento\Backend\App\Config', [], [], '', false);
-        $this->_model = new FrontNameResolver($this->_configMock, $deploymentConfigMock);
+        $configMock = $this->getMock('\Magento\Framework\App\Config\ScopeConfigInterface', [], [], '', false);
+        $this->_model = new FrontNameResolver($this->_configMock, $deploymentConfigMock, $configMock);
     }
 
     public function testIfCustomPathUsed()

app/code/Magento/ProductVideo/Controller/Adminhtml/Product/Gallery/RetrieveImage.php

@@ -128,7 +128,7 @@ protected function retrieveRemoteImage($fileUrl, $localFilePath)
         $image = $this->curl->read();
         if (empty($image)) {
             throw new \Magento\Framework\Exception\LocalizedException(
-                __('Could not get video information. Please check your connection and try again.')
+                __('Could not get preview image information. Please check your connection and try again.')
             );
         }
         $this->fileUtility->saveFile($localFilePath, $image);

app/code/Magento/ProductVideo/view/adminhtml/web/js/get-video-information.js

@@ -303,7 +303,7 @@ require([
                     additionalParams += '&autoplay=1';
                 }
 
-                src = 'http://player.vimeo.com/video/' +
+                src = window.location.protocol + '//player.vimeo.com/video/' +
                     this._code + '?api=1&player_id=vimeo' +
                     this._code +
                     timestamp +
@@ -483,7 +483,7 @@ require([
                         }
                     );
                 } else if (type === 'vimeo') {
-                    $.getJSON('http://www.vimeo.com/api/v2/video/' + id + '.json?callback=?',
+                    $.getJSON(window.location.protocol + '//www.vimeo.com/api/v2/video/' + id + '.json?callback=?',
                         {
                             format: 'json'
                         },

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -508,6 +508,9 @@ define([
             $image.find('.magnify-lens').remove();
             $image.on('click', function () {
                 if ($(this).hasClass('video-unplayed') && $(this).find('iframe').length === 0) {
+                    $('.fotorama__arr--next').hide();
+                    $('.fotorama__arr--prev').hide();
+
                     $(this).removeClass('video-unplayed');
                     $(this).find('.' + PV).productVideoLoader();
 
@@ -611,6 +614,8 @@ define([
                 $(this).remove();
                 $item.append(cloneVideoDiv);
                 $item.addClass('video-unplayed');
+                $('.fotorama__arr--next').show();
+                $('.fotorama__arr--prev').show();
                 self._hideCloseVideo();
 
             });

app/code/Magento/ProductVideo/view/frontend/web/js/load-player.js

@@ -327,6 +327,9 @@ define(['jquery', 'jquery/ui'], function ($) {
                     .attr('width', this._width)
                     .attr('height', this._height)
                     .attr('src', src)
+                    .attr('webkitallowfullscreen', '')
+                    .attr('mozallowfullscreen', '')
+                    .attr('allowfullscreen', '')
             );
             this._player = window.$f(this.element.children(':first')[0]);
 

lib/internal/Magento/Framework/App/Area/FrontNameResolverInterface.php

@@ -16,7 +16,8 @@ interface FrontNameResolverInterface
     /**
      * Retrieve front name
      *
-     * @return string
+     * @param bool if true,  only return frontname if it is valid for the host
+     * @return string|bool
      */
-    public function getFrontName();
+    public function getFrontName($checkHost = false);
 }

lib/internal/Magento/Framework/App/AreaList.php

@@ -69,9 +69,8 @@ public function getCodeByFrontName($frontName)
     {
         foreach ($this->_areas as $areaCode => &$areaInfo) {
             if (!isset($areaInfo['frontName']) && isset($areaInfo['frontNameResolver'])) {
-                $areaInfo['frontName'] = $this->_resolverFactory->create(
-                    $areaInfo['frontNameResolver']
-                )->getFrontName();
+                $resolver = $this->_resolverFactory->create($areaInfo['frontNameResolver']);
+                $areaInfo['frontName'] = $resolver->getFrontName(true);
             }
             if ($areaInfo['frontName'] == $frontName) {
                 return $areaCode;