[8.10] [RAM] fix Slack API proxy (#169171) (#169550)

# Backport This will backport the following commits from `main` to `8.11`: - [[RAM] fix Slack API proxy (#169171)](#169171)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)
elastic · Oct 23, 2023 · 86e52f1 · 86e52f1
1 parent 6a92eab
commit 86e52f1
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 14 deletions.
diff --git a/x-pack/plugins/actions/server/lib/axios_utils.test.ts b/x-pack/plugins/actions/server/lib/axios_utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import axios from 'axios';
+import axios, { AxiosInstance } from 'axios';
 import { Agent as HttpsAgent } from 'https';
 import HttpProxyAgent from 'http-proxy-agent';
 import { HttpsProxyAgent } from 'https-proxy-agent';
@@ -260,6 +260,25 @@ describe('request', () => {
       data: { incidentId: '123' },
     });
   });
+
+  test('throw an error if you use  baseUrl in your axios instance', async () => {
+    await expect(async () => {
+      await request({
+        axios: {
+          ...axios,
+          defaults: {
+            ...axios.defaults,
+            baseURL: 'https://here-we-go.com',
+          },
+        } as unknown as AxiosInstance,
+        url: '/test',
+        logger,
+        configurationUtilities,
+      });
+    }).rejects.toThrowErrorMatchingInlineSnapshot(
+      `"Do not use \\"baseURL\\" in the creation of your axios instance because you will mostly break proxy"`
+    );
+  });
 });
 
 describe('patch', () => {

diff --git a/x-pack/plugins/actions/server/lib/axios_utils.ts b/x-pack/plugins/actions/server/lib/axios_utils.ts
@@ -39,6 +39,11 @@ export const request = async <T = unknown>({
   headers?: Record<string, AxiosHeaderValue>;
   sslOverrides?: SSLSettings;
 } & AxiosRequestConfig): Promise<AxiosResponse> => {
+  if (!isEmpty(axios?.defaults?.baseURL ?? '')) {
+    throw new Error(
+      `Do not use "baseURL" in the creation of your axios instance because you will mostly break proxy`
+    );
+  }
   const { httpAgent, httpsAgent } = getCustomAgents(
     configurationUtilities,
     logger,

diff --git a/x-pack/plugins/stack_connectors/server/connector_types/slack_api/index.test.ts b/x-pack/plugins/stack_connectors/server/connector_types/slack_api/index.test.ts
@@ -32,6 +32,10 @@ const requestMock = utils.request as jest.Mock;
 
 const services: Services = actionsMock.createServices();
 const mockedLogger: jest.Mocked<Logger> = loggerMock.create();
+const headers = {
+  Authorization: 'Bearer some token',
+  'Content-type': 'application/json; charset=UTF-8',
+};
 
 let connectorType: SlackApiConnectorType;
 let configurationUtilities: jest.Mocked<ActionsConfigurationUtilities>;
@@ -244,9 +248,10 @@ describe('execute', () => {
     expect(requestMock).toHaveBeenCalledWith({
       axios,
       configurationUtilities,
+      headers,
       logger: mockedLogger,
       method: 'post',
-      url: 'chat.postMessage',
+      url: 'https://slack.com/api/chat.postMessage',
       data: { channel: 'general', text: 'some text' },
     });
 
@@ -294,9 +299,10 @@ describe('execute', () => {
     expect(requestMock).toHaveBeenCalledWith({
       axios,
       configurationUtilities,
+      headers,
       logger: mockedLogger,
       method: 'get',
-      url: 'conversations.list?exclude_archived=true&types=public_channel,private_channel&limit=1000',
+      url: 'https://slack.com/api/conversations.list?exclude_archived=true&types=public_channel,private_channel&limit=1000',
     });
 
     expect(response).toEqual({

diff --git a/x-pack/plugins/stack_connectors/server/connector_types/slack_api/service.test.ts b/x-pack/plugins/stack_connectors/server/connector_types/slack_api/service.test.ts
@@ -125,10 +125,14 @@ describe('Slack API service', () => {
       await service.getChannels();
       expect(requestMock).toHaveBeenCalledWith({
         axios,
+        headers: {
+          Authorization: 'Bearer token',
+          'Content-type': 'application/json; charset=UTF-8',
+        },
         logger,
         configurationUtilities,
         method: 'get',
-        url: 'conversations.list?exclude_archived=true&types=public_channel,private_channel&limit=1000',
+        url: 'https://slack.com/api/conversations.list?exclude_archived=true&types=public_channel,private_channel&limit=1000',
       });
     });
 
@@ -155,10 +159,14 @@ describe('Slack API service', () => {
       expect(requestMock).toHaveBeenCalledTimes(1);
       expect(requestMock).toHaveBeenNthCalledWith(1, {
         axios,
+        headers: {
+          Authorization: 'Bearer token',
+          'Content-type': 'application/json; charset=UTF-8',
+        },
         logger,
         configurationUtilities,
         method: 'post',
-        url: 'chat.postMessage',
+        url: 'https://slack.com/api/chat.postMessage',
         data: { channel: 'general', text: 'a message' },
       });
     });

diff --git a/x-pack/plugins/stack_connectors/server/connector_types/slack_api/service.ts b/x-pack/plugins/stack_connectors/server/connector_types/slack_api/service.ts
@@ -115,13 +115,11 @@ export const createExternalService = (
     throw Error(`[Action][${SLACK_CONNECTOR_NAME}]: Wrong configuration.`);
   }
 
-  const axiosInstance = axios.create({
-    baseURL: SLACK_URL,
-    headers: {
-      Authorization: `Bearer ${token}`,
-      'Content-type': 'application/json; charset=UTF-8',
-    },
-  });
+  const axiosInstance = axios.create();
+  const headers = {
+    Authorization: `Bearer ${token}`,
+    'Content-type': 'application/json; charset=UTF-8',
+  };
 
   const getChannels = async (): Promise<
     ConnectorTypeExecutorResult<GetChannelsResponse | void>
@@ -131,9 +129,10 @@ export const createExternalService = (
         return request<GetChannelsResponse>({
           axios: axiosInstance,
           configurationUtilities,
+          headers,
           logger,
           method: 'get',
-          url: `conversations.list?exclude_archived=true&types=public_channel,private_channel&limit=${LIMIT}${
+          url: `${SLACK_URL}conversations.list?exclude_archived=true&types=public_channel,private_channel&limit=${LIMIT}${
             cursor.length > 0 ? `&cursor=${cursor}` : ''
           }`,
         });
@@ -188,7 +187,8 @@ export const createExternalService = (
       const result: AxiosResponse<PostMessageResponse> = await request({
         axios: axiosInstance,
         method: 'post',
-        url: 'chat.postMessage',
+        url: `${SLACK_URL}chat.postMessage`,
+        headers,
         logger,
         data: { channel: channels[0], text },
         configurationUtilities,