@n8n/backend-network 1.1.3 → 1.2.1
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/invoke.d.ts +2 -0
- package/dist/http/axios/invoke.js +30 -0
- package/dist/http/axios/invoke.js.map +1 -0
- package/dist/http/axios/legacy.d.ts +2 -0
- package/dist/http/axios/legacy.js +14 -9
- package/dist/http/axios/legacy.js.map +1 -1
- package/dist/http/axios/redirect.d.ts +14 -0
- package/dist/http/axios/redirect.js +120 -0
- package/dist/http/axios/redirect.js.map +1 -0
- package/dist/http/axios/request.d.ts +0 -1
- package/dist/http/axios/request.js +16 -31
- package/dist/http/axios/request.js.map +1 -1
- package/dist/http/axios/utils.d.ts +7 -2
- package/dist/http/axios/utils.js +32 -0
- package/dist/http/axios/utils.js.map +1 -1
- package/dist/http/binary-buffer.d.ts +1 -1
- package/dist/http/binary-buffer.js +47 -9
- package/dist/http/binary-buffer.js.map +1 -1
- package/dist/http/client-default-headers.d.ts +4 -0
- package/dist/http/client-default-headers.js +24 -0
- package/dist/http/client-default-headers.js.map +1 -0
- package/dist/http/client-options.d.ts +7 -0
- package/dist/http/client-options.js +3 -0
- package/dist/http/client-options.js.map +1 -0
- package/dist/http/client-request-error.d.ts +11 -0
- package/dist/http/client-request-error.js +37 -0
- package/dist/http/client-request-error.js.map +1 -0
- package/dist/http/http-proxy.d.ts +1 -0
- package/dist/http/http-proxy.js +6 -5
- package/dist/http/http-proxy.js.map +1 -1
- package/dist/http/index.d.ts +5 -2
- package/dist/http/index.js +6 -1
- package/dist/http/index.js.map +1 -1
- package/dist/http/legacy-request.js +12 -2
- package/dist/http/legacy-request.js.map +1 -1
- package/dist/http/node-agents.d.ts +1 -1
- package/dist/http/node-agents.js +3 -1
- package/dist/http/node-agents.js.map +1 -1
- package/dist/http/outbound-http.d.ts +4 -5
- package/dist/http/outbound-http.js +25 -6
- package/dist/http/outbound-http.js.map +1 -1
- package/dist/http/undici/transport.d.ts +18 -1
- package/dist/http/undici/transport.js +47 -7
- package/dist/http/undici/transport.js.map +1 -1
- package/dist/transport.d.ts +4 -0
- package/dist/transport.js +10 -0
- package/dist/transport.js.map +1 -0
- package/package.json +19 -11
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.invokeAxios = invokeAxios;
|
|
7
|
+
const axios_1 = __importDefault(require("axios"));
|
|
8
|
+
const utils_1 = require("./utils");
|
|
9
|
+
async function invokeAxios(axiosConfig, authSendImmediately) {
|
|
10
|
+
try {
|
|
11
|
+
return await (0, axios_1.default)(axiosConfig);
|
|
12
|
+
}
|
|
13
|
+
catch (error) {
|
|
14
|
+
if (authSendImmediately !== false || !(error instanceof axios_1.default.AxiosError)) {
|
|
15
|
+
throw error;
|
|
16
|
+
}
|
|
17
|
+
const { response } = error;
|
|
18
|
+
const wwwAuthenticate = response?.headers['www-authenticate'];
|
|
19
|
+
if (response?.status !== 401 ||
|
|
20
|
+
typeof wwwAuthenticate !== 'string' ||
|
|
21
|
+
!wwwAuthenticate.includes('nonce')) {
|
|
22
|
+
throw error;
|
|
23
|
+
}
|
|
24
|
+
const { auth } = axiosConfig;
|
|
25
|
+
delete axiosConfig.auth;
|
|
26
|
+
axiosConfig = (0, utils_1.digestAuthAxiosConfig)(axiosConfig, response, auth);
|
|
27
|
+
return await (0, axios_1.default)(axiosConfig);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=invoke.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"invoke.js","sourceRoot":"","sources":["../../../src/http/axios/invoke.ts"],"names":[],"mappings":";;;;;AAKA,kCAsBC;AA1BD,kDAA0B;AAE1B,mCAAgD;AAEzC,KAAK,UAAU,WAAW,CAAC,WAA+B,EAAE,mBAA6B;IAC/F,IAAI,CAAC;QACJ,OAAO,MAAM,IAAA,eAAK,EAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,mBAAmB,KAAK,KAAK,IAAI,CAAC,CAAC,KAAK,YAAY,eAAK,CAAC,UAAU,CAAC,EAAE,CAAC;YAC3E,MAAM,KAAK,CAAC;QACb,CAAC;QAED,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAC3B,MAAM,eAAe,GAAY,QAAQ,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACvE,IACC,QAAQ,EAAE,MAAM,KAAK,GAAG;YACxB,OAAO,eAAe,KAAK,QAAQ;YACnC,CAAC,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EACjC,CAAC;YACF,MAAM,KAAK,CAAC;QACb,CAAC;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;QAC7B,OAAO,WAAW,CAAC,IAAI,CAAC;QACxB,WAAW,GAAG,IAAA,6BAAqB,EAAC,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QACjE,OAAO,MAAM,IAAA,eAAK,EAAC,WAAW,CAAC,CAAC;IACjC,CAAC;AACF,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
|
+
import { type AgentOptions } from 'https';
|
|
2
3
|
import type { IRequestOptions } from 'n8n-workflow';
|
|
3
4
|
import type { SsrfBridge } from '../../ssrf';
|
|
5
|
+
export declare function buildLegacyAgentOptions(requestObject: IRequestOptions): AgentOptions;
|
|
4
6
|
export declare function buildAxiosConfigFromLegacyRequest(requestObject: IRequestOptions, ssrfBridge?: SsrfBridge): Promise<AxiosRequestConfig>;
|
|
@@ -3,11 +3,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.buildLegacyAgentOptions = buildLegacyAgentOptions;
|
|
6
7
|
exports.buildAxiosConfigFromLegacyRequest = buildAxiosConfigFromLegacyRequest;
|
|
7
8
|
const crypto_1 = __importDefault(require("crypto"));
|
|
8
9
|
const qs_1 = require("qs");
|
|
9
10
|
const user_agent_1 = require("./user-agent");
|
|
10
11
|
const utils_1 = require("./utils");
|
|
12
|
+
function buildLegacyAgentOptions(requestObject) {
|
|
13
|
+
const host = (0, utils_1.getHostFromRequestObject)(requestObject);
|
|
14
|
+
const agentOptions = { ...requestObject.agentOptions };
|
|
15
|
+
if (host) {
|
|
16
|
+
agentOptions.servername = host;
|
|
17
|
+
}
|
|
18
|
+
if (requestObject.rejectUnauthorized === false) {
|
|
19
|
+
agentOptions.rejectUnauthorized = false;
|
|
20
|
+
agentOptions.secureOptions = crypto_1.default.constants.SSL_OP_LEGACY_SERVER_CONNECT;
|
|
21
|
+
}
|
|
22
|
+
return agentOptions;
|
|
23
|
+
}
|
|
11
24
|
async function buildAxiosConfigFromLegacyRequest(requestObject, ssrfBridge) {
|
|
12
25
|
const axiosConfig = {};
|
|
13
26
|
if (requestObject.headers !== undefined) {
|
|
@@ -172,15 +185,7 @@ async function buildAxiosConfigFromLegacyRequest(requestObject, ssrfBridge) {
|
|
|
172
185
|
else {
|
|
173
186
|
axiosConfig.maxRedirects = 0;
|
|
174
187
|
}
|
|
175
|
-
const
|
|
176
|
-
const agentOptions = { ...requestObject.agentOptions };
|
|
177
|
-
if (host) {
|
|
178
|
-
agentOptions.servername = host;
|
|
179
|
-
}
|
|
180
|
-
if (requestObject.rejectUnauthorized === false) {
|
|
181
|
-
agentOptions.rejectUnauthorized = false;
|
|
182
|
-
agentOptions.secureOptions = crypto_1.default.constants.SSL_OP_LEGACY_SERVER_CONNECT;
|
|
183
|
-
}
|
|
188
|
+
const agentOptions = buildLegacyAgentOptions(requestObject);
|
|
184
189
|
if (requestObject.timeout !== undefined) {
|
|
185
190
|
axiosConfig.timeout = requestObject.timeout;
|
|
186
191
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/http/axios/legacy.ts"],"names":[],"mappings":";;;;;AAgCA,
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/http/axios/legacy.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { type AxiosRequestConfig, type AxiosResponse } from 'axios';
|
|
2
|
+
import type { AgentOptions } from 'https';
|
|
3
|
+
import type { IHttpRequestOptions } from 'n8n-workflow';
|
|
4
|
+
import type { SsrfBridge } from '../../ssrf';
|
|
5
|
+
export interface SsrfRedirectPolicy {
|
|
6
|
+
ssrf: SsrfBridge;
|
|
7
|
+
proxyConfig?: IHttpRequestOptions['proxy'] | string;
|
|
8
|
+
agentOptions: AgentOptions;
|
|
9
|
+
allowedDomains?: string;
|
|
10
|
+
sendCredentialsOnCrossOriginRedirect: boolean;
|
|
11
|
+
authSendImmediately?: boolean;
|
|
12
|
+
}
|
|
13
|
+
export declare function shouldFollowRedirectsManually(axiosConfig: AxiosRequestConfig, proxyConfig: IHttpRequestOptions['proxy'] | string | undefined, ssrfBridge?: SsrfBridge): ssrfBridge is SsrfBridge;
|
|
14
|
+
export declare function followSsrfRedirects(initialConfig: AxiosRequestConfig, policy: SsrfRedirectPolicy): Promise<AxiosResponse>;
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.shouldFollowRedirectsManually = shouldFollowRedirectsManually;
|
|
4
|
+
exports.followSsrfRedirects = followSsrfRedirects;
|
|
5
|
+
const axios_1 = require("axios");
|
|
6
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
7
|
+
const invoke_1 = require("./invoke");
|
|
8
|
+
const utils_1 = require("./utils");
|
|
9
|
+
const node_agents_1 = require("../node-agents");
|
|
10
|
+
const MAX_REDIRECTS_DEFAULT = 21;
|
|
11
|
+
function shouldFollowRedirectsManually(axiosConfig, proxyConfig, ssrfBridge) {
|
|
12
|
+
if (!ssrfBridge) {
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
const maxRedirects = axiosConfig.maxRedirects ?? MAX_REDIRECTS_DEFAULT;
|
|
16
|
+
if (maxRedirects === 0) {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
return (0, utils_1.isProxyPotentiallyActive)(proxyConfig);
|
|
20
|
+
}
|
|
21
|
+
function safeOrigin(url) {
|
|
22
|
+
return (0, utils_1.tryParseUrl)(url)?.origin ?? url;
|
|
23
|
+
}
|
|
24
|
+
function isCrossOrigin(fromUrl, toUrl) {
|
|
25
|
+
return safeOrigin(fromUrl) !== safeOrigin(toUrl);
|
|
26
|
+
}
|
|
27
|
+
function redirectDowngradesToGet(method, status) {
|
|
28
|
+
const normalized = method.toUpperCase();
|
|
29
|
+
const isGetOrHead = normalized === 'GET' || normalized === 'HEAD';
|
|
30
|
+
return ((status === 303 && !isGetOrHead) ||
|
|
31
|
+
((status === 301 || status === 302) && normalized === 'POST'));
|
|
32
|
+
}
|
|
33
|
+
function headerPatternsToDropOnRedirect(downgradeToGet, stripCredentials) {
|
|
34
|
+
return [
|
|
35
|
+
/^host$/i,
|
|
36
|
+
...(downgradeToGet ? [/^content-/i] : []),
|
|
37
|
+
...(stripCredentials ? [/^authorization$/i, /^proxy-authorization$/i, /^cookie$/i] : []),
|
|
38
|
+
];
|
|
39
|
+
}
|
|
40
|
+
function omitHeaders(headers, patterns) {
|
|
41
|
+
return Object.fromEntries(Object.entries(headers ?? {}).filter(([name]) => !patterns.some((pattern) => pattern.test(name))));
|
|
42
|
+
}
|
|
43
|
+
function buildRedirectHopAgents(nextUrl, policy) {
|
|
44
|
+
const host = (0, utils_1.tryParseUrl)(nextUrl)?.hostname;
|
|
45
|
+
const customProxyUrl = policy.proxyConfig ? (0, utils_1.getUrlFromProxyConfig)(policy.proxyConfig) : null;
|
|
46
|
+
const proxy = (0, utils_1.resolveProxyOption)(customProxyUrl);
|
|
47
|
+
return (0, node_agents_1.buildNodeAgents)(proxy, policy.ssrf, {
|
|
48
|
+
...policy.agentOptions,
|
|
49
|
+
...(host ? { servername: host } : {}),
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
function discardResponseBody(response) {
|
|
53
|
+
const data = response.data;
|
|
54
|
+
if (data !== null &&
|
|
55
|
+
typeof data === 'object' &&
|
|
56
|
+
typeof data.destroy === 'function') {
|
|
57
|
+
data.destroy();
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
function buildRedirectHopConfig(prevConfig, status, originalUrl, nextUrl, policy) {
|
|
61
|
+
const downgradeToGet = redirectDowngradesToGet(prevConfig.method ?? 'GET', status);
|
|
62
|
+
const stripCredentials = isCrossOrigin(originalUrl, nextUrl) && !policy.sendCredentialsOnCrossOriginRedirect;
|
|
63
|
+
return {
|
|
64
|
+
...prevConfig,
|
|
65
|
+
url: nextUrl,
|
|
66
|
+
baseURL: undefined,
|
|
67
|
+
params: undefined,
|
|
68
|
+
...(downgradeToGet ? { method: 'GET', data: undefined } : {}),
|
|
69
|
+
...(stripCredentials ? { auth: undefined } : {}),
|
|
70
|
+
headers: omitHeaders(prevConfig.headers, headerPatternsToDropOnRedirect(downgradeToGet, stripCredentials)),
|
|
71
|
+
...buildRedirectHopAgents(nextUrl, policy),
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
function throwIfStatusRejected(response, validateStatus) {
|
|
75
|
+
if (!validateStatus(response.status)) {
|
|
76
|
+
const code = [axios_1.AxiosError.ERR_BAD_REQUEST, axios_1.AxiosError.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4];
|
|
77
|
+
throw new axios_1.AxiosError(`Request failed with status code ${response.status}`, code, response.config, response.request, response);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
function resolveRedirectUrl(location, currentUrl) {
|
|
81
|
+
try {
|
|
82
|
+
return new URL(location, currentUrl).href;
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
throw new n8n_workflow_1.OperationalError(`Invalid redirect location received from server: ${location}`);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
async function followSsrfRedirects(initialConfig, policy) {
|
|
89
|
+
const maxRedirects = initialConfig.maxRedirects ?? MAX_REDIRECTS_DEFAULT;
|
|
90
|
+
const originalUrl = (0, utils_1.buildTargetUrl)(initialConfig.url, initialConfig.baseURL) ?? initialConfig.url ?? '';
|
|
91
|
+
const baseValidateStatus = initialConfig.validateStatus ?? ((status) => status >= 200 && status < 300);
|
|
92
|
+
const prepareHop = (config) => ({
|
|
93
|
+
...config,
|
|
94
|
+
maxRedirects: 0,
|
|
95
|
+
proxy: false,
|
|
96
|
+
validateStatus: (status) => (0, utils_1.isRedirectStatus)(status) ? true : baseValidateStatus(status),
|
|
97
|
+
});
|
|
98
|
+
let config = prepareHop(initialConfig);
|
|
99
|
+
let currentUrl = originalUrl;
|
|
100
|
+
for (let redirectCount = 0;; redirectCount++) {
|
|
101
|
+
const response = await (0, invoke_1.invokeAxios)(config, policy.authSendImmediately);
|
|
102
|
+
const location = (0, utils_1.getRedirectLocation)(response);
|
|
103
|
+
if (!(0, utils_1.isRedirectStatus)(response.status) || !location) {
|
|
104
|
+
if ((0, utils_1.isRedirectStatus)(response.status)) {
|
|
105
|
+
throwIfStatusRejected(response, baseValidateStatus);
|
|
106
|
+
}
|
|
107
|
+
return response;
|
|
108
|
+
}
|
|
109
|
+
discardResponseBody(response);
|
|
110
|
+
if (redirectCount >= maxRedirects) {
|
|
111
|
+
throw new n8n_workflow_1.OperationalError(`Maximum number of redirects (${maxRedirects}) exceeded`);
|
|
112
|
+
}
|
|
113
|
+
const nextUrl = resolveRedirectUrl(location, currentUrl);
|
|
114
|
+
(0, utils_1.throwIfDomainNotAllowed)(nextUrl, policy.allowedDomains);
|
|
115
|
+
await (0, utils_1.validateUrlSsrf)(nextUrl, policy.ssrf);
|
|
116
|
+
config = prepareHop(buildRedirectHopConfig(config, response.status, originalUrl, nextUrl, policy));
|
|
117
|
+
currentUrl = nextUrl;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
//# sourceMappingURL=redirect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redirect.js","sourceRoot":"","sources":["../../../src/http/axios/redirect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import type { IHttpRequestOptions, IN8nHttpFullResponse, IN8nHttpResponse, IRequestOptions } from 'n8n-workflow';
|
|
3
3
|
import type { SsrfBridge } from '../../ssrf';
|
|
4
|
-
export declare function invokeAxios(axiosConfig: AxiosRequestConfig, authOptions?: IRequestOptions['auth']): Promise<import("axios").AxiosResponse<any, any, {}>>;
|
|
5
4
|
export declare function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions, ssrfBridge?: SsrfBridge): AxiosRequestConfig;
|
|
6
5
|
export declare function removeEmptyBody(requestOptions: IHttpRequestOptions | IRequestOptions): void;
|
|
7
6
|
export declare function httpRequest(requestOptions: IHttpRequestOptions & {
|
|
@@ -1,34 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.invokeAxios = invokeAxios;
|
|
7
3
|
exports.convertN8nRequestToAxios = convertN8nRequestToAxios;
|
|
8
4
|
exports.removeEmptyBody = removeEmptyBody;
|
|
9
5
|
exports.httpRequest = httpRequest;
|
|
10
|
-
const axios_1 = __importDefault(require("axios"));
|
|
11
6
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
12
7
|
const qs_1 = require("qs");
|
|
8
|
+
const invoke_1 = require("./invoke");
|
|
9
|
+
const redirect_1 = require("./redirect");
|
|
13
10
|
const user_agent_1 = require("./user-agent");
|
|
14
11
|
const utils_1 = require("./utils");
|
|
15
|
-
async function invokeAxios(axiosConfig, authOptions = {}) {
|
|
16
|
-
try {
|
|
17
|
-
return await (0, axios_1.default)(axiosConfig);
|
|
18
|
-
}
|
|
19
|
-
catch (error) {
|
|
20
|
-
if (authOptions.sendImmediately !== false || !(error instanceof axios_1.default.AxiosError))
|
|
21
|
-
throw error;
|
|
22
|
-
const { response } = error;
|
|
23
|
-
if (response?.status !== 401 || !response.headers['www-authenticate']?.includes('nonce')) {
|
|
24
|
-
throw error;
|
|
25
|
-
}
|
|
26
|
-
const { auth } = axiosConfig;
|
|
27
|
-
delete axiosConfig.auth;
|
|
28
|
-
axiosConfig = (0, utils_1.digestAuthAxiosConfig)(axiosConfig, response, auth);
|
|
29
|
-
return await (0, axios_1.default)(axiosConfig);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
12
|
function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
33
13
|
const { headers, method, timeout, auth, proxy, url } = n8nRequest;
|
|
34
14
|
const axiosRequest = {
|
|
@@ -50,17 +30,13 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
50
30
|
if (n8nRequest.disableFollowRedirect === true) {
|
|
51
31
|
axiosRequest.maxRedirects = 0;
|
|
52
32
|
}
|
|
33
|
+
else if (n8nRequest.maxRedirects !== undefined) {
|
|
34
|
+
axiosRequest.maxRedirects = n8nRequest.maxRedirects;
|
|
35
|
+
}
|
|
53
36
|
if (n8nRequest.encoding !== undefined) {
|
|
54
37
|
axiosRequest.responseType = n8nRequest.encoding;
|
|
55
38
|
}
|
|
56
|
-
const
|
|
57
|
-
const agentOptions = { ...n8nRequest.agentOptions };
|
|
58
|
-
if (host) {
|
|
59
|
-
agentOptions.servername = host;
|
|
60
|
-
}
|
|
61
|
-
if (n8nRequest.skipSslCertificateValidation === true) {
|
|
62
|
-
agentOptions.rejectUnauthorized = false;
|
|
63
|
-
}
|
|
39
|
+
const agentOptions = (0, utils_1.buildAgentOptions)(n8nRequest);
|
|
64
40
|
(0, utils_1.setAxiosAgents)(axiosRequest, agentOptions, proxy, ssrfBridge ?? 'disabled');
|
|
65
41
|
axiosRequest.beforeRedirect = (0, utils_1.getBeforeRedirectFn)(agentOptions, axiosRequest, n8nRequest.proxy, n8nRequest.sendCredentialsOnCrossOriginRedirect ?? true, n8nRequest.allowedDomains, ssrfBridge ?? 'disabled');
|
|
66
42
|
if (n8nRequest.arrayFormat !== undefined) {
|
|
@@ -142,7 +118,16 @@ async function httpRequest(requestOptions, ssrfBridge) {
|
|
|
142
118
|
delete axiosRequest.data;
|
|
143
119
|
}
|
|
144
120
|
(0, utils_1.throwIfDomainNotAllowed)(axiosRequest, requestOptions.allowedDomains);
|
|
145
|
-
const result =
|
|
121
|
+
const result = (0, redirect_1.shouldFollowRedirectsManually)(axiosRequest, requestOptions.proxy, ssrfBridge)
|
|
122
|
+
? await (0, redirect_1.followSsrfRedirects)(axiosRequest, {
|
|
123
|
+
ssrf: ssrfBridge,
|
|
124
|
+
proxyConfig: requestOptions.proxy,
|
|
125
|
+
agentOptions: (0, utils_1.buildAgentOptions)(requestOptions),
|
|
126
|
+
allowedDomains: requestOptions.allowedDomains,
|
|
127
|
+
sendCredentialsOnCrossOriginRedirect: requestOptions.sendCredentialsOnCrossOriginRedirect ?? true,
|
|
128
|
+
authSendImmediately: requestOptions.auth?.sendImmediately,
|
|
129
|
+
})
|
|
130
|
+
: await (0, invoke_1.invokeAxios)(axiosRequest, requestOptions.auth?.sendImmediately);
|
|
146
131
|
if (requestOptions.returnFullResponse) {
|
|
147
132
|
return {
|
|
148
133
|
body: result.data,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/http/axios/request.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/http/axios/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import FormData from 'form-data';
|
|
|
3
3
|
import type { AgentOptions } from 'https';
|
|
4
4
|
import { type IHttpRequestOptions, type IRequestOptions, type IgnoreStatusErrorConfig } from 'n8n-workflow';
|
|
5
5
|
import type { SsrfBridge } from '../../ssrf';
|
|
6
|
-
import type { SsrfOption } from '../node-agents';
|
|
6
|
+
import type { ProxyOption, SsrfOption } from '../node-agents';
|
|
7
7
|
export declare function throwIfDomainNotAllowed(configOrUrl: AxiosRequestConfig | string, allowedDomains?: string): void;
|
|
8
8
|
export declare function tryParseUrl(url: string): URL | null;
|
|
9
9
|
export declare function isIgnoreStatusErrorConfig(ignoreHttpStatusErrors: unknown): ignoreHttpStatusErrors is IgnoreStatusErrorConfig;
|
|
@@ -13,12 +13,17 @@ export declare const getHostFromRequestObject: (requestObject: Partial<{
|
|
|
13
13
|
uri: string;
|
|
14
14
|
baseURL: string;
|
|
15
15
|
}>) => string | null;
|
|
16
|
+
export declare function resolveProxyOption(customProxyUrl: string | null): ProxyOption;
|
|
16
17
|
export declare const getBeforeRedirectFn: (agentOptions: AgentOptions, axiosConfig: AxiosRequestConfig, proxyConfig: IHttpRequestOptions["proxy"] | string | undefined, sendCredentialsOnCrossOriginRedirect: boolean, allowedDomains?: string, ssrf?: SsrfOption) => (redirectedRequest: Record<string, any>) => void;
|
|
17
18
|
export declare function digestAuthAxiosConfig(axiosConfig: AxiosRequestConfig, response: AxiosResponse, auth: AxiosRequestConfig['auth']): AxiosRequestConfig;
|
|
18
19
|
export declare const createFormDataObject: (data: Record<string, unknown>) => FormData;
|
|
19
20
|
export declare function isFormDataInstance(data: unknown): data is FormData;
|
|
21
|
+
export declare function buildAgentOptions(n8nRequest: IHttpRequestOptions): AgentOptions;
|
|
22
|
+
export declare function isRedirectStatus(status: number): boolean;
|
|
23
|
+
export declare function getRedirectLocation(response: AxiosResponse): string | undefined;
|
|
24
|
+
export declare function isProxyPotentiallyActive(proxyConfig?: IHttpRequestOptions['proxy'] | string): boolean;
|
|
20
25
|
export declare function generateContentLengthHeader(config: AxiosRequestConfig): Promise<void>;
|
|
21
|
-
export declare function getUrlFromProxyConfig(proxyConfig: IHttpRequestOptions['proxy'] | string): string | null;
|
|
26
|
+
export declare function getUrlFromProxyConfig(proxyConfig: IHttpRequestOptions['proxy'] | string | undefined | null): string | null;
|
|
22
27
|
export declare function buildTargetUrl(url?: string, baseURL?: string): string | undefined;
|
|
23
28
|
export declare function setAxiosAgents(config: AxiosRequestConfig, agentOptions?: AgentOptions, proxyConfig?: IHttpRequestOptions['proxy'] | string, ssrf?: SsrfOption): void;
|
|
24
29
|
export declare function validateUrlSsrf(url: string | undefined, ssrfBridge?: SsrfBridge): Promise<void>;
|
package/dist/http/axios/utils.js
CHANGED
|
@@ -8,8 +8,13 @@ exports.throwIfDomainNotAllowed = throwIfDomainNotAllowed;
|
|
|
8
8
|
exports.tryParseUrl = tryParseUrl;
|
|
9
9
|
exports.isIgnoreStatusErrorConfig = isIgnoreStatusErrorConfig;
|
|
10
10
|
exports.searchForHeader = searchForHeader;
|
|
11
|
+
exports.resolveProxyOption = resolveProxyOption;
|
|
11
12
|
exports.digestAuthAxiosConfig = digestAuthAxiosConfig;
|
|
12
13
|
exports.isFormDataInstance = isFormDataInstance;
|
|
14
|
+
exports.buildAgentOptions = buildAgentOptions;
|
|
15
|
+
exports.isRedirectStatus = isRedirectStatus;
|
|
16
|
+
exports.getRedirectLocation = getRedirectLocation;
|
|
17
|
+
exports.isProxyPotentiallyActive = isProxyPotentiallyActive;
|
|
13
18
|
exports.generateContentLengthHeader = generateContentLengthHeader;
|
|
14
19
|
exports.getUrlFromProxyConfig = getUrlFromProxyConfig;
|
|
15
20
|
exports.buildTargetUrl = buildTargetUrl;
|
|
@@ -22,6 +27,7 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
22
27
|
const crypto_1 = __importDefault(require("crypto"));
|
|
23
28
|
const form_data_1 = __importDefault(require("form-data"));
|
|
24
29
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
30
|
+
const http_proxy_1 = require("../http-proxy");
|
|
25
31
|
const node_agents_1 = require("../node-agents");
|
|
26
32
|
function throwIfDomainNotAllowed(configOrUrl, allowedDomains) {
|
|
27
33
|
const url = typeof configOrUrl === 'string' ? configOrUrl : axios_1.default.getUri(configOrUrl);
|
|
@@ -179,6 +185,29 @@ function isFormDataInstance(data) {
|
|
|
179
185
|
'append' in data &&
|
|
180
186
|
typeof data.append === 'function'));
|
|
181
187
|
}
|
|
188
|
+
function buildAgentOptions(n8nRequest) {
|
|
189
|
+
const host = (0, exports.getHostFromRequestObject)(n8nRequest);
|
|
190
|
+
const agentOptions = { ...n8nRequest.agentOptions };
|
|
191
|
+
if (host) {
|
|
192
|
+
agentOptions.servername = host;
|
|
193
|
+
}
|
|
194
|
+
if (n8nRequest.skipSslCertificateValidation === true) {
|
|
195
|
+
agentOptions.rejectUnauthorized = false;
|
|
196
|
+
}
|
|
197
|
+
return agentOptions;
|
|
198
|
+
}
|
|
199
|
+
function isRedirectStatus(status) {
|
|
200
|
+
return status >= 300 && status < 400;
|
|
201
|
+
}
|
|
202
|
+
function getRedirectLocation(response) {
|
|
203
|
+
const headers = response.headers;
|
|
204
|
+
const location = headers?.location;
|
|
205
|
+
return typeof location === 'string' ? location : undefined;
|
|
206
|
+
}
|
|
207
|
+
function isProxyPotentiallyActive(proxyConfig) {
|
|
208
|
+
const configSupported = (0, node_agents_1.isSupportedProxyUrl)(getUrlFromProxyConfig(proxyConfig));
|
|
209
|
+
return configSupported || (0, http_proxy_1.hasProxyEnvironmentVariables)();
|
|
210
|
+
}
|
|
182
211
|
async function generateContentLengthHeader(config) {
|
|
183
212
|
if (!isFormDataInstance(config.data)) {
|
|
184
213
|
return;
|
|
@@ -202,6 +231,9 @@ async function generateContentLengthHeader(config) {
|
|
|
202
231
|
}
|
|
203
232
|
}
|
|
204
233
|
function getUrlFromProxyConfig(proxyConfig) {
|
|
234
|
+
if (!proxyConfig) {
|
|
235
|
+
return null;
|
|
236
|
+
}
|
|
205
237
|
if (typeof proxyConfig === 'string') {
|
|
206
238
|
const isValidUrl = !!tryParseUrl(proxyConfig);
|
|
207
239
|
return isValidUrl ? proxyConfig : null;
|
|
@@ -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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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { Readable } from 'stream';
|
|
2
|
-
export declare function streamToBuffer(stream: Readable): Promise<Buffer>;
|
|
2
|
+
export declare function streamToBuffer(stream: Readable, idleTimeoutMs?: number): Promise<Buffer>;
|
|
3
3
|
export declare function binaryToBuffer(body: Buffer | Readable): Promise<Buffer>;
|
|
@@ -2,18 +2,56 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.streamToBuffer = streamToBuffer;
|
|
4
4
|
exports.binaryToBuffer = binaryToBuffer;
|
|
5
|
+
const config_1 = require("@n8n/config");
|
|
6
|
+
const di_1 = require("@n8n/di");
|
|
5
7
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
6
|
-
async function streamToBuffer(stream) {
|
|
8
|
+
async function streamToBuffer(stream, idleTimeoutMs) {
|
|
9
|
+
const timeout = idleTimeoutMs ?? di_1.Container.get(config_1.HttpRequestConfig).responseBodyReadTimeout;
|
|
10
|
+
const useTimer = Number.isFinite(timeout) && timeout > 0;
|
|
7
11
|
return await new Promise((resolve, reject) => {
|
|
8
12
|
const chunks = [];
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
if (
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
let settled = false;
|
|
14
|
+
let timer;
|
|
15
|
+
const clearTimer = () => {
|
|
16
|
+
if (timer)
|
|
17
|
+
clearTimeout(timer);
|
|
18
|
+
timer = undefined;
|
|
19
|
+
};
|
|
20
|
+
const armTimer = () => {
|
|
21
|
+
if (!useTimer)
|
|
22
|
+
return;
|
|
23
|
+
clearTimer();
|
|
24
|
+
timer = setTimeout(() => {
|
|
25
|
+
stream.destroy();
|
|
26
|
+
settle(() => reject(new n8n_workflow_1.UnexpectedError(`Response body timed out after ${timeout}ms without data`)));
|
|
27
|
+
}, timeout);
|
|
28
|
+
timer.unref?.();
|
|
29
|
+
};
|
|
30
|
+
const onData = (chunk) => {
|
|
31
|
+
chunks.push(chunk);
|
|
32
|
+
armTimer();
|
|
33
|
+
};
|
|
34
|
+
const onEnd = () => settle(() => resolve(Buffer.concat(chunks)));
|
|
35
|
+
const onError = (cause) => settle(() => reject(cause.code === 'Z_DATA_ERROR'
|
|
36
|
+
? new n8n_workflow_1.UnexpectedError('Failed to decompress response', { cause })
|
|
37
|
+
: cause));
|
|
38
|
+
const onClose = () => settle(() => reject(new n8n_workflow_1.UnexpectedError('Stream closed before completing')));
|
|
39
|
+
function settle(action) {
|
|
40
|
+
if (settled)
|
|
41
|
+
return;
|
|
42
|
+
settled = true;
|
|
43
|
+
clearTimer();
|
|
44
|
+
stream.off('data', onData);
|
|
45
|
+
stream.off('end', onEnd);
|
|
46
|
+
stream.off('error', onError);
|
|
47
|
+
stream.off('close', onClose);
|
|
48
|
+
action();
|
|
49
|
+
}
|
|
50
|
+
stream.on('data', onData);
|
|
51
|
+
stream.once('end', onEnd);
|
|
52
|
+
stream.once('error', onError);
|
|
53
|
+
stream.once('close', onClose);
|
|
54
|
+
armTimer();
|
|
17
55
|
});
|
|
18
56
|
}
|
|
19
57
|
async function binaryToBuffer(body) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-buffer.js","sourceRoot":"","sources":["../../src/http/binary-buffer.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"binary-buffer.js","sourceRoot":"","sources":["../../src/http/binary-buffer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { IHttpRequestOptions } from 'n8n-workflow';
|
|
2
|
+
import type { HttpRequestClientOptions } from './client-options';
|
|
3
|
+
export type HttpRequestDefaultHeaders = Record<string, string | undefined>;
|
|
4
|
+
export declare function withClientDefaults(requestOptions: IHttpRequestOptions, baseURL: HttpRequestClientOptions['baseURL'], headers: HttpRequestClientOptions['headers']): IHttpRequestOptions;
|