Merge branch 'main' into entity-risk-scoring-new-doc-link

elastic · Dec 6, 2023 · 56e545e · 56e545e
2 parents d5f5842 + 9f3f22a
commit 56e545e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/core/http/core-http-server-internal/src/lifecycle_handlers.test.ts b/packages/core/http/core-http-server-internal/src/lifecycle_handlers.test.ts
@@ -301,6 +301,7 @@ describe('restrictInternal post-auth handler', () => {
       name: 'my-server-name',
       restrictInternalApis: true,
     });
+
     it('returns a bad request if called without internal origin header for internal API', () => {
       const handler = createRestrictInternalRoutesPostAuthHandler(config as HttpConfig);
       const request = createForgeRequest('internal');
@@ -310,8 +311,8 @@ describe('restrictInternal post-auth handler', () => {
       const result = handler(request, responseFactory, toolkit);
 
       expect(toolkit.next).not.toHaveBeenCalled();
-      expect(responseFactory.badRequest.mock.calls[0][0]?.body).toMatch(
-        /uri \[.*\/internal\/some-path\] with method \[get\] exists but is not available with the current configuration/
+      expect(responseFactory.badRequest.mock.calls[0][0]?.body).toMatchInlineSnapshot(
+        `"uri [/internal/some-path] with method [get] exists but is not available with the current configuration"`
       );
       expect(result).toBe('badRequest');
     });

diff --git a/packages/core/http/core-http-server-internal/src/lifecycle_handlers.ts b/packages/core/http/core-http-server-internal/src/lifecycle_handlers.ts
@@ -54,7 +54,7 @@ export const createRestrictInternalRoutesPostAuthHandler = (
     if (isRestrictionEnabled && isInternalRoute && !request.isInternalApiRequest) {
       // throw 400
       return response.badRequest({
-        body: `uri [${request.url}] with method [${request.route.method}] exists but is not available with the current configuration`,
+        body: `uri [${request.url.pathname}] with method [${request.route.method}] exists but is not available with the current configuration`,
       });
     }
     return toolkit.next();