ACP2E-3373: [Cloud] Admin Panel exposed to the public - Custom Admin URL not effective

Author: dhorytskyi

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

@@ -137,15 +137,18 @@ public function isHostBackend()
             }
         }
         $this->uri->parse($backendUrl);
-        if (!$this->uri->getHost()) {
+        $configuredHost = $this->uri->getHost();
+        if (!$configuredHost) {
             return false;
         }
 
-        $configuredPort = $this->uri->getPort() ?: ($this->standardPorts[$this->uri->getScheme()] ?? '80');
-        $configuredHost = $this->uri->getHost() . ':' . $configuredPort;
-        $host = $this->request->getServer('HTTP_HOST');
-        if (!str_contains($host, ':')) {
-            $host .= ':' . ($this->standardPorts[$this->request->getServer('REQUEST_SCHEME')] ?? '80');
+        $configuredPort = $this->uri->getPort() ?: ($this->standardPorts[$this->uri->getScheme()] ?? null);
+        $uri = ($this->request->isSecure() ? 'https' : 'http') . '://' . $this->request->getServer('HTTP_HOST');
+        $this->uri->parse($uri);
+        $host = $this->uri->getHost();
+        if ($configuredPort) {
+            $configuredHost .= ':' . $configuredPort;
+            $host .= ':' . ($this->uri->getPort() ?: $this->standardPorts[$this->uri->getScheme()]);
         }
 
         return strcasecmp($configuredHost, $host) === 0;

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

@@ -62,7 +62,7 @@ protected function setUp(): void
             ->method('get')
             ->with(ConfigOptionsList::CONFIG_PATH_BACKEND_FRONTNAME)
             ->willReturn($this->_defaultFrontName);
-        $this->uri = $this->createMock(Uri::class);
+        $this->uri = $this->createPartialMock(Uri::class, ['parse']);
         $this->request = $this->createMock(Http::class);
         $this->configMock = $this->createMock(Config::class);
         $this->scopeConfigMock = $this->createMock(ScopeConfigInterface::class);
@@ -149,34 +149,16 @@ public function testIsHostBackend(
             ->willReturnMap(
                 [
                     ['HTTP_HOST', null, $host],
-                    ['REQUEST_SCHEME', null, $isHttps ? 'https' : 'http'],
                 ]
             );
+        $this->request->method('isSecure')
+            ->willReturn($isHttps);
 
-        $urlParts = [];
         $this->uri->method('parse')
             ->willReturnCallback(
-                function ($url) use (&$urlParts) {
-                    $urlParts = parse_url($url);
-                }
-            );
-        $this->uri->method('getScheme')
-            ->willReturnCallback(
-                function () use (&$urlParts) {
-                    return array_key_exists('scheme', $urlParts) ? $urlParts['scheme'] : '';
-                }
-            );
-        $this->uri->method('getHost')
-            ->willReturnCallback(
-                function () use (&$urlParts) {
-                    return array_key_exists('host', $urlParts) ? $urlParts['host'] : '';
-                }
-            );
-        $this->uri->method('getPort')
-            ->willReturnCallback(
-                function () use (&$urlParts) {
-                    return array_key_exists('port', $urlParts) ? $urlParts['port'] : '';
-                }
+                fn ($url) => $this->uri->setScheme(parse_url($url, PHP_URL_SCHEME))
+                    ->setHost(parse_url($url, PHP_URL_HOST))
+                    ->setPort(parse_url($url, PHP_URL_PORT))
             );
 
         $this->assertEquals($expectedValue, $this->model->isHostBackend());
@@ -192,11 +174,8 @@ public function testIsHostBackendWithEmptyHost(): void
         $this->request->expects($this->any())
             ->method('getServer')
             ->willReturn('magento2.loc');
-        $this->uri->expects($this->once())
-            ->method('getHost')
-            ->willReturn(null);
 
-        $this->assertEquals($this->model->isHostBackend(), false);
+        $this->assertFalse($this->model->isHostBackend());
     }
 
     /**