ssl.redirectHttpFromPort: use host from request instead of config (e…

…lastic#188088) ## Summary Fix elastic#24870
kpatticha · Jul 12, 2024 · 49cfa96 · 49cfa96
1 parent 180fc29
commit 49cfa96
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/packages/core/http/core-http-server-internal/src/https_redirect_server.test.ts b/packages/core/http/core-http-server-internal/src/https_redirect_server.test.ts
@@ -96,3 +96,14 @@ test('forwards http requests to https', async () => {
       expect(res.header.location).toEqual(`https://${config.host}:${config.port}/`);
     });
 });
+
+test('keeps the request host when redirecting', async () => {
+  await server.start(config);
+
+  await supertest(`http://localhost:${config.ssl.redirectHttpFromPort}`)
+    .get('/')
+    .expect(302)
+    .then((res) => {
+      expect(res.header.location).toEqual(`https://localhost:${config.port}/`);
+    });
+});
diff --git a/packages/core/http/core-http-server-internal/src/https_redirect_server.ts b/packages/core/http/core-http-server-internal/src/https_redirect_server.ts
@@ -40,7 +40,7 @@ export class HttpsRedirectServer {
       return responseToolkit
         .redirect(
           formatUrl({
-            hostname: config.host,
+            hostname: request.url.hostname,
             pathname: request.url.pathname,
             port: config.port,
             protocol: 'https',