admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-16 17:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(core): Fix http requests by using correct agent (#16258)

Browse Source
This commit is contained in:
Elias Meire
2025-06-12 10:50:06 +02:00
committed by GitHub
parent a0176ae973
commit e58de1a6e4
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/src/execution-engine/node-execution-context/utils/__tests__/request-helper-functions.test.ts
View File

@@ -1,6 +1,7 @@
import FormData from 'form-data'; import FormData from 'form-data';
import { Agent as HttpAgent } from 'http';
import { HttpProxyAgent } from 'http-proxy-agent'; import { HttpProxyAgent } from 'http-proxy-agent';
import { Agent } from 'https'; import { Agent as HttpsAgent } from 'https';
import { HttpsProxyAgent } from 'https-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent';
import { mock } from 'jest-mock-extended'; import { mock } from 'jest-mock-extended';
import type { import type {
@@ -322,7 +323,7 @@ describe('Request Helper Functions', () => {
url: 'https://example.de/foo/bar', url: 'https://example.de/foo/bar',
headers: { Host: 'other.host.com' }, headers: { Host: 'other.host.com' },
}); });
expect((axiosOptions.httpsAgent as Agent).options.servername).toEqual('example.de'); expect((axiosOptions.httpsAgent as HttpsAgent).options.servername).toEqual('example.de');
}); });
describe('should set SSL certificates', () => { describe('should set SSL certificates', () => {
@@ -337,7 +338,7 @@ describe('Request Helper Functions', () => {
test('on regular requests', async () => { test('on regular requests', async () => {
const axiosOptions = await parseRequestObject(requestObject); const axiosOptions = await parseRequestObject(requestObject);
expect((axiosOptions.httpsAgent as Agent).options).toEqual({ expect((axiosOptions.httpsAgent as HttpsAgent).options).toEqual({
servername: 'example.de', servername: 'example.de',
...agentOptions, ...agentOptions,
noDelay: true, noDelay: true,
@@ -356,7 +357,7 @@ describe('Request Helper Functions', () => {
}; };
axiosOptions.beforeRedirect!(redirectOptions, mock()); axiosOptions.beforeRedirect!(redirectOptions, mock());
expect(redirectOptions.agent).toEqual(redirectOptions.agents.https); expect(redirectOptions.agent).toEqual(redirectOptions.agents.https);
expect((redirectOptions.agent as Agent).options).toEqual({ expect((redirectOptions.agent as HttpsAgent).options).toEqual({
servername: 'example.de', servername: 'example.de',
...agentOptions, ...agentOptions,
noDelay: true, noDelay: true,
@@ -876,12 +877,20 @@ describe('Request Helper Functions', () => {
const proxyUrlHttps = 'http://proxy-for-https.com:8080/'; const proxyUrlHttps = 'http://proxy-for-https.com:8080/';
const proxyUrlHttp = 'http://proxy-for-http.com:8080/'; const proxyUrlHttp = 'http://proxy-for-http.com:8080/';
test('should return a regular agent when no proxy is set', async () => { test('should return a regular HTTP agent when no proxy is set', async () => {
const { agent, protocol } = getAgentWithProxy({
targetUrl: baseUrlHttp,
});
expect(protocol).toEqual('http');
expect(agent).toBeInstanceOf(HttpAgent);
});
test('should return a regular HTTPS agent when no proxy is set', async () => {
const { agent, protocol } = getAgentWithProxy({ const { agent, protocol } = getAgentWithProxy({
targetUrl: baseUrlHttps, targetUrl: baseUrlHttps,
}); });
expect(protocol).toEqual('https'); expect(protocol).toEqual('https');
expect(agent).toBeInstanceOf(Agent); expect(agent).toBeInstanceOf(HttpsAgent);
}); });
test('should use a proxyConfig object', async () => { test('should use a proxyConfig object', async () => {
@@ -943,7 +952,7 @@ describe('Request Helper Functions', () => {
targetUrl: 'https://should-not-proxy.com/foo', targetUrl: 'https://should-not-proxy.com/foo',
}); });
expect(protocol).toEqual('https'); expect(protocol).toEqual('https');
expect(agent).toBeInstanceOf(Agent); expect(agent).toBeInstanceOf(HttpsAgent);
}); });
}); });
}); });

3
packages/core/src/execution-engine/node-execution-context/utils/request-helper-functions.ts
View File

@@ -19,10 +19,9 @@ import type { AxiosError, AxiosHeaders, AxiosRequestConfig, AxiosResponse } from
import axios from 'axios'; import axios from 'axios';
import crypto, { createHmac } from 'crypto'; import crypto, { createHmac } from 'crypto';
import FormData from 'form-data'; import FormData from 'form-data';
import { IncomingMessage } from 'http'; import { IncomingMessage, Agent as HttpAgent } from 'http';
import { HttpProxyAgent } from 'http-proxy-agent'; import { HttpProxyAgent } from 'http-proxy-agent';
import { type AgentOptions, Agent as HttpsAgent } from 'https'; import { type AgentOptions, Agent as HttpsAgent } from 'https';
import { Agent as HttpAgent } from 'https';
import { HttpsProxyAgent } from 'https-proxy-agent'; import { HttpsProxyAgent } from 'https-proxy-agent';
import get from 'lodash/get'; import get from 'lodash/get';
import isEmpty from 'lodash/isEmpty'; import isEmpty from 'lodash/isEmpty';