@n8n/backend-network 1.1.1 → 1.2.0
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-config.js → axios/config.js} +3 -3
- package/dist/http/axios/config.js.map +1 -0
- 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 +6 -0
- package/dist/http/axios/legacy.js +219 -0
- package/dist/http/axios/legacy.js.map +1 -0
- 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/{http-request.d.ts → axios/request.d.ts} +7 -2
- package/dist/http/{http-request.js → axios/request.js} +29 -45
- package/dist/http/axios/request.js.map +1 -0
- package/dist/http/{outbound-user-agent.js → axios/user-agent.js} +3 -3
- package/dist/http/axios/user-agent.js.map +1 -0
- package/dist/http/{axios-utils.d.ts → axios/utils.d.ts} +10 -4
- package/dist/http/{axios-utils.js → axios/utils.js} +55 -15
- package/dist/http/axios/utils.js.map +1 -0
- 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/env-proxy-http-agent.d.ts +8 -0
- package/dist/http/env-proxy-http-agent.js +24 -0
- package/dist/http/env-proxy-http-agent.js.map +1 -0
- package/dist/http/env-proxy-https-agent.d.ts +9 -0
- package/dist/http/env-proxy-https-agent.js +24 -0
- package/dist/http/env-proxy-https-agent.js.map +1 -0
- package/dist/http/env-proxy-router.d.ts +12 -0
- package/dist/http/env-proxy-router.js +55 -0
- package/dist/http/env-proxy-router.js.map +1 -0
- package/dist/http/http-proxy.d.ts +1 -0
- package/dist/http/http-proxy.js +10 -62
- package/dist/http/http-proxy.js.map +1 -1
- package/dist/http/index.d.ts +10 -4
- package/dist/http/index.js +15 -24
- package/dist/http/index.js.map +1 -1
- package/dist/http/legacy-request.d.ts +7 -0
- package/dist/http/legacy-request.js +100 -0
- package/dist/http/legacy-request.js.map +1 -0
- package/dist/http/local-server.d.ts +9 -0
- package/dist/http/local-server.js +31 -0
- package/dist/http/local-server.js.map +1 -0
- package/dist/http/node-agents.d.ts +21 -0
- package/dist/http/node-agents.js +67 -0
- package/dist/http/node-agents.js.map +1 -0
- package/dist/http/outbound-http.d.ts +41 -0
- package/dist/http/outbound-http.js +75 -0
- package/dist/http/outbound-http.js.map +1 -0
- package/dist/http/undici/transport.d.ts +29 -0
- package/dist/http/undici/transport.js +102 -0
- package/dist/http/undici/transport.js.map +1 -0
- package/dist/ssrf/ssrf-protection.service.d.ts +2 -0
- package/dist/ssrf/ssrf-protection.service.js +7 -0
- package/dist/ssrf/ssrf-protection.service.js.map +1 -1
- package/dist/testing.d.ts +4 -0
- package/dist/testing.js +14 -0
- package/dist/testing.js.map +1 -0
- package/dist/transport.d.ts +4 -0
- package/dist/transport.js +10 -0
- package/dist/transport.js.map +1 -0
- package/package.json +40 -12
- package/dist/http/axios-config.js.map +0 -1
- package/dist/http/axios-utils.js.map +0 -1
- package/dist/http/http-request.js.map +0 -1
- package/dist/http/outbound-user-agent.js.map +0 -1
- /package/dist/http/{axios-config.d.ts → axios/config.d.ts} +0 -0
- /package/dist/http/{outbound-user-agent.d.ts → axios/user-agent.d.ts} +0 -0
|
@@ -8,7 +8,7 @@ const config_1 = require("@n8n/config");
|
|
|
8
8
|
const di_1 = require("@n8n/di");
|
|
9
9
|
const axios_1 = __importDefault(require("axios"));
|
|
10
10
|
const qs_1 = require("qs");
|
|
11
|
-
const
|
|
11
|
+
const utils_1 = require("./utils");
|
|
12
12
|
let configured = false;
|
|
13
13
|
function configureGlobalAxiosDefaults() {
|
|
14
14
|
if (!configured) {
|
|
@@ -28,7 +28,7 @@ function configureGlobalAxiosDefaults() {
|
|
|
28
28
|
if (config.data === undefined) {
|
|
29
29
|
config.headers.setContentType(false, false);
|
|
30
30
|
}
|
|
31
|
-
(0,
|
|
31
|
+
(0, utils_1.setAxiosAgents)(config);
|
|
32
32
|
applyVendorHeaders(config);
|
|
33
33
|
return config;
|
|
34
34
|
});
|
|
@@ -39,4 +39,4 @@ function applyVendorHeaders(config) {
|
|
|
39
39
|
config.headers.set(di_1.Container.get(config_1.AiConfig).openAiDefaultHeaders, false);
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
|
-
//# sourceMappingURL=
|
|
42
|
+
//# sourceMappingURL=config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/http/axios/config.ts"],"names":[],"mappings":";;;;;AAeA,oEAkCC;AAjDD,wCAAuC;AACvC,gCAAoC;AACpC,kDAA0B;AAE1B,2BAA+B;AAE/B,mCAAyC;AAEzC,IAAI,UAAU,GAAG,KAAK,CAAC;AAOvB,SAAgB,4BAA4B;IAC3C,IAAI,CAAC,UAAU,EAAE,CAAC;QACjB,UAAU,GAAG,IAAI,CAAC;QAIlB,eAAK,CAAC,QAAQ,CAAC,OAAO,GAAG,MAAM,CAAC;QAEhC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC;QACjC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC;QAChC,eAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE,CAAC;QAClC,eAAK,CAAC,QAAQ,CAAC,gBAAgB,GAAG,CAAC,MAAM,EAAE,EAAE;YAC5C,IAAI,MAAM,YAAY,eAAe,EAAE,CAAC;gBACvC,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;YAC1B,CAAC;YACD,OAAO,IAAA,cAAS,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC;QAGF,eAAK,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;QAG7B,eAAK,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAEzC,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;gBAC/B,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC7C,CAAC;YAED,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;YACvB,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAE3B,OAAO,MAAM,CAAC;QACf,CAAC,CAAC,CAAC;IACJ,CAAC;AACF,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAkC;IAC7D,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE,UAAU,CAAC,yBAAyB,CAAC,CAAC,EAAE,CAAC;QAC5F,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAS,CAAC,GAAG,CAAC,iBAAQ,CAAC,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IACzE,CAAC;AACF,CAAC"}
|
|
@@ -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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { AxiosRequestConfig } from 'axios';
|
|
2
|
+
import { type AgentOptions } from 'https';
|
|
3
|
+
import type { IRequestOptions } from 'n8n-workflow';
|
|
4
|
+
import type { SsrfBridge } from '../../ssrf';
|
|
5
|
+
export declare function buildLegacyAgentOptions(requestObject: IRequestOptions): AgentOptions;
|
|
6
|
+
export declare function buildAxiosConfigFromLegacyRequest(requestObject: IRequestOptions, ssrfBridge?: SsrfBridge): Promise<AxiosRequestConfig>;
|
|
@@ -0,0 +1,219 @@
|
|
|
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.buildLegacyAgentOptions = buildLegacyAgentOptions;
|
|
7
|
+
exports.buildAxiosConfigFromLegacyRequest = buildAxiosConfigFromLegacyRequest;
|
|
8
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
9
|
+
const qs_1 = require("qs");
|
|
10
|
+
const user_agent_1 = require("./user-agent");
|
|
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
|
+
}
|
|
24
|
+
async function buildAxiosConfigFromLegacyRequest(requestObject, ssrfBridge) {
|
|
25
|
+
const axiosConfig = {};
|
|
26
|
+
if (requestObject.headers !== undefined) {
|
|
27
|
+
axiosConfig.headers = requestObject.headers;
|
|
28
|
+
}
|
|
29
|
+
const contentTypeHeaderKeyName = axiosConfig.headers &&
|
|
30
|
+
Object.keys(axiosConfig.headers).find((headerName) => headerName.toLowerCase() === 'content-type');
|
|
31
|
+
const contentType = contentTypeHeaderKeyName &&
|
|
32
|
+
axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
33
|
+
if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
|
|
34
|
+
if (typeof requestObject.body === 'string') {
|
|
35
|
+
axiosConfig.data = requestObject.body;
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
const allData = Object.assign(requestObject.body || {}, requestObject.form || {});
|
|
39
|
+
if (requestObject.useQuerystring === true) {
|
|
40
|
+
axiosConfig.data = (0, qs_1.stringify)(allData, { arrayFormat: 'repeat' });
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
axiosConfig.data = (0, qs_1.stringify)(allData);
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
else if (contentType?.includes('multipart/form-data')) {
|
|
48
|
+
if (requestObject.formData !== undefined && (0, utils_1.isFormDataInstance)(requestObject.formData)) {
|
|
49
|
+
axiosConfig.data = requestObject.formData;
|
|
50
|
+
}
|
|
51
|
+
else {
|
|
52
|
+
const allData = {
|
|
53
|
+
...requestObject.body,
|
|
54
|
+
...requestObject.formData,
|
|
55
|
+
};
|
|
56
|
+
axiosConfig.data = (0, utils_1.createFormDataObject)(allData);
|
|
57
|
+
}
|
|
58
|
+
delete axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
59
|
+
const headers = axiosConfig.data.getHeaders();
|
|
60
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
61
|
+
await (0, utils_1.generateContentLengthHeader)(axiosConfig);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
if (requestObject.form !== undefined && requestObject.body === undefined) {
|
|
65
|
+
axiosConfig.data =
|
|
66
|
+
typeof requestObject.form === 'string'
|
|
67
|
+
? requestObject.form
|
|
68
|
+
: (0, qs_1.stringify)(requestObject.form).toString();
|
|
69
|
+
if (axiosConfig.headers !== undefined) {
|
|
70
|
+
const headerName = (0, utils_1.searchForHeader)(axiosConfig, 'content-type');
|
|
71
|
+
if (headerName) {
|
|
72
|
+
delete axiosConfig.headers[headerName];
|
|
73
|
+
}
|
|
74
|
+
axiosConfig.headers['Content-Type'] = 'application/x-www-form-urlencoded';
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
axiosConfig.headers = {
|
|
78
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
else if (requestObject.formData !== undefined) {
|
|
83
|
+
if (axiosConfig.headers !== undefined) {
|
|
84
|
+
const headers = Object.keys(axiosConfig.headers);
|
|
85
|
+
headers.forEach((header) => {
|
|
86
|
+
if (header.toLowerCase() === 'content-type') {
|
|
87
|
+
delete axiosConfig.headers?.[header];
|
|
88
|
+
}
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
if ((0, utils_1.isFormDataInstance)(requestObject.formData)) {
|
|
92
|
+
axiosConfig.data = requestObject.formData;
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
axiosConfig.data = (0, utils_1.createFormDataObject)(requestObject.formData);
|
|
96
|
+
}
|
|
97
|
+
const headers = axiosConfig.data.getHeaders();
|
|
98
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
99
|
+
await (0, utils_1.generateContentLengthHeader)(axiosConfig);
|
|
100
|
+
}
|
|
101
|
+
else if (requestObject.body !== undefined) {
|
|
102
|
+
if (requestObject.form !== undefined && requestObject.body) {
|
|
103
|
+
requestObject.body = Object.assign(requestObject.body, requestObject.form);
|
|
104
|
+
}
|
|
105
|
+
axiosConfig.data = requestObject.body;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
if (requestObject.uri !== undefined) {
|
|
109
|
+
axiosConfig.url = requestObject.uri?.toString();
|
|
110
|
+
}
|
|
111
|
+
if (requestObject.url !== undefined) {
|
|
112
|
+
axiosConfig.url = requestObject.url?.toString();
|
|
113
|
+
}
|
|
114
|
+
if (requestObject.baseURL !== undefined) {
|
|
115
|
+
axiosConfig.baseURL = requestObject.baseURL?.toString();
|
|
116
|
+
}
|
|
117
|
+
if (requestObject.method !== undefined) {
|
|
118
|
+
axiosConfig.method = requestObject.method;
|
|
119
|
+
}
|
|
120
|
+
if (requestObject.qs !== undefined && Object.keys(requestObject.qs).length > 0) {
|
|
121
|
+
axiosConfig.params = requestObject.qs;
|
|
122
|
+
}
|
|
123
|
+
function hasArrayFormatOptions(arg) {
|
|
124
|
+
if (typeof arg.qsStringifyOptions === 'object' &&
|
|
125
|
+
arg.qsStringifyOptions !== null &&
|
|
126
|
+
!Array.isArray(arg.qsStringifyOptions) &&
|
|
127
|
+
'arrayFormat' in arg.qsStringifyOptions) {
|
|
128
|
+
return true;
|
|
129
|
+
}
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
132
|
+
if (requestObject.useQuerystring === true ||
|
|
133
|
+
(hasArrayFormatOptions(requestObject) &&
|
|
134
|
+
requestObject.qsStringifyOptions.arrayFormat === 'repeat')) {
|
|
135
|
+
axiosConfig.paramsSerializer = (params) => {
|
|
136
|
+
return (0, qs_1.stringify)(params, { arrayFormat: 'repeat' });
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
else if (requestObject.useQuerystring === false) {
|
|
140
|
+
axiosConfig.paramsSerializer = (params) => {
|
|
141
|
+
return (0, qs_1.stringify)(params, { arrayFormat: 'indices' });
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
if (hasArrayFormatOptions(requestObject) &&
|
|
145
|
+
requestObject.qsStringifyOptions.arrayFormat === 'brackets') {
|
|
146
|
+
axiosConfig.paramsSerializer = (params) => {
|
|
147
|
+
return (0, qs_1.stringify)(params, { arrayFormat: 'brackets' });
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
if (requestObject.auth !== undefined) {
|
|
151
|
+
if (requestObject.auth.bearer !== undefined) {
|
|
152
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
153
|
+
Authorization: `Bearer ${requestObject.auth.bearer}`,
|
|
154
|
+
});
|
|
155
|
+
}
|
|
156
|
+
else {
|
|
157
|
+
const authObj = requestObject.auth;
|
|
158
|
+
axiosConfig.auth = {
|
|
159
|
+
username: (authObj.user || authObj.username),
|
|
160
|
+
password: (authObj.password || authObj.pass),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
if (requestObject.json === true) {
|
|
165
|
+
const acceptHeaderExists = axiosConfig.headers === undefined
|
|
166
|
+
? false
|
|
167
|
+
: Object.keys(axiosConfig.headers)
|
|
168
|
+
.map((headerKey) => headerKey.toLowerCase())
|
|
169
|
+
.includes('accept');
|
|
170
|
+
if (!acceptHeaderExists) {
|
|
171
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
172
|
+
Accept: 'application/json',
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
}
|
|
176
|
+
if (requestObject.json === false || requestObject.json === undefined) {
|
|
177
|
+
axiosConfig.transformResponse = (res) => res;
|
|
178
|
+
}
|
|
179
|
+
const { method } = requestObject;
|
|
180
|
+
if ((requestObject.followRedirect !== false &&
|
|
181
|
+
(!method || method === 'GET' || method === 'HEAD')) ||
|
|
182
|
+
requestObject.followAllRedirects) {
|
|
183
|
+
axiosConfig.maxRedirects = requestObject.maxRedirects;
|
|
184
|
+
}
|
|
185
|
+
else {
|
|
186
|
+
axiosConfig.maxRedirects = 0;
|
|
187
|
+
}
|
|
188
|
+
const agentOptions = buildLegacyAgentOptions(requestObject);
|
|
189
|
+
if (requestObject.timeout !== undefined) {
|
|
190
|
+
axiosConfig.timeout = requestObject.timeout;
|
|
191
|
+
}
|
|
192
|
+
(0, utils_1.setAxiosAgents)(axiosConfig, agentOptions, requestObject.proxy, ssrfBridge ?? 'disabled');
|
|
193
|
+
axiosConfig.beforeRedirect = (0, utils_1.getBeforeRedirectFn)(agentOptions, axiosConfig, requestObject.proxy, requestObject.sendCredentialsOnCrossOriginRedirect ?? true, requestObject.allowedDomains, ssrfBridge ?? 'disabled');
|
|
194
|
+
if (requestObject.useStream) {
|
|
195
|
+
axiosConfig.responseType = 'stream';
|
|
196
|
+
}
|
|
197
|
+
else if (requestObject.encoding === null) {
|
|
198
|
+
axiosConfig.responseType = 'arraybuffer';
|
|
199
|
+
}
|
|
200
|
+
const allHeaders = axiosConfig.headers ? Object.keys(axiosConfig.headers) : [];
|
|
201
|
+
if (!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'accept')) {
|
|
202
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, { accept: '*/*' });
|
|
203
|
+
}
|
|
204
|
+
if (requestObject.json !== false &&
|
|
205
|
+
axiosConfig.data !== undefined &&
|
|
206
|
+
axiosConfig.data !== '' &&
|
|
207
|
+
!(axiosConfig.data instanceof Buffer) &&
|
|
208
|
+
!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'content-type')) {
|
|
209
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
210
|
+
'content-type': 'application/json',
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
if (requestObject.simple === false) {
|
|
214
|
+
axiosConfig.validateStatus = () => true;
|
|
215
|
+
}
|
|
216
|
+
(0, user_agent_1.applyDefaultOutboundUserAgent)(axiosConfig);
|
|
217
|
+
return axiosConfig;
|
|
218
|
+
}
|
|
219
|
+
//# sourceMappingURL=legacy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/http/axios/legacy.ts"],"names":[],"mappings":";;;;;AAgCA,0DAWC;AASD,8EA8RC;AA3UD,oDAA4B;AAI5B,2BAA+B;AAE/B,6CAA6D;AAC7D,mCAQiB;AAUjB,SAAgB,uBAAuB,CAAC,aAA8B;IACrE,MAAM,IAAI,GAAG,IAAA,gCAAwB,EAAC,aAAa,CAAC,CAAC;IACrD,MAAM,YAAY,GAAiB,EAAE,GAAG,aAAa,CAAC,YAAY,EAAE,CAAC;IACrE,IAAI,IAAI,EAAE,CAAC;QACV,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,CAAC;IACD,IAAI,aAAa,CAAC,kBAAkB,KAAK,KAAK,EAAE,CAAC;QAChD,YAAY,CAAC,kBAAkB,GAAG,KAAK,CAAC;QACxC,YAAY,CAAC,aAAa,GAAG,gBAAM,CAAC,SAAS,CAAC,4BAA4B,CAAC;IAC5E,CAAC;IACD,OAAO,YAAY,CAAC;AACrB,CAAC;AASM,KAAK,UAAU,iCAAiC,CACtD,aAA8B,EAC9B,UAAuB;IAEvB,MAAM,WAAW,GAAuB,EAAE,CAAC;IAE3C,IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACzC,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAuB,CAAC;IAC7D,CAAC;IAUD,MAAM,wBAAwB,GAC7B,WAAW,CAAC,OAAO;QACnB,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,CACpC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,cAAc,CAC3D,CAAC;IACH,MAAM,WAAW,GAChB,wBAAwB;QACvB,WAAW,CAAC,OAAO,EAAE,CAAC,wBAAwB,CAAwB,CAAC;IACzE,IAAI,WAAW,KAAK,mCAAmC,IAAI,aAAa,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QAKjG,IAAI,OAAO,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5C,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;QACvC,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,IAAI,EAAE,EAAE,aAAa,CAAC,IAAI,IAAI,EAAE,CAG/E,CAAC;YACF,IAAI,aAAa,CAAC,cAAc,KAAK,IAAI,EAAE,CAAC;gBAC3C,WAAW,CAAC,IAAI,GAAG,IAAA,cAAS,EAAC,OAAO,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACP,WAAW,CAAC,IAAI,GAAG,IAAA,cAAS,EAAC,OAAO,CAAC,CAAC;YACvC,CAAC;QACF,CAAC;IACF,CAAC;SAAM,IAAI,WAAW,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EAAE,CAAC;QACzD,IAAI,aAAa,CAAC,QAAQ,KAAK,SAAS,IAAI,IAAA,0BAAkB,EAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxF,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC;QAC3C,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAsB;gBAClC,GAAI,aAAa,CAAC,IAA2B;gBAC7C,GAAI,aAAa,CAAC,QAA+B;aACjD,CAAC;YAEF,WAAW,CAAC,IAAI,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC;QAClD,CAAC;QAGD,OAAO,WAAW,CAAC,OAAO,EAAE,CAAC,wBAAyB,CAAC,CAAC;QAExD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;QAE9C,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,IAAA,mCAA2B,EAAC,WAAW,CAAC,CAAC;IAChD,CAAC;SAAM,CAAC;QAEP,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAE1E,WAAW,CAAC,IAAI;gBACf,OAAO,aAAa,CAAC,IAAI,KAAK,QAAQ;oBACrC,CAAC,CAAC,aAAa,CAAC,IAAI;oBACpB,CAAC,CAAC,IAAA,cAAS,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC7C,IAAI,WAAW,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,UAAU,GAAG,IAAA,uBAAe,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;gBAChE,IAAI,UAAU,EAAE,CAAC;oBAChB,OAAO,WAAW,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBACxC,CAAC;gBACD,WAAW,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,mCAAmC,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACP,WAAW,CAAC,OAAO,GAAG;oBACrB,cAAc,EAAE,mCAAmC;iBACnD,CAAC;YACH,CAAC;QACF,CAAC;aAAM,IAAI,aAAa,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;YAEjD,IAAI,WAAW,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;gBACvC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;gBACjD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC1B,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,cAAc,EAAE,CAAC;wBAC7C,OAAO,WAAW,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC;oBACtC,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;YAED,IAAI,IAAA,0BAAkB,EAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChD,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC;YAC3C,CAAC;iBAAM,CAAC;gBACP,WAAW,CAAC,IAAI,GAAG,IAAA,4BAAoB,EAAC,aAAa,CAAC,QAAmC,CAAC,CAAC;YAC5F,CAAC;YAGD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAE9C,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;YACxE,MAAM,IAAA,mCAA2B,EAAC,WAAW,CAAC,CAAC;QAChD,CAAC;aAAM,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAE7C,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,IAAI,aAAa,CAAC,IAAI,EAAE,CAAC;gBAG5D,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC;YAC5E,CAAC;YACD,WAAW,CAAC,IAAI,GAAG,aAAa,CAAC,IAAgD,CAAC;QACnF,CAAC;IACF,CAAC;IAED,IAAI,aAAa,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QACrC,WAAW,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,aAAa,CAAC,GAAG,KAAK,SAAS,EAAE,CAAC;QACrC,WAAW,CAAC,GAAG,GAAG,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,CAAC;IACjD,CAAC;IAED,IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACzC,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC;IACzD,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACxC,WAAW,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC;IAC3C,CAAC;IAED,IAAI,aAAa,CAAC,EAAE,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,EAAY,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1F,WAAW,CAAC,MAAM,GAAG,aAAa,CAAC,EAAE,CAAC;IACvC,CAAC;IAED,SAAS,qBAAqB,CAC7B,GAAoB;QAEpB,IACC,OAAO,GAAG,CAAC,kBAAkB,KAAK,QAAQ;YAC1C,GAAG,CAAC,kBAAkB,KAAK,IAAI;YAC/B,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;YACtC,aAAa,IAAI,GAAG,CAAC,kBAAkB,EACtC,CAAC;YACF,OAAO,IAAI,CAAC;QACb,CAAC;QAED,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IACC,aAAa,CAAC,cAAc,KAAK,IAAI;QACrC,CAAC,qBAAqB,CAAC,aAAa,CAAC;YACpC,aAAa,CAAC,kBAAkB,CAAC,WAAW,KAAK,QAAQ,CAAC,EAC1D,CAAC;QACF,WAAW,CAAC,gBAAgB,GAAG,CAAC,MAAM,EAAE,EAAE;YACzC,OAAO,IAAA,cAAS,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;QACrD,CAAC,CAAC;IACH,CAAC;SAAM,IAAI,aAAa,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC;QACnD,WAAW,CAAC,gBAAgB,GAAG,CAAC,MAAM,EAAE,EAAE;YACzC,OAAO,IAAA,cAAS,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,CAAC,CAAC;QACtD,CAAC,CAAC;IACH,CAAC;IAED,IACC,qBAAqB,CAAC,aAAa,CAAC;QACpC,aAAa,CAAC,kBAAkB,CAAC,WAAW,KAAK,UAAU,EAC1D,CAAC;QACF,WAAW,CAAC,gBAAgB,GAAG,CAAC,MAAM,EAAE,EAAE;YACzC,OAAO,IAAA,cAAS,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC;IACH,CAAC;IAED,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAEtC,IAAI,aAAa,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC7C,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE;gBAC9D,aAAa,EAAE,UAAU,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE;aACpD,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC;YAEnC,WAAW,CAAC,IAAI,GAAG;gBAClB,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAW;gBAEtD,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAW;aACtD,CAAC;QACH,CAAC;IACF,CAAC;IAGD,IAAI,aAAa,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAGjC,MAAM,kBAAkB,GACvB,WAAW,CAAC,OAAO,KAAK,SAAS;YAChC,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC;iBAC/B,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;iBAC3C,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxB,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE;gBAC9D,MAAM,EAAE,kBAAkB;aAC1B,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,KAAK,KAAK,IAAI,aAAa,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAGtE,WAAW,CAAC,iBAAiB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC;IAC9C,CAAC;IAGD,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;IACjC,IACC,CAAC,aAAa,CAAC,cAAc,KAAK,KAAK;QACtC,CAAC,CAAC,MAAM,IAAI,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,MAAM,CAAC,CAAC;QACpD,aAAa,CAAC,kBAAkB,EAC/B,CAAC;QACF,WAAW,CAAC,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;IACvD,CAAC;SAAM,CAAC;QACP,WAAW,CAAC,YAAY,GAAG,CAAC,CAAC;IAC9B,CAAC;IAED,MAAM,YAAY,GAAiB,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAE1E,IAAI,aAAa,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACzC,WAAW,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC;IAC7C,CAAC;IAED,IAAA,sBAAc,EAAC,WAAW,EAAE,YAAY,EAAE,aAAa,CAAC,KAAK,EAAE,UAAU,IAAI,UAAU,CAAC,CAAC;IAEzF,WAAW,CAAC,cAAc,GAAG,IAAA,2BAAmB,EAC/C,YAAY,EACZ,WAAW,EACX,aAAa,CAAC,KAAK,EACnB,aAAa,CAAC,oCAAoC,IAAI,IAAI,EAC1D,aAAa,CAAC,cAAc,EAC5B,UAAU,IAAI,UAAU,CACxB,CAAC;IAEF,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;QAC7B,WAAW,CAAC,YAAY,GAAG,QAAQ,CAAC;IACrC,CAAC;SAAM,IAAI,aAAa,CAAC,QAAQ,KAAK,IAAI,EAAE,CAAC;QAE5C,WAAW,CAAC,YAAY,GAAG,aAAa,CAAC;IAC1C,CAAC;IAMD,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC;QAC3E,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACnF,CAAC;IACD,IACC,aAAa,CAAC,IAAI,KAAK,KAAK;QAC5B,WAAW,CAAC,IAAI,KAAK,SAAS;QAC9B,WAAW,CAAC,IAAI,KAAK,EAAE;QACvB,CAAC,CAAC,WAAW,CAAC,IAAI,YAAY,MAAM,CAAC;QACrC,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,cAAc,CAAC,EAC1E,CAAC;QAMF,WAAW,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,EAAE,EAAE;YAC9D,cAAc,EAAE,kBAAkB;SAClC,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,aAAa,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QACpC,WAAW,CAAC,cAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;IACzC,CAAC;IAED,IAAA,0CAA6B,EAAC,WAAW,CAAC,CAAC;IAQ3C,OAAO,WAAW,CAAC;AACpB,CAAC"}
|
|
@@ -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,12 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import type { IHttpRequestOptions, IN8nHttpFullResponse, IN8nHttpResponse, IRequestOptions } from 'n8n-workflow';
|
|
3
|
-
import type { SsrfBridge } from '
|
|
4
|
-
export declare function invokeAxios(axiosConfig: AxiosRequestConfig, authOptions?: IRequestOptions['auth']): Promise<import("axios").AxiosResponse<any, any, {}>>;
|
|
3
|
+
import type { SsrfBridge } from '../../ssrf';
|
|
5
4
|
export declare function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions, ssrfBridge?: SsrfBridge): AxiosRequestConfig;
|
|
6
5
|
export declare function removeEmptyBody(requestOptions: IHttpRequestOptions | IRequestOptions): void;
|
|
6
|
+
export declare function httpRequest(requestOptions: IHttpRequestOptions & {
|
|
7
|
+
returnFullResponse: true;
|
|
8
|
+
}, ssrfBridge?: SsrfBridge): Promise<IN8nHttpFullResponse>;
|
|
9
|
+
export declare function httpRequest(requestOptions: IHttpRequestOptions & {
|
|
10
|
+
returnFullResponse?: false;
|
|
11
|
+
}, ssrfBridge?: SsrfBridge): Promise<IN8nHttpResponse>;
|
|
7
12
|
export declare function httpRequest(requestOptions: IHttpRequestOptions, ssrfBridge?: SsrfBridge): Promise<IN8nHttpFullResponse | IN8nHttpResponse>;
|
|
@@ -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");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
15
|
-
|
|
16
|
-
|
|
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, axios_utils_1.digestAuthAxiosConfig)(axiosConfig, response, auth);
|
|
29
|
-
return await (0, axios_1.default)(axiosConfig);
|
|
30
|
-
}
|
|
31
|
-
}
|
|
8
|
+
const invoke_1 = require("./invoke");
|
|
9
|
+
const redirect_1 = require("./redirect");
|
|
10
|
+
const user_agent_1 = require("./user-agent");
|
|
11
|
+
const utils_1 = require("./utils");
|
|
32
12
|
function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
33
13
|
const { headers, method, timeout, auth, proxy, url } = n8nRequest;
|
|
34
14
|
const axiosRequest = {
|
|
@@ -50,20 +30,15 @@ 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
|
-
|
|
58
|
-
|
|
59
|
-
agentOptions.servername = host;
|
|
60
|
-
}
|
|
61
|
-
if (n8nRequest.skipSslCertificateValidation === true) {
|
|
62
|
-
agentOptions.rejectUnauthorized = false;
|
|
63
|
-
}
|
|
64
|
-
const secureLookup = ssrfBridge?.createSecureLookup();
|
|
65
|
-
(0, axios_utils_1.setAxiosAgents)(axiosRequest, agentOptions, proxy, secureLookup);
|
|
66
|
-
axiosRequest.beforeRedirect = (0, axios_utils_1.getBeforeRedirectFn)(agentOptions, axiosRequest, n8nRequest.proxy, n8nRequest.sendCredentialsOnCrossOriginRedirect ?? true, n8nRequest.allowedDomains, ssrfBridge);
|
|
39
|
+
const agentOptions = (0, utils_1.buildAgentOptions)(n8nRequest);
|
|
40
|
+
(0, utils_1.setAxiosAgents)(axiosRequest, agentOptions, proxy, ssrfBridge ?? 'disabled');
|
|
41
|
+
axiosRequest.beforeRedirect = (0, utils_1.getBeforeRedirectFn)(agentOptions, axiosRequest, n8nRequest.proxy, n8nRequest.sendCredentialsOnCrossOriginRedirect ?? true, n8nRequest.allowedDomains, ssrfBridge ?? 'disabled');
|
|
67
42
|
if (n8nRequest.arrayFormat !== undefined) {
|
|
68
43
|
axiosRequest.paramsSerializer = (params) => {
|
|
69
44
|
return (0, qs_1.stringify)(params, { arrayFormat: n8nRequest.arrayFormat });
|
|
@@ -71,10 +46,10 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
71
46
|
}
|
|
72
47
|
const { body } = n8nRequest;
|
|
73
48
|
if (body) {
|
|
74
|
-
const existingContentTypeHeaderKey = (0,
|
|
49
|
+
const existingContentTypeHeaderKey = (0, utils_1.searchForHeader)(axiosRequest, 'content-type');
|
|
75
50
|
if (existingContentTypeHeaderKey === undefined) {
|
|
76
51
|
axiosRequest.headers = axiosRequest.headers || {};
|
|
77
|
-
if ((0,
|
|
52
|
+
if ((0, utils_1.isFormDataInstance)(body)) {
|
|
78
53
|
axiosRequest.headers = {
|
|
79
54
|
...axiosRequest.headers,
|
|
80
55
|
...body.getHeaders(),
|
|
@@ -92,7 +67,7 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
92
67
|
}
|
|
93
68
|
}
|
|
94
69
|
if (n8nRequest.json) {
|
|
95
|
-
const key = (0,
|
|
70
|
+
const key = (0, utils_1.searchForHeader)(axiosRequest, 'accept');
|
|
96
71
|
if (!key) {
|
|
97
72
|
axiosRequest.headers = {
|
|
98
73
|
...axiosRequest.headers,
|
|
@@ -100,10 +75,10 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
100
75
|
};
|
|
101
76
|
}
|
|
102
77
|
}
|
|
103
|
-
(0,
|
|
78
|
+
(0, user_agent_1.applyDefaultOutboundUserAgent)(axiosRequest);
|
|
104
79
|
if (n8nRequest.ignoreHttpStatusErrors) {
|
|
105
80
|
const ignoreHttpStatusErrors = n8nRequest.ignoreHttpStatusErrors;
|
|
106
|
-
if ((0,
|
|
81
|
+
if ((0, utils_1.isIgnoreStatusErrorConfig)(ignoreHttpStatusErrors)) {
|
|
107
82
|
axiosRequest.validateStatus = (status) => {
|
|
108
83
|
return !ignoreHttpStatusErrors.except.includes(status);
|
|
109
84
|
};
|
|
@@ -135,15 +110,24 @@ function removeEmptyBody(requestOptions) {
|
|
|
135
110
|
}
|
|
136
111
|
async function httpRequest(requestOptions, ssrfBridge) {
|
|
137
112
|
removeEmptyBody(requestOptions);
|
|
138
|
-
const url = (0,
|
|
139
|
-
await (0,
|
|
113
|
+
const url = (0, utils_1.buildTargetUrl)(requestOptions.url, requestOptions.baseURL) ?? requestOptions.url;
|
|
114
|
+
await (0, utils_1.validateUrlSsrf)(url, ssrfBridge);
|
|
140
115
|
const axiosRequest = convertN8nRequestToAxios(requestOptions, ssrfBridge);
|
|
141
116
|
if (axiosRequest.data === undefined ||
|
|
142
117
|
(axiosRequest.method !== undefined && axiosRequest.method.toUpperCase() === 'GET')) {
|
|
143
118
|
delete axiosRequest.data;
|
|
144
119
|
}
|
|
145
|
-
(0,
|
|
146
|
-
const result =
|
|
120
|
+
(0, utils_1.throwIfDomainNotAllowed)(axiosRequest, requestOptions.allowedDomains);
|
|
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);
|
|
147
131
|
if (requestOptions.returnFullResponse) {
|
|
148
132
|
return {
|
|
149
133
|
body: result.data,
|
|
@@ -154,4 +138,4 @@ async function httpRequest(requestOptions, ssrfBridge) {
|
|
|
154
138
|
}
|
|
155
139
|
return result.data;
|
|
156
140
|
}
|
|
157
|
-
//# sourceMappingURL=
|
|
141
|
+
//# sourceMappingURL=request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/http/axios/request.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ exports.applyDefaultOutboundUserAgent = applyDefaultOutboundUserAgent;
|
|
|
6
6
|
const config_1 = require("@n8n/config");
|
|
7
7
|
const di_1 = require("@n8n/di");
|
|
8
8
|
const node_path_1 = require("node:path");
|
|
9
|
-
const
|
|
9
|
+
const utils_1 = require("./utils");
|
|
10
10
|
const N8N_PRODUCT_URL = 'https://n8n.io/';
|
|
11
11
|
const LEGACY_USER_AGENT = 'n8n';
|
|
12
12
|
function readN8nVersion() {
|
|
@@ -30,11 +30,11 @@ function getDefaultN8nOutboundUserAgent() {
|
|
|
30
30
|
return buildRfcStyleUserAgent(readN8nVersion());
|
|
31
31
|
}
|
|
32
32
|
function applyDefaultOutboundUserAgent(axiosConfig) {
|
|
33
|
-
if ((0,
|
|
33
|
+
if ((0, utils_1.searchForHeader)(axiosConfig, 'user-agent'))
|
|
34
34
|
return;
|
|
35
35
|
axiosConfig.headers = {
|
|
36
36
|
...axiosConfig.headers,
|
|
37
37
|
'User-Agent': getDefaultN8nOutboundUserAgent(),
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
//# sourceMappingURL=
|
|
40
|
+
//# sourceMappingURL=user-agent.js.map
|