MC-24840: Infinite redirect in case of backend URL is different from default website URL

OlgaVasyltsun · OlgaVasyltsun · commit 50535cf17ac4 · 2020-12-09T17:57:48.000+02:00
diff --git a/app/code/Magento/Backend/App/Area/FrontNameResolver.php b/app/code/Magento/Backend/App/Area/FrontNameResolver.php
@@ -120,10 +120,10 @@ public function getFrontName($checkHost = false)
      */
     public function isHostBackend()
     {
-        if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
-            $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
+        if ($this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL)) {
+            $backendUrl = $this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_URL);
         } else {
-            $backendUrl = $this->scopeConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE);
+            $backendUrl = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_URL);
         }
         $host = $this->request->getServer('HTTP_HOST', '');
         return stripos($this->getHostWithPort($backendUrl), (string) $host) !== false;

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,10 @@ public function getFrontName($checkHost = false)`
`120`	`120`	`*/`
`121`	`121`	`public function isHostBackend()`
`122`	`122`	`{`
`123`		`- if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {`
`124`		`- $backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);`
	`123`	`+ if ($this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL)) {`
	`124`	`+ $backendUrl = $this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_URL);`
`125`	`125`	`} else {`
`126`		`- $backendUrl = $this->scopeConfig->getValue(Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE);`
	`126`	`+ $backendUrl = $this->config->getValue(Store::XML_PATH_UNSECURE_BASE_URL);`
`127`	`127`	`}`
`128`	`128`	`$host = $this->request->getServer('HTTP_HOST', '');`
`129`	`129`	`return stripos($this->getHostWithPort($backendUrl), (string) $host) !== false;`