@n8n/backend-network 1.8.1 → 1.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/http/axios/legacy.js +3 -3
- package/dist/http/axios/legacy.js.map +1 -1
- package/dist/http/axios/redirect.js +1 -2
- package/dist/http/axios/redirect.js.map +1 -1
- package/dist/http/axios/utils.d.ts +1 -0
- package/dist/http/axios/utils.js +16 -4
- package/dist/http/axios/utils.js.map +1 -1
- package/dist/http/env-proxy-http-agent.js +2 -2
- package/dist/http/env-proxy-http-agent.js.map +1 -1
- package/dist/http/env-proxy-https-agent.js +2 -2
- package/dist/http/env-proxy-https-agent.js.map +1 -1
- package/dist/http/node-agents.js +3 -4
- package/dist/http/node-agents.js.map +1 -1
- package/dist/proxy/proxied-agents.d.ts +5 -0
- package/dist/proxy/proxied-agents.js +52 -0
- package/dist/proxy/proxied-agents.js.map +1 -0
- package/dist/proxy/proxy-resolution.js +3 -4
- package/dist/proxy/proxy-resolution.js.map +1 -1
- package/package.json +6 -6
|
@@ -10,10 +10,10 @@ const qs_1 = require("qs");
|
|
|
10
10
|
const user_agent_1 = require("./user-agent");
|
|
11
11
|
const utils_1 = require("./utils");
|
|
12
12
|
function buildLegacyAgentOptions(requestObject) {
|
|
13
|
-
const
|
|
13
|
+
const servername = (0, utils_1.sniFor)((0, utils_1.getHostFromRequestObject)(requestObject));
|
|
14
14
|
const agentOptions = { ...requestObject.agentOptions };
|
|
15
|
-
if (
|
|
16
|
-
agentOptions.servername =
|
|
15
|
+
if (servername) {
|
|
16
|
+
agentOptions.servername = servername;
|
|
17
17
|
}
|
|
18
18
|
if (requestObject.rejectUnauthorized === false) {
|
|
19
19
|
agentOptions.rejectUnauthorized = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/http/axios/legacy.ts"],"names":[],"mappings":";;;;;;;AAOA,oDAA4B;AAI5B,2BAA+B;AAE/B,6CAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/http/axios/legacy.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,12 +41,11 @@ function omitHeaders(headers, patterns) {
|
|
|
41
41
|
return Object.fromEntries(Object.entries(headers ?? {}).filter(([name]) => !patterns.some((pattern) => pattern.test(name))));
|
|
42
42
|
}
|
|
43
43
|
function buildRedirectHopAgents(nextUrl, policy) {
|
|
44
|
-
const host = (0, utils_1.tryParseUrl)(nextUrl)?.hostname;
|
|
45
44
|
const customProxyUrl = policy.proxyConfig ? (0, utils_1.getUrlFromProxyConfig)(policy.proxyConfig) : null;
|
|
46
45
|
const proxy = (0, utils_1.resolveProxyOption)(customProxyUrl);
|
|
47
46
|
return (0, node_agents_1.buildNodeAgents)(proxy, policy.ssrf, {
|
|
48
47
|
...policy.agentOptions,
|
|
49
|
-
|
|
48
|
+
servername: (0, utils_1.sniFor)((0, utils_1.tryParseUrl)(nextUrl)?.hostname),
|
|
50
49
|
});
|
|
51
50
|
}
|
|
52
51
|
function discardResponseBody(response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../src/http/axios/redirect.ts"],"names":[],"mappings":";;;;AAAA,iCAAgF;AAGhF,+CAAgD;AAEhD,qCAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../src/http/axios/redirect.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export declare function throwIfDomainNotAllowed(configOrUrl: AxiosRequestConfig
|
|
|
8
8
|
export declare function tryParseUrl(url: string): URL | null;
|
|
9
9
|
export declare function isIgnoreStatusErrorConfig(ignoreHttpStatusErrors: unknown): ignoreHttpStatusErrors is IgnoreStatusErrorConfig;
|
|
10
10
|
export declare function searchForHeader(config: AxiosRequestConfig, headerName: string): string | undefined;
|
|
11
|
+
export declare function sniFor(host: string | null | undefined): string | undefined;
|
|
11
12
|
export declare const getHostFromRequestObject: (requestObject: Partial<{
|
|
12
13
|
url: string;
|
|
13
14
|
uri: string;
|
package/dist/http/axios/utils.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.throwIfDomainNotAllowed = throwIfDomainNotAllowed;
|
|
|
8
8
|
exports.tryParseUrl = tryParseUrl;
|
|
9
9
|
exports.isIgnoreStatusErrorConfig = isIgnoreStatusErrorConfig;
|
|
10
10
|
exports.searchForHeader = searchForHeader;
|
|
11
|
+
exports.sniFor = sniFor;
|
|
11
12
|
exports.resolveProxyOption = resolveProxyOption;
|
|
12
13
|
exports.digestAuthAxiosConfig = digestAuthAxiosConfig;
|
|
13
14
|
exports.isFormDataInstance = isFormDataInstance;
|
|
@@ -28,6 +29,7 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
28
29
|
const crypto_1 = __importDefault(require("crypto"));
|
|
29
30
|
const form_data_1 = __importDefault(require("form-data"));
|
|
30
31
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
32
|
+
const node_net_1 = __importDefault(require("node:net"));
|
|
31
33
|
const proxy_resolution_1 = require("../../proxy/proxy-resolution");
|
|
32
34
|
const node_agents_1 = require("../node-agents");
|
|
33
35
|
function throwIfDomainNotAllowed(configOrUrl, allowedDomains) {
|
|
@@ -56,6 +58,16 @@ function searchForHeader(config, headerName) {
|
|
|
56
58
|
headerName = headerName.toLowerCase();
|
|
57
59
|
return headerNames.find((thisHeader) => thisHeader.toLowerCase() === headerName);
|
|
58
60
|
}
|
|
61
|
+
function sniFor(host) {
|
|
62
|
+
if (!host) {
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
const unbracketed = host.startsWith('[') && host.endsWith(']') ? host.slice(1, -1) : host;
|
|
66
|
+
if (node_net_1.default.isIP(unbracketed)) {
|
|
67
|
+
return undefined;
|
|
68
|
+
}
|
|
69
|
+
return host;
|
|
70
|
+
}
|
|
59
71
|
const getHostFromRequestObject = (requestObject) => {
|
|
60
72
|
try {
|
|
61
73
|
const url = (requestObject.url ?? requestObject.uri);
|
|
@@ -83,7 +95,7 @@ const getBeforeRedirectFn = (agentOptions, axiosConfig, proxyConfig, sendCredent
|
|
|
83
95
|
}
|
|
84
96
|
const redirectAgentOptions = {
|
|
85
97
|
...agentOptions,
|
|
86
|
-
servername: redirectedRequest.hostname,
|
|
98
|
+
servername: sniFor(redirectedRequest.hostname),
|
|
87
99
|
};
|
|
88
100
|
const customProxyUrl = proxyConfig ? getUrlFromProxyConfig(proxyConfig) : null;
|
|
89
101
|
const proxy = resolveProxyOption(customProxyUrl);
|
|
@@ -187,10 +199,10 @@ function isFormDataInstance(data) {
|
|
|
187
199
|
typeof data.append === 'function'));
|
|
188
200
|
}
|
|
189
201
|
function buildAgentOptions(n8nRequest) {
|
|
190
|
-
const
|
|
202
|
+
const servername = sniFor((0, exports.getHostFromRequestObject)(n8nRequest));
|
|
191
203
|
const agentOptions = { ...n8nRequest.agentOptions };
|
|
192
|
-
if (
|
|
193
|
-
agentOptions.servername =
|
|
204
|
+
if (servername) {
|
|
205
|
+
agentOptions.servername = servername;
|
|
194
206
|
}
|
|
195
207
|
if (n8nRequest.skipSslCertificateValidation === true) {
|
|
196
208
|
agentOptions.rejectUnauthorized = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/axios/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/axios/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.EnvProxyHttpAgent = void 0;
|
|
7
|
-
const http_proxy_agent_1 = require("http-proxy-agent");
|
|
8
7
|
const node_http_1 = __importDefault(require("node:http"));
|
|
9
8
|
const env_proxy_router_1 = require("./env-proxy-router");
|
|
9
|
+
const proxied_agents_1 = require("../proxy/proxied-agents");
|
|
10
10
|
class EnvProxyHttpAgent extends node_http_1.default.Agent {
|
|
11
11
|
constructor(lookup, agentOptions) {
|
|
12
12
|
super({ ...agentOptions, lookup });
|
|
13
|
-
this.router = new env_proxy_router_1.EnvProxyRouter('http', 80, (proxyUrl) =>
|
|
13
|
+
this.router = new env_proxy_router_1.EnvProxyRouter('http', 80, (proxyUrl) => (0, proxied_agents_1.createProxiedHttpAgent)(proxyUrl, agentOptions));
|
|
14
14
|
}
|
|
15
15
|
addRequest(req, options) {
|
|
16
16
|
const proxyAgent = this.router.resolve(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-proxy-http-agent.js","sourceRoot":"","sources":["../../src/http/env-proxy-http-agent.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"env-proxy-http-agent.js","sourceRoot":"","sources":["../../src/http/env-proxy-http-agent.ts"],"names":[],"mappings":";;;;;;AACA,0DAA6B;AAG7B,yDAAoD;AAEpD,4DAAiE;AAcjE,uBAA+B,SAAQ,mBAAI,CAAC,KAAK;IAGhD,YAAY,MAAuB,EAAE,YAA+B;QACnE,KAAK,CAAC,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,iCAAc,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,QAAQ,EAAE,EAAE,CACzD,IAAA,uCAAsB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAC9C,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAuB,EAAE,OAA4B;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,UAAU,CAAC,GAAyB,EAAE,OAA2B,CAAC,CAAC;QACtF,CAAC;QAGD,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;CACD"}
|
|
@@ -4,13 +4,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.EnvProxyHttpsAgent = void 0;
|
|
7
|
-
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
8
7
|
const node_https_1 = __importDefault(require("node:https"));
|
|
9
8
|
const env_proxy_router_1 = require("./env-proxy-router");
|
|
9
|
+
const proxied_agents_1 = require("../proxy/proxied-agents");
|
|
10
10
|
class EnvProxyHttpsAgent extends node_https_1.default.Agent {
|
|
11
11
|
constructor(lookup, agentOptions) {
|
|
12
12
|
super({ ...agentOptions, lookup });
|
|
13
|
-
this.router = new env_proxy_router_1.EnvProxyRouter('https', 443, (proxyUrl) =>
|
|
13
|
+
this.router = new env_proxy_router_1.EnvProxyRouter('https', 443, (proxyUrl) => (0, proxied_agents_1.createProxiedHttpsAgent)(proxyUrl, agentOptions));
|
|
14
14
|
}
|
|
15
15
|
addRequest(req, options) {
|
|
16
16
|
const proxyAgent = this.router.resolve(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env-proxy-https-agent.js","sourceRoot":"","sources":["../../src/http/env-proxy-https-agent.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"env-proxy-https-agent.js","sourceRoot":"","sources":["../../src/http/env-proxy-https-agent.ts"],"names":[],"mappings":";;;;;;AAEA,4DAA+B;AAG/B,yDAAoD;AAEpD,4DAAkE;AAOlE,wBAAgC,SAAQ,oBAAK,CAAC,KAAK;IAGlD,YAAY,MAAuB,EAAE,YAA+B;QACnE,KAAK,CAAC,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,iCAAc,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,CAC3D,IAAA,wCAAuB,EAAC,QAAQ,EAAE,YAAY,CAAC,CAC/C,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAuB,EAAE,OAA6B;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,OAA4B,CAAC,CAAC;QACjE,CAAC;QAGD,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;CACD"}
|
package/dist/http/node-agents.js
CHANGED
|
@@ -6,13 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.isSupportedProxyUrl = isSupportedProxyUrl;
|
|
7
7
|
exports.buildNodeAgents = buildNodeAgents;
|
|
8
8
|
exports.installConnectionGuard = installConnectionGuard;
|
|
9
|
-
const http_proxy_agent_1 = require("http-proxy-agent");
|
|
10
|
-
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
11
9
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
12
10
|
const node_http_1 = __importDefault(require("node:http"));
|
|
13
11
|
const node_https_1 = __importDefault(require("node:https"));
|
|
14
12
|
const env_proxy_http_agent_1 = require("./env-proxy-http-agent");
|
|
15
13
|
const env_proxy_https_agent_1 = require("./env-proxy-https-agent");
|
|
14
|
+
const proxied_agents_1 = require("../proxy/proxied-agents");
|
|
16
15
|
function isSupportedProxyUrl(value) {
|
|
17
16
|
return (value !== null &&
|
|
18
17
|
value !== undefined &&
|
|
@@ -36,8 +35,8 @@ function buildNodeAgents(proxy, ssrf, agentOptions) {
|
|
|
36
35
|
}, ssrf);
|
|
37
36
|
}
|
|
38
37
|
return {
|
|
39
|
-
httpAgent:
|
|
40
|
-
httpsAgent:
|
|
38
|
+
httpAgent: (0, proxied_agents_1.createProxiedHttpAgent)(proxy, agentOptions),
|
|
39
|
+
httpsAgent: (0, proxied_agents_1.createProxiedHttpsAgent)(proxy, agentOptions),
|
|
41
40
|
};
|
|
42
41
|
}
|
|
43
42
|
function applyConnectionGuard(agents, ssrf) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-agents.js","sourceRoot":"","sources":["../../src/http/node-agents.ts"],"names":[],"mappings":";;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"node-agents.js","sourceRoot":"","sources":["../../src/http/node-agents.ts"],"names":[],"mappings":";;;;;;;;AAAA,+CAA+C;AAC/C,0DAA6B;AAC7B,4DAA+B;AAG/B,iEAA2D;AAC3D,mEAA6D;AAC7D,4DAA0F;AAc1F,6BAAoC,KAAgC;IACnE,OAAO,CACN,KAAK,KAAK,IAAI;QACd,KAAK,KAAK,SAAS;QACnB,CAAC,KAAK,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAC7D,CAAC;AACH,CAAC;AA0CD,yBACC,KAAkB,EAClB,IAAgB,EAChB,YAA+B;IAE/B,IAAI,YAAY,EAAE,MAAM,EAAE,CAAC;QAC1B,MAAM,IAAI,8BAAe,CACxB,sHAAsH,CACtH,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GACX,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAE7D,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,oBAAoB,CAC1B;YACC,SAAS,EAAE,IAAI,mBAAI,CAAC,KAAK,CAAC,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC;YACtD,UAAU,EAAE,IAAI,oBAAK,CAAC,KAAK,CAAC,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC;SACxD,EACD,IAAI,CACJ,CAAC;IACH,CAAC;IAED,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,oBAAoB,CAC1B;YACC,SAAS,EAAE,IAAI,wCAAiB,CAAC,MAAM,EAAE,YAAY,CAAC;YACtD,UAAU,EAAE,IAAI,0CAAkB,CAAC,MAAM,EAAE,YAAY,CAAC;SACxD,EACD,IAAI,CACJ,CAAC;IACH,CAAC;IAGD,OAAO;QACN,SAAS,EAAE,IAAA,uCAAsB,EAAC,KAAK,EAAE,YAAY,CAAC;QACtD,UAAU,EAAE,IAAA,wCAAuB,EAAC,KAAK,EAAE,YAAY,CAAC;KACxD,CAAC;AACH,CAAC;AAgBD,SAAS,oBAAoB,CAC5B,MAA0D,EAC1D,IAAgB;IAEhB,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,sBAAsB,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/C,sBAAsB,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAMD,gCACC,MAA8C,EAC9C,IAAgB;IAEhB,MAAM,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9D,MAAM,CAAC,gBAAgB,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE;QAChD,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,IAAI,SAAS,CAAC;QAC3D,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YACjD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBAChB,IAAI,SAAS,EAAE,CAAC;oBACf,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACxB,OAAO,SAAS,CAAC;gBAClB,CAAC;gBACD,MAAM,MAAM,CAAC,KAAK,CAAC;YACpB,CAAC;QACF,CAAC;QACD,OAAO,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { HttpProxyAgent } from 'http-proxy-agent';
|
|
2
|
+
import { HttpsProxyAgent } from 'https-proxy-agent';
|
|
3
|
+
import type https from 'node:https';
|
|
4
|
+
export declare function createProxiedHttpAgent(proxyUrl: string, agentOptions?: https.AgentOptions): HttpProxyAgent<string>;
|
|
5
|
+
export declare function createProxiedHttpsAgent(proxyUrl: string, agentOptions?: https.AgentOptions): HttpsProxyAgent<string>;
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createProxiedHttpAgent = createProxiedHttpAgent;
|
|
4
|
+
exports.createProxiedHttpsAgent = createProxiedHttpsAgent;
|
|
5
|
+
const http_proxy_agent_1 = require("http-proxy-agent");
|
|
6
|
+
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
7
|
+
const CONNECTION_OPTION_KEYS = [
|
|
8
|
+
'keepAlive',
|
|
9
|
+
'keepAliveMsecs',
|
|
10
|
+
'keepAliveInitialDelay',
|
|
11
|
+
'maxSockets',
|
|
12
|
+
'maxTotalSockets',
|
|
13
|
+
'maxFreeSockets',
|
|
14
|
+
'scheduling',
|
|
15
|
+
'timeout',
|
|
16
|
+
'noDelay',
|
|
17
|
+
'family',
|
|
18
|
+
'hints',
|
|
19
|
+
'localAddress',
|
|
20
|
+
'localPort',
|
|
21
|
+
'lookup',
|
|
22
|
+
'autoSelectFamily',
|
|
23
|
+
'autoSelectFamilyAttemptTimeout',
|
|
24
|
+
];
|
|
25
|
+
function pickKeys(agentOptions, keys) {
|
|
26
|
+
return Object.fromEntries(Object.entries(agentOptions).filter(([key]) => keys.includes(key)));
|
|
27
|
+
}
|
|
28
|
+
function omitKeys(agentOptions, keys) {
|
|
29
|
+
return Object.fromEntries(Object.entries(agentOptions).filter(([key]) => !keys.includes(key)));
|
|
30
|
+
}
|
|
31
|
+
function forProxyConnection(agentOptions = {}) {
|
|
32
|
+
return pickKeys(agentOptions, CONNECTION_OPTION_KEYS);
|
|
33
|
+
}
|
|
34
|
+
function forTunnelledConnection(agentOptions = {}) {
|
|
35
|
+
return omitKeys(agentOptions, ['servername']);
|
|
36
|
+
}
|
|
37
|
+
class TunnellingHttpsProxyAgent extends https_proxy_agent_1.HttpsProxyAgent {
|
|
38
|
+
constructor(proxyUrl, agentOptions) {
|
|
39
|
+
super(proxyUrl, forProxyConnection(agentOptions));
|
|
40
|
+
this.tunnelOptions = forTunnelledConnection(agentOptions);
|
|
41
|
+
}
|
|
42
|
+
async connect(req, opts) {
|
|
43
|
+
return await super.connect(req, { ...opts, ...this.tunnelOptions });
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
function createProxiedHttpAgent(proxyUrl, agentOptions) {
|
|
47
|
+
return new http_proxy_agent_1.HttpProxyAgent(proxyUrl, forProxyConnection(agentOptions));
|
|
48
|
+
}
|
|
49
|
+
function createProxiedHttpsAgent(proxyUrl, agentOptions) {
|
|
50
|
+
return new TunnellingHttpsProxyAgent(proxyUrl, agentOptions);
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=proxied-agents.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"proxied-agents.js","sourceRoot":"","sources":["../../src/proxy/proxied-agents.ts"],"names":[],"mappings":";;;;AAAA,uDAAkD;AAClD,yDAAoD;AAgBpD,MAAM,sBAAsB,GAAG;IAC9B,WAAW;IACX,gBAAgB;IAChB,uBAAuB;IACvB,YAAY;IACZ,iBAAiB;IACjB,gBAAgB;IAChB,YAAY;IACZ,SAAS;IACT,SAAS;IACT,QAAQ;IACR,OAAO;IACP,cAAc;IACd,WAAW;IACX,QAAQ;IACR,kBAAkB;IAClB,gCAAgC;CAC2B,CAAC;AAE7D,SAAS,QAAQ,CAAC,YAAgC,EAAE,IAAuB;IAC1E,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAC5C,CAAC;AACzB,CAAC;AAED,SAAS,QAAQ,CAAC,YAAgC,EAAE,IAAuB;IAC1E,OAAO,MAAM,CAAC,WAAW,CACxB,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAC7C,CAAC;AACzB,CAAC;AAED,SAAS,kBAAkB,CAAC,YAAY,GAAuB,EAAE;IAChE,OAAO,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC,CAAC;AACvD,CAAC;AAED,SAAS,sBAAsB,CAAC,YAAY,GAAuB,EAAE;IACpE,OAAO,QAAQ,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;AAC/C,CAAC;AAED,MAAM,yBAA0B,SAAQ,mCAAuB;IAG9D,YAAY,QAAgB,EAAE,YAAiC;QAC9D,KAAK,CAAC,QAAQ,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;QAClD,IAAI,CAAC,aAAa,GAAG,sBAAsB,CAAC,YAAY,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAuB,EAAE,IAAsB;QAC5D,OAAO,MAAM,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;IACrE,CAAC;CACD;AASD,gCACC,QAAgB,EAChB,YAAiC;IAEjC,OAAO,IAAI,iCAAc,CAAC,QAAQ,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;AACvE,CAAC;AASD,iCACC,QAAgB,EAChB,YAAiC;IAEjC,OAAO,IAAI,yBAAyB,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAC9D,CAAC"}
|
|
@@ -8,24 +8,23 @@ exports.createHttpProxyAgent = createHttpProxyAgent;
|
|
|
8
8
|
exports.createHttpsProxyAgent = createHttpsProxyAgent;
|
|
9
9
|
exports.hasProxyEnvironmentVariables = hasProxyEnvironmentVariables;
|
|
10
10
|
const http_1 = __importDefault(require("http"));
|
|
11
|
-
const http_proxy_agent_1 = require("http-proxy-agent");
|
|
12
11
|
const https_1 = __importDefault(require("https"));
|
|
13
|
-
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
14
12
|
const proxy_from_env_1 = require("proxy-from-env");
|
|
13
|
+
const proxied_agents_1 = require("./proxied-agents");
|
|
15
14
|
function resolveProxyUrl(targetUrl, fallbackUrl) {
|
|
16
15
|
return (0, proxy_from_env_1.getProxyForUrl)(targetUrl ?? fallbackUrl ?? '') || undefined;
|
|
17
16
|
}
|
|
18
17
|
function createHttpProxyAgent(targetUrl, customProxyUrl, options) {
|
|
19
18
|
const proxyUrl = customProxyUrl ?? (0, proxy_from_env_1.getProxyForUrl)(targetUrl);
|
|
20
19
|
if (proxyUrl) {
|
|
21
|
-
return
|
|
20
|
+
return (0, proxied_agents_1.createProxiedHttpAgent)(proxyUrl, options);
|
|
22
21
|
}
|
|
23
22
|
return new http_1.default.Agent(options);
|
|
24
23
|
}
|
|
25
24
|
function createHttpsProxyAgent(targetUrl, customProxyUrl, options) {
|
|
26
25
|
const proxyUrl = customProxyUrl ?? (0, proxy_from_env_1.getProxyForUrl)(targetUrl);
|
|
27
26
|
if (proxyUrl) {
|
|
28
|
-
return
|
|
27
|
+
return (0, proxied_agents_1.createProxiedHttpsAgent)(proxyUrl, options);
|
|
29
28
|
}
|
|
30
29
|
return new https_1.default.Agent(options);
|
|
31
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proxy-resolution.js","sourceRoot":"","sources":["../../src/proxy/proxy-resolution.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gDAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"proxy-resolution.js","sourceRoot":"","sources":["../../src/proxy/proxy-resolution.ts"],"names":[],"mappings":";;;;;;;;;AAAA,gDAAwB;AACxB,kDAA0B;AAC1B,mDAAgD;AAEhD,qDAAmF;AAenF,yBACC,SAA6B,EAC7B,WAAoB;IAEpB,OAAO,IAAA,+BAAc,EAAC,SAAS,IAAI,WAAW,IAAI,EAAE,CAAC,IAAI,SAAS,CAAC;AACpE,CAAC;AAUD,8BACC,SAAiB,EACjB,cAA8B,EAC9B,OAA2B;IAE3B,MAAM,QAAQ,GAAG,cAAc,IAAI,IAAA,+BAAc,EAAC,SAAS,CAAC,CAAC;IAE7D,IAAI,QAAQ,EAAE,CAAC;QACd,OAAO,IAAA,uCAAsB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,IAAI,cAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AAChC,CAAC;AAUD,+BACC,SAAiB,EACjB,cAA8B,EAC9B,OAA4B;IAE5B,MAAM,QAAQ,GAAG,cAAc,IAAI,IAAA,+BAAc,EAAC,SAAS,CAAC,CAAC;IAE7D,IAAI,QAAQ,EAAE,CAAC;QACd,OAAO,IAAA,wCAAuB,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,IAAI,eAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAGD;IACC,OAAO;QACN,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,UAAU;QACtB,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,WAAW;QACvB,OAAO,CAAC,GAAG,CAAC,SAAS;QACrB,OAAO,CAAC,GAAG,CAAC,SAAS;KACrB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;AACnC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@n8n/backend-network",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.3",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"module": "src/index.ts",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -41,8 +41,8 @@
|
|
|
41
41
|
},
|
|
42
42
|
"files": [
|
|
43
43
|
"dist/**/*",
|
|
44
|
-
"
|
|
45
|
-
"
|
|
44
|
+
"LICENSE_EE.md",
|
|
45
|
+
"LICENSE.md"
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
48
|
"axios": "1.18.0",
|
|
@@ -56,12 +56,12 @@
|
|
|
56
56
|
"reflect-metadata": "0.2.2",
|
|
57
57
|
"undici": "^7.28.0",
|
|
58
58
|
"zod": "3.25.76",
|
|
59
|
-
"@n8n/backend-common": "1.34.
|
|
59
|
+
"@n8n/backend-common": "1.34.2",
|
|
60
60
|
"@n8n/config": "2.32.0",
|
|
61
|
-
"@n8n/di": "0.16.0",
|
|
62
61
|
"@n8n/constants": "0.33.0",
|
|
62
|
+
"@n8n/di": "0.16.0",
|
|
63
63
|
"@n8n/utils": "1.42.0",
|
|
64
|
-
"n8n-workflow": "2.34.
|
|
64
|
+
"n8n-workflow": "2.34.2"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@types/proxy-from-env": "^1.0.4",
|