MAGETWO-43691: Custom admin path does not work correctly

 - refactor to do check for HTTP_HOST in one place
 - fix unit test

Author: monkeysee

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

@@ -38,6 +38,11 @@ class FrontNameResolver implements \Magento\Framework\App\Area\FrontNameResolver
      */
     protected $deploymentConfig;
 
+    /**
+     * @var \Magento\Backend\Model\UrlInterface
+     */
+    protected $backendUrl;
+
     /**
      * @param \Magento\Backend\App\Config $config
      * @param DeploymentConfig $deploymentConfig
@@ -56,21 +61,29 @@ public function __construct(
     /**
      * Retrieve area front name
      *
-     * @param string $host If set, verify front name is valid for this url (hostname is correct)
-     * @return string
+     * @param bool $checkHost If true, verify front name is valid for this url (hostname is correct)
+     * @return string|bool
      */
-    public function getFrontName($host = null)
+    public function getFrontName($checkHost = false)
     {
-        if ($host) {
-            $bu = $this->backendUrl->getBaseUrl();
-            if (stripos($bu, $host) === false) {
-                return 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()
+    {
+        $backendHost = parse_url(trim($this->backendUrl->getBaseUrl()), PHP_URL_HOST);
+        $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : '';
+        return (strcasecmp($backendHost, $host) === 0);
+    }
 }

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

@@ -19,24 +19,16 @@ class NoRouteHandler implements \Magento\Framework\App\Router\NoRouteHandlerInte
      */
     protected $routeConfig;
 
-    /**
-     * @var \Magento\Backend\Model\UrlInterface
-     */
-    protected $backendUrl;
-
     /**
      * @param \Magento\Backend\Helper\Data $helper
      * @param \Magento\Framework\App\Route\ConfigInterface $routeConfig
-     * @param \Magento\Backend\Model\UrlInterface $backendUrl
      */
     public function __construct(
         \Magento\Backend\Helper\Data $helper,
-        \Magento\Framework\App\Route\ConfigInterface $routeConfig,
-        \Magento\Backend\Model\UrlInterface $backendUrl
+        \Magento\Framework\App\Route\ConfigInterface $routeConfig
     ) {
         $this->helper = $helper;
         $this->routeConfig = $routeConfig;
-        $this->backendUrl = $backendUrl;
     }
 
     /**
@@ -50,15 +42,12 @@ public function process(\Magento\Framework\App\RequestInterface $request)
         $requestPathParams = explode('/', trim($request->getPathInfo(), '/'));
         $areaFrontName = array_shift($requestPathParams);
 
-        if ($areaFrontName == $this->helper->getAreaFrontName()) {
-            $baseUrl = $this->backendUrl->getBaseUrl();
-            if (!stripos($baseUrl, $_SERVER['HTTP_HOST']) === false) {
-                $moduleName = $this->routeConfig->getRouteFrontName('adminhtml');
-                $actionNamespace = 'noroute';
-                $actionName = 'index';
-                $request->setModuleName($moduleName)->setControllerName($actionNamespace)->setActionName($actionName);
-                return true;
-            }
+        if ($areaFrontName === $this->helper->getAreaFrontName(true)) {
+            $moduleName = $this->routeConfig->getRouteFrontName('adminhtml');
+            $actionNamespace = 'noroute';
+            $actionName = 'index';
+            $request->setModuleName($moduleName)->setControllerName($actionNamespace)->setActionName($actionName);
+            return true;
         }
         return false;
     }

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

@@ -198,10 +198,11 @@ public function getHomePageUrl()
     /**
      * Return Backend area front name
      *
-     * @return string
+     * 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);
+        $backendUrlMock = $this->getMock('\Magento\Backend\Model\UrlInterface', [], [], '', false);
+        $this->_model = new FrontNameResolver($this->_configMock, $deploymentConfigMock, $backendUrlMock);
     }
 
     public function testIfCustomPathUsed()

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

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

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

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