@n8n/backend-network 1.10.0 → 1.10.2
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/request.js +1 -0
- package/dist/http/axios/request.js.map +1 -1
- package/dist/http/axios/utils.d.ts +1 -0
- package/dist/http/axios/utils.js +7 -0
- package/dist/http/axios/utils.js.map +1 -1
- package/dist/http/connection-guards.d.ts +23 -0
- package/dist/http/connection-guards.js +45 -0
- package/dist/http/connection-guards.js.map +1 -0
- package/dist/http/env-proxy-http-agent.js.map +1 -1
- package/dist/http/legacy-request.js +1 -0
- package/dist/http/legacy-request.js.map +1 -1
- package/dist/http/node-agents.d.ts +0 -9
- package/dist/http/node-agents.js +11 -23
- package/dist/http/node-agents.js.map +1 -1
- package/dist/http/outbound-http.js.map +1 -1
- package/dist/http/undici/transport.js +30 -1
- package/dist/http/undici/transport.js.map +1 -1
- package/package.json +6 -6
|
@@ -112,6 +112,7 @@ async function httpRequest(requestOptions, ssrfBridge) {
|
|
|
112
112
|
removeEmptyBody(requestOptions);
|
|
113
113
|
const url = (0, utils_1.buildTargetUrl)(requestOptions.url, requestOptions.baseURL) ?? requestOptions.url;
|
|
114
114
|
await (0, utils_1.validateUrlSsrf)(url, ssrfBridge);
|
|
115
|
+
await (0, utils_1.validateProxySsrf)(requestOptions.proxy, ssrfBridge);
|
|
115
116
|
const axiosRequest = convertN8nRequestToAxios(requestOptions, ssrfBridge);
|
|
116
117
|
if (axiosRequest.data === undefined ||
|
|
117
118
|
(axiosRequest.method !== undefined && axiosRequest.method.toUpperCase() === 'GET')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/http/axios/request.ts"],"names":[],"mappings":";;;;;AAOA,+CAA6C;AAC7C,2BAA+B;AAE/B,qCAAuC;AACvC,yCAAgF;AAChF,6CAA6D;AAC7D,
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/http/axios/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,5 +28,6 @@ export declare function getUrlFromProxyConfig(proxyConfig: IHttpRequestOptions['
|
|
|
28
28
|
export declare function buildTargetUrl(url?: string, baseURL?: string): string | undefined;
|
|
29
29
|
export declare function setAxiosAgents(config: AxiosRequestConfig, agentOptions?: AgentOptions, proxyConfig?: IHttpRequestOptions['proxy'] | string, ssrf?: SsrfOption): void;
|
|
30
30
|
export declare function validateUrlSsrf(url: string | undefined, ssrfBridge?: SsrfBridge): Promise<void>;
|
|
31
|
+
export declare function validateProxySsrf(proxyConfig: IHttpRequestOptions['proxy'] | string | undefined, ssrfBridge?: SsrfBridge): Promise<void>;
|
|
31
32
|
export declare function resolveLegacyRequestTarget(requestObject: IRequestOptions): string | undefined;
|
|
32
33
|
export declare function resolveLegacyRequestUrl(requestObject: IRequestOptions): string | undefined;
|
package/dist/http/axios/utils.js
CHANGED
|
@@ -21,6 +21,7 @@ exports.getUrlFromProxyConfig = getUrlFromProxyConfig;
|
|
|
21
21
|
exports.buildTargetUrl = buildTargetUrl;
|
|
22
22
|
exports.setAxiosAgents = setAxiosAgents;
|
|
23
23
|
exports.validateUrlSsrf = validateUrlSsrf;
|
|
24
|
+
exports.validateProxySsrf = validateProxySsrf;
|
|
24
25
|
exports.resolveLegacyRequestTarget = resolveLegacyRequestTarget;
|
|
25
26
|
exports.resolveLegacyRequestUrl = resolveLegacyRequestUrl;
|
|
26
27
|
const backend_common_1 = require("@n8n/backend-common");
|
|
@@ -304,6 +305,12 @@ async function validateUrlSsrf(url, ssrfBridge) {
|
|
|
304
305
|
throw result.error;
|
|
305
306
|
}
|
|
306
307
|
}
|
|
308
|
+
async function validateProxySsrf(proxyConfig, ssrfBridge) {
|
|
309
|
+
const proxyUrl = getUrlFromProxyConfig(proxyConfig);
|
|
310
|
+
if (!(0, node_agents_1.isSupportedProxyUrl)(proxyUrl))
|
|
311
|
+
return;
|
|
312
|
+
await validateUrlSsrf(proxyUrl, ssrfBridge);
|
|
313
|
+
}
|
|
307
314
|
function resolveLegacyRequestTarget(requestObject) {
|
|
308
315
|
return (requestObject.url ?? requestObject.uri)?.toString();
|
|
309
316
|
}
|
|
@@ -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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"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { HttpsProxyAgent } from 'https-proxy-agent';
|
|
2
|
+
import { UnexpectedError } from 'n8n-workflow';
|
|
3
|
+
import type http from 'node:http';
|
|
4
|
+
import type net from 'node:net';
|
|
5
|
+
import type { SsrfBridge } from '../ssrf';
|
|
6
|
+
type ProxyConnectOpts = Parameters<HttpsProxyAgent<string>['connect']>[1];
|
|
7
|
+
export declare class UnknownConnectionHostError extends UnexpectedError {
|
|
8
|
+
constructor();
|
|
9
|
+
}
|
|
10
|
+
type ConnectionOptions = {
|
|
11
|
+
host?: string | null;
|
|
12
|
+
hostname?: string | null;
|
|
13
|
+
};
|
|
14
|
+
type CreateConnection = (options: ConnectionOptions, onConnect?: (error: Error | null, stream?: unknown) => void) => unknown;
|
|
15
|
+
interface ProxyConnectionAgent {
|
|
16
|
+
connectOpts: ConnectionOptions;
|
|
17
|
+
connect(req: http.ClientRequest, opts: ProxyConnectOpts): Promise<net.Socket>;
|
|
18
|
+
}
|
|
19
|
+
export declare function installProxyConnectionGuard(agent: ProxyConnectionAgent, ssrf: SsrfBridge): void;
|
|
20
|
+
export declare function installConnectionGuard(target: {
|
|
21
|
+
createConnection: CreateConnection;
|
|
22
|
+
}, ssrf: SsrfBridge): void;
|
|
23
|
+
export {};
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.UnknownConnectionHostError = void 0;
|
|
4
|
+
exports.installProxyConnectionGuard = installProxyConnectionGuard;
|
|
5
|
+
exports.installConnectionGuard = installConnectionGuard;
|
|
6
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
|
+
class UnknownConnectionHostError extends n8n_workflow_1.UnexpectedError {
|
|
8
|
+
constructor() {
|
|
9
|
+
super('Cannot determine the host for this connection');
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
exports.UnknownConnectionHostError = UnknownConnectionHostError;
|
|
13
|
+
function connectionHostError(ssrf, options) {
|
|
14
|
+
const host = options.host ?? options.hostname ?? undefined;
|
|
15
|
+
if (typeof host !== 'string' || host.length === 0) {
|
|
16
|
+
return new UnknownConnectionHostError();
|
|
17
|
+
}
|
|
18
|
+
const result = ssrf.validateConnectionHost(host);
|
|
19
|
+
return result.ok ? undefined : result.error;
|
|
20
|
+
}
|
|
21
|
+
function installProxyConnectionGuard(agent, ssrf) {
|
|
22
|
+
const connect = agent.connect.bind(agent);
|
|
23
|
+
agent.connect = async (req, opts) => {
|
|
24
|
+
const error = connectionHostError(ssrf, agent.connectOpts);
|
|
25
|
+
if (error) {
|
|
26
|
+
throw error;
|
|
27
|
+
}
|
|
28
|
+
return await connect(req, opts);
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
function installConnectionGuard(target, ssrf) {
|
|
32
|
+
const createConnection = target.createConnection.bind(target);
|
|
33
|
+
target.createConnection = (options, onConnect) => {
|
|
34
|
+
const error = connectionHostError(ssrf, options);
|
|
35
|
+
if (error) {
|
|
36
|
+
if (onConnect) {
|
|
37
|
+
onConnect(error);
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
42
|
+
return createConnection(options, onConnect);
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=connection-guards.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connection-guards.js","sourceRoot":"","sources":["../../src/http/connection-guards.ts"],"names":[],"mappings":";;;;;AACA,+CAA+C;AAS/C,gCAAwC,SAAQ,8BAAe;IAC9D;QACC,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACxD,CAAC;CACD;;AAkBD,SAAS,mBAAmB,CAAC,IAAgB,EAAE,OAA0B;IACxE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,IAAI,SAAS,CAAC;IAC3D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACnD,OAAO,IAAI,0BAA0B,EAAE,CAAC;IACzC,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACjD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;AAC7C,CAAC;AAWD,qCAA4C,KAA2B,EAAE,IAAgB;IACxF,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1C,KAAK,CAAC,OAAO,GAAG,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACnC,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3D,IAAI,KAAK,EAAE,CAAC;YACX,MAAM,KAAK,CAAC;QACb,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjC,CAAC,CAAC;AACH,CAAC;AASD,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,KAAK,GAAG,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD,IAAI,KAAK,EAAE,CAAC;YACX,IAAI,SAAS,EAAE,CAAC;gBACf,SAAS,CAAC,KAAK,CAAC,CAAC;gBACjB,OAAO,SAAS,CAAC;YAClB,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;QACD,OAAO,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAC7C,CAAC,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAgBjE,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"}
|
|
@@ -17,6 +17,7 @@ async function executeLegacyRequest(requestObject, ssrfBridge, logger, callbacks
|
|
|
17
17
|
};
|
|
18
18
|
const url = (0, utils_1.resolveLegacyRequestUrl)(requestObject);
|
|
19
19
|
await (0, utils_1.validateUrlSsrf)(url, ssrfBridge);
|
|
20
|
+
await (0, utils_1.validateProxySsrf)(requestObject.proxy, ssrfBridge);
|
|
20
21
|
axiosConfig = Object.assign(axiosConfig, await (0, legacy_1.buildAxiosConfigFromLegacyRequest)(requestObject, ssrfBridge));
|
|
21
22
|
(0, utils_1.throwIfDomainNotAllowed)(axiosConfig, requestObject.allowedDomains);
|
|
22
23
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy-request.js","sourceRoot":"","sources":["../../src/http/legacy-request.ts"],"names":[],"mappings":";;;AASA,+CAA4C;AAC5C,yCAA4C;AAC5C,6CAAuC;AAGvC,2CAA6C;AAC7C,2CAA4F;AAC5F,+CAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"legacy-request.js","sourceRoot":"","sources":["../../src/http/legacy-request.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,3 @@ export declare function buildNodeAgents(proxy: ProxyOption, ssrf: SsrfOption, ag
|
|
|
10
10
|
httpAgent: http.Agent;
|
|
11
11
|
httpsAgent: https.Agent;
|
|
12
12
|
};
|
|
13
|
-
type ConnectionOptions = {
|
|
14
|
-
host?: string | null;
|
|
15
|
-
hostname?: string | null;
|
|
16
|
-
};
|
|
17
|
-
type CreateConnection = (options: ConnectionOptions, onConnect?: (error: Error | null, stream?: unknown) => void) => unknown;
|
|
18
|
-
export declare function installConnectionGuard(target: {
|
|
19
|
-
createConnection: CreateConnection;
|
|
20
|
-
}, ssrf: SsrfBridge): void;
|
|
21
|
-
export {};
|
package/dist/http/node-agents.js
CHANGED
|
@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.isSupportedProxyUrl = isSupportedProxyUrl;
|
|
7
7
|
exports.buildNodeAgents = buildNodeAgents;
|
|
8
|
-
exports.installConnectionGuard = installConnectionGuard;
|
|
9
8
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
10
9
|
const node_http_1 = __importDefault(require("node:http"));
|
|
11
10
|
const node_https_1 = __importDefault(require("node:https"));
|
|
11
|
+
const connection_guards_1 = require("./connection-guards");
|
|
12
12
|
const env_proxy_http_agent_1 = require("./env-proxy-http-agent");
|
|
13
13
|
const env_proxy_https_agent_1 = require("./env-proxy-https-agent");
|
|
14
14
|
const proxied_agents_1 = require("../proxy/proxied-agents");
|
|
@@ -34,33 +34,21 @@ function buildNodeAgents(proxy, ssrf, agentOptions) {
|
|
|
34
34
|
httpsAgent: new env_proxy_https_agent_1.EnvProxyHttpsAgent(lookup, agentOptions),
|
|
35
35
|
}, ssrf);
|
|
36
36
|
}
|
|
37
|
-
|
|
38
|
-
httpAgent: (0, proxied_agents_1.createProxiedHttpAgent)(proxy, agentOptions),
|
|
39
|
-
httpsAgent: (0, proxied_agents_1.createProxiedHttpsAgent)(proxy, agentOptions),
|
|
37
|
+
const agents = {
|
|
38
|
+
httpAgent: (0, proxied_agents_1.createProxiedHttpAgent)(proxy, { ...agentOptions, lookup }),
|
|
39
|
+
httpsAgent: (0, proxied_agents_1.createProxiedHttpsAgent)(proxy, { ...agentOptions, lookup }),
|
|
40
40
|
};
|
|
41
|
+
if (ssrf !== 'disabled') {
|
|
42
|
+
(0, connection_guards_1.installProxyConnectionGuard)(agents.httpAgent, ssrf);
|
|
43
|
+
(0, connection_guards_1.installProxyConnectionGuard)(agents.httpsAgent, ssrf);
|
|
44
|
+
}
|
|
45
|
+
return agents;
|
|
41
46
|
}
|
|
42
47
|
function applyConnectionGuard(agents, ssrf) {
|
|
43
48
|
if (ssrf !== 'disabled') {
|
|
44
|
-
installConnectionGuard(agents.httpAgent, ssrf);
|
|
45
|
-
installConnectionGuard(agents.httpsAgent, ssrf);
|
|
49
|
+
(0, connection_guards_1.installConnectionGuard)(agents.httpAgent, ssrf);
|
|
50
|
+
(0, connection_guards_1.installConnectionGuard)(agents.httpsAgent, ssrf);
|
|
46
51
|
}
|
|
47
52
|
return agents;
|
|
48
53
|
}
|
|
49
|
-
function installConnectionGuard(target, ssrf) {
|
|
50
|
-
const createConnection = target.createConnection.bind(target);
|
|
51
|
-
target.createConnection = (options, onConnect) => {
|
|
52
|
-
const host = options.host ?? options.hostname ?? undefined;
|
|
53
|
-
if (typeof host === 'string') {
|
|
54
|
-
const result = ssrf.validateConnectionHost(host);
|
|
55
|
-
if (!result.ok) {
|
|
56
|
-
if (onConnect) {
|
|
57
|
-
onConnect(result.error);
|
|
58
|
-
return undefined;
|
|
59
|
-
}
|
|
60
|
-
throw result.error;
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
return createConnection(options, onConnect);
|
|
64
|
-
};
|
|
65
|
-
}
|
|
66
54
|
//# sourceMappingURL=node-agents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-agents.js","sourceRoot":"","sources":["../../src/http/node-agents.ts"],"names":[],"mappings":"
|
|
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,2DAA0F;AAC1F,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;AA0DD,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,MAAM,MAAM,GAAG;QACd,SAAS,EAAE,IAAA,uCAAsB,EAAC,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC;QACrE,UAAU,EAAE,IAAA,wCAAuB,EAAC,KAAK,EAAE,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC;KACvE,CAAC;IACF,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,IAAA,+CAA2B,EAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACpD,IAAA,+CAA2B,EAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAKD,SAAS,oBAAoB,CAC5B,MAA0D,EAC1D,IAAgB;IAEhB,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,IAAA,0CAAsB,EAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC/C,IAAA,0CAAsB,EAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outbound-http.js","sourceRoot":"","sources":["../../src/http/outbound-http.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAYlC,kCAAgD;AAChD,6CAA8C;AAC9C,qEAA8D;AAE9D,iEAA8D;AAC9D,qDAAqF;AAErF,+CAAgD;AAChD,kDAK4B;
|
|
1
|
+
{"version":3,"file":"outbound-http.js","sourceRoot":"","sources":["../../src/http/outbound-http.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAYlC,kCAAgD;AAChD,6CAA8C;AAC9C,qEAA8D;AAE9D,iEAA8D;AAC9D,qDAAqF;AAErF,+CAAgD;AAChD,kDAK4B;AA0IrB,IAAM,YAAY,GAAlB,MAAM,YAAY;IACxB,YACkB,cAAqC,EACrC,MAAc;8BADd,cAAc;sBACd,MAAM;IACrB,CAAC;IAMJ,QAAQ,CAAC,OAAkC;QAC1C,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC;QAE1D,MAAM,aAAa,GAAG,CAAC,cAAmC,EAAuB,EAAE,CAClF,IAAA,2CAAkB,EAAC,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;QAW1F,KAAK,UAAU,OAAO,CAAC,cAAmC;YACzD,IAAI,CAAC;gBACJ,OAAO,MAAM,IAAA,qBAAW,EAAC,aAAa,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,CAAC;YACrE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAEhB,MAAM,IAAA,2CAAoB,EAAC,KAAK,CAAC,CAAC;YACnC,CAAC;QACF,CAAC;QAED,OAAO;YACN,OAAO;YACP,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,EAAE;gBAClD,IAAI,CAAC;oBACJ,OAAO,MAAM,IAAA,qCAAoB,EAAC,cAAc,EAAE,UAAU,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;gBACvF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,MAAM,IAAA,2CAAoB,EAAC,KAAK,CAAC,CAAC;gBACnC,CAAC;YACF,CAAC;SACD,CAAC;IACH,CAAC;IAKD,SAAS,CAAC,OAA8B;QACvC,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,KAAK,CAAC;QACtC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,CAAC;QACnC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;QAKrC,MAAM,mBAAmB,GAAG,IAAA,qCAAyB,EAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5F,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAA,6BAAe,EAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;QAEhE,OAAO;YACN,aAAa,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,aAAa,EAAE;YACxD,aAAa,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,aAAa,EAAE;YACxD,YAAY,EAAE,CAAC,YAAY,EAAE,EAAE,CAC9B,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,IAAA,6BAAe,EAAC,KAAK,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE;SAC3F,CAAC;IACH,CAAC;CACD,CAAA;;uBArEY,YAAY;IADxB,IAAA,YAAO,GAAE;qCAGyB,4BAAqB,EAC7B,uBAAM;GAHpB,YAAY,CAqExB;AAED,SAAS,IAAI,CAAI,OAAgB;IAChC,IAAI,MAAgC,CAAC;IACrC,OAAO,GAAG,EAAE,CAAC,CAAC,MAAM,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;AACtD,CAAC"}
|
|
@@ -24,7 +24,36 @@ function buildDispatcherFromProxy(proxy, ssrf, timeouts) {
|
|
|
24
24
|
if (proxy === 'env') {
|
|
25
25
|
return new undici_1.EnvHttpProxyAgent({ ...agentOptions, ...secureConnect(ssrf) });
|
|
26
26
|
}
|
|
27
|
-
|
|
27
|
+
assertProxyHostAllowed(ssrf, proxy);
|
|
28
|
+
return new undici_1.ProxyAgent({
|
|
29
|
+
uri: proxy,
|
|
30
|
+
...agentOptions,
|
|
31
|
+
...secureProxyConnect(ssrf),
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
function secureProxyConnect(ssrf) {
|
|
35
|
+
return ssrf === 'disabled' ? {} : { proxyTls: { lookup: ssrf.createSecureLookup() } };
|
|
36
|
+
}
|
|
37
|
+
function assertProxyHostAllowed(ssrf, proxyUri) {
|
|
38
|
+
if (ssrf === 'disabled') {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const hostname = proxyHostname(proxyUri);
|
|
42
|
+
if (hostname === undefined) {
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
45
|
+
const result = ssrf.validateConnectionHost(hostname);
|
|
46
|
+
if (!result.ok) {
|
|
47
|
+
throw result.error;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
function proxyHostname(uri) {
|
|
51
|
+
try {
|
|
52
|
+
return new URL(uri).hostname;
|
|
53
|
+
}
|
|
54
|
+
catch {
|
|
55
|
+
return undefined;
|
|
56
|
+
}
|
|
28
57
|
}
|
|
29
58
|
function secureConnect(ssrf) {
|
|
30
59
|
return ssrf === 'disabled' ? {} : { connect: { lookup: ssrf.createSecureLookup() } };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/http/undici/transport.ts"],"names":[],"mappings":";;;;;;;AACA,mCAAoF;AAoFpF,yBACC,KAAkB,EAClB,IAAgB,EAChB,OAAO,GAA2B,EAAE;IAEpC,IAAI,UAAU,GAAG,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1E,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;QACxB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,8BAA8B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,SAAS,wBAAwB,CAChC,KAAkB,EAClB,IAAgB,EAChB,QAAkC;IAElC,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,IAAI,cAAK,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/http/undici/transport.ts"],"names":[],"mappings":";;;;;;;AACA,mCAAoF;AAoFpF,yBACC,KAAkB,EAClB,IAAgB,EAChB,OAAO,GAA2B,EAAE;IAEpC,IAAI,UAAU,GAAG,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC1E,IAAI,OAAO,EAAE,SAAS,EAAE,CAAC;QACxB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,8BAA8B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;IACrF,CAAC;IACD,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,SAAS,wBAAwB,CAChC,KAAkB,EAClB,IAAgB,EAChB,QAAkC;IAElC,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QACrB,OAAO,IAAI,cAAK,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,KAAK,KAAK,KAAK,EAAE,CAAC;QAGrB,OAAO,IAAI,0BAAiB,CAAC,EAAE,GAAG,YAAY,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,sBAAsB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpC,OAAO,IAAI,mBAAU,CAAC;QACrB,GAAG,EAAE,KAAK;QACV,GAAG,YAAY;QACf,GAAG,kBAAkB,CAAC,IAAI,CAAC;KAC3B,CAAC,CAAC;AACJ,CAAC;AASD,SAAS,kBAAkB,CAAC,IAAgB;IAC3C,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,EAAE,CAAC;AACvF,CAAC;AAMD,SAAS,sBAAsB,CAAC,IAAgB,EAAE,QAAgB;IACjE,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QACzB,OAAO;IACR,CAAC;IACD,MAAM,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,OAAO;IACR,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QAChB,MAAM,MAAM,CAAC,KAAK,CAAC;IACpB,CAAC;AACF,CAAC;AAED,SAAS,aAAa,CAAC,GAAW;IACjC,IAAI,CAAC;QACJ,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,SAAS,CAAC;IAClB,CAAC;AACF,CAAC;AAOD,SAAS,aAAa,CAAC,IAAgB;IACtC,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,EAAE,CAAC;AACtF,CAAC;AAMD,SAAS,qBAAqB,CAAC,QAAkC;IAChE,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,EAAE,CAAC;IACX,CAAC;IACD,OAAO;QACN,GAAG,CAAC,QAAQ,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC;QACzF,GAAG,CAAC,QAAQ,CAAC,WAAW,KAAK,SAAS,IAAI,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC;QAChF,GAAG,CAAC,QAAQ,CAAC,cAAc,KAAK,SAAS,IAAI,EAAE,cAAc,EAAE,QAAQ,CAAC,cAAc,EAAE,CAAC;KACzF,CAAC;AACH,CAAC;AAQD,mCACC,OAA0C;IAE1C,MAAM,KAAK,GAAG,OAAO,EAAE,KAAK,IAAI,KAAK,CAAC;IACtC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,IAAI,UAAU,CAAC;IACzC,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,CAAC;IACnC,MAAM,SAAS,GAAG,OAAO,EAAE,SAAS,CAAC;IAErC,MAAM,cAAc,GAAG,SAAS,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAE9F,OAAO;QACN,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAC1C,MAAM,eAAe,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC;QACrD,aAAa,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE;KACrC,CAAC;AACH,CAAC;AAED,SAAS,SAAS,CAAI,OAAgB;IACrC,IAAI,MAAgC,CAAC;IACrC,OAAO,GAAG,EAAE,CAAC,CAAC,MAAM,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;AACtD,CAAC;AAeD,+BAAsC,MAAkB;IACvD,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACtC,IAAI,SAAc,CAAC;QACnB,IAAI,CAAC;YAIJ,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,IAAI,CACjC,CAAC,MAAM,EAAE,EAAE;gBACV,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;oBACf,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACzB,CAAC;qBAAM,CAAC;oBACP,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACrC,CAAC;YACF,CAAC,EACD,CAAC,KAAc,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAC7D,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YAEzB,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC,CAAC;AACH,CAAC;AAWD,wCACC,SAA4B;IAE5B,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;QACtC,IAAI,SAAc,CAAC;QACnB,IAAI,CAAC;YACJ,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxD,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CACxB,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAC7B,CAAC,KAAc,EAAE,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAC7D,CAAC;QACH,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACzB,YAAY,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,IAAI,CAAC;IACb,CAAC,CAAC;AACH,CAAC;AAeD,SAAS,WAAW,CAAC,KAAc;IAClC,OAAO,KAAK,YAAY,KAAK;QAC5B,CAAC,CAAC,KAAK;QACP,CAAC,CAAC,IAAI,KAAK,CAAC,oDAAoD,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AACtF,CAAC;AAOD,SAAS,YAAY,CAAC,OAAgC,EAAE,KAAY;IACnE,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;QAC7B,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;SAAM,CAAC;QACP,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;AACF,CAAC;AAGM,KAAK,0BACX,UAAsB,EACtB,KAAwB,EACxB,IAAkB;IAElB,OAAO,CAAC,MAAM,IAAA,cAAW,EACxB,KAA0C,EAC1C,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,UAAU,EAAuC,CACpE,CAAwB,CAAC;AAC3B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@n8n/backend-network",
|
|
3
|
-
"version": "1.10.
|
|
3
|
+
"version": "1.10.2",
|
|
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.md",
|
|
45
|
+
"LICENSE_EE.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.29.0",
|
|
58
58
|
"zod": "3.25.76",
|
|
59
|
+
"@n8n/backend-common": "1.36.2",
|
|
59
60
|
"@n8n/constants": "0.35.0",
|
|
61
|
+
"@n8n/config": "2.34.0",
|
|
60
62
|
"@n8n/di": "0.16.0",
|
|
61
|
-
"@n8n/backend-common": "1.36.0",
|
|
62
63
|
"@n8n/utils": "1.44.0",
|
|
63
|
-
"
|
|
64
|
-
"n8n-workflow": "2.36.0"
|
|
64
|
+
"n8n-workflow": "2.36.2"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
67
|
"@types/proxy-from-env": "^1.0.4",
|