@n8n/backend-network 1.1.1 → 1.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.tsbuildinfo +1 -1
- package/dist/http/{axios-config.js → axios/config.js} +3 -3
- package/dist/http/axios/config.js.map +1 -0
- package/dist/http/axios/legacy.d.ts +4 -0
- package/dist/http/axios/legacy.js +214 -0
- package/dist/http/axios/legacy.js.map +1 -0
- package/dist/http/{http-request.d.ts → axios/request.d.ts} +7 -1
- package/dist/http/{http-request.js → axios/request.js} +15 -16
- 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} +4 -3
- package/dist/http/{axios-utils.js → axios/utils.js} +23 -15
- package/dist/http/axios/utils.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.js +4 -57
- package/dist/http/http-proxy.js.map +1 -1
- package/dist/http/index.d.ts +7 -4
- package/dist/http/index.js +10 -24
- package/dist/http/index.js.map +1 -1
- package/dist/http/legacy-request.d.ts +7 -0
- package/dist/http/legacy-request.js +90 -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 +65 -0
- package/dist/http/node-agents.js.map +1 -0
- package/dist/http/outbound-http.d.ts +42 -0
- package/dist/http/outbound-http.js +56 -0
- package/dist/http/outbound-http.js.map +1 -0
- package/dist/http/undici/transport.d.ts +12 -0
- package/dist/http/undici/transport.js +62 -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/package.json +28 -8
- 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,4 @@
|
|
|
1
|
+
import type { AxiosRequestConfig } from 'axios';
|
|
2
|
+
import type { IRequestOptions } from 'n8n-workflow';
|
|
3
|
+
import type { SsrfBridge } from '../../ssrf';
|
|
4
|
+
export declare function buildAxiosConfigFromLegacyRequest(requestObject: IRequestOptions, ssrfBridge?: SsrfBridge): Promise<AxiosRequestConfig>;
|
|
@@ -0,0 +1,214 @@
|
|
|
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.buildAxiosConfigFromLegacyRequest = buildAxiosConfigFromLegacyRequest;
|
|
7
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
8
|
+
const qs_1 = require("qs");
|
|
9
|
+
const user_agent_1 = require("./user-agent");
|
|
10
|
+
const utils_1 = require("./utils");
|
|
11
|
+
async function buildAxiosConfigFromLegacyRequest(requestObject, ssrfBridge) {
|
|
12
|
+
const axiosConfig = {};
|
|
13
|
+
if (requestObject.headers !== undefined) {
|
|
14
|
+
axiosConfig.headers = requestObject.headers;
|
|
15
|
+
}
|
|
16
|
+
const contentTypeHeaderKeyName = axiosConfig.headers &&
|
|
17
|
+
Object.keys(axiosConfig.headers).find((headerName) => headerName.toLowerCase() === 'content-type');
|
|
18
|
+
const contentType = contentTypeHeaderKeyName &&
|
|
19
|
+
axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
20
|
+
if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
|
|
21
|
+
if (typeof requestObject.body === 'string') {
|
|
22
|
+
axiosConfig.data = requestObject.body;
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
const allData = Object.assign(requestObject.body || {}, requestObject.form || {});
|
|
26
|
+
if (requestObject.useQuerystring === true) {
|
|
27
|
+
axiosConfig.data = (0, qs_1.stringify)(allData, { arrayFormat: 'repeat' });
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
axiosConfig.data = (0, qs_1.stringify)(allData);
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else if (contentType?.includes('multipart/form-data')) {
|
|
35
|
+
if (requestObject.formData !== undefined && (0, utils_1.isFormDataInstance)(requestObject.formData)) {
|
|
36
|
+
axiosConfig.data = requestObject.formData;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
const allData = {
|
|
40
|
+
...requestObject.body,
|
|
41
|
+
...requestObject.formData,
|
|
42
|
+
};
|
|
43
|
+
axiosConfig.data = (0, utils_1.createFormDataObject)(allData);
|
|
44
|
+
}
|
|
45
|
+
delete axiosConfig.headers?.[contentTypeHeaderKeyName];
|
|
46
|
+
const headers = axiosConfig.data.getHeaders();
|
|
47
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
48
|
+
await (0, utils_1.generateContentLengthHeader)(axiosConfig);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
if (requestObject.form !== undefined && requestObject.body === undefined) {
|
|
52
|
+
axiosConfig.data =
|
|
53
|
+
typeof requestObject.form === 'string'
|
|
54
|
+
? requestObject.form
|
|
55
|
+
: (0, qs_1.stringify)(requestObject.form).toString();
|
|
56
|
+
if (axiosConfig.headers !== undefined) {
|
|
57
|
+
const headerName = (0, utils_1.searchForHeader)(axiosConfig, 'content-type');
|
|
58
|
+
if (headerName) {
|
|
59
|
+
delete axiosConfig.headers[headerName];
|
|
60
|
+
}
|
|
61
|
+
axiosConfig.headers['Content-Type'] = 'application/x-www-form-urlencoded';
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
axiosConfig.headers = {
|
|
65
|
+
'Content-Type': 'application/x-www-form-urlencoded',
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
else if (requestObject.formData !== undefined) {
|
|
70
|
+
if (axiosConfig.headers !== undefined) {
|
|
71
|
+
const headers = Object.keys(axiosConfig.headers);
|
|
72
|
+
headers.forEach((header) => {
|
|
73
|
+
if (header.toLowerCase() === 'content-type') {
|
|
74
|
+
delete axiosConfig.headers?.[header];
|
|
75
|
+
}
|
|
76
|
+
});
|
|
77
|
+
}
|
|
78
|
+
if ((0, utils_1.isFormDataInstance)(requestObject.formData)) {
|
|
79
|
+
axiosConfig.data = requestObject.formData;
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
axiosConfig.data = (0, utils_1.createFormDataObject)(requestObject.formData);
|
|
83
|
+
}
|
|
84
|
+
const headers = axiosConfig.data.getHeaders();
|
|
85
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
|
|
86
|
+
await (0, utils_1.generateContentLengthHeader)(axiosConfig);
|
|
87
|
+
}
|
|
88
|
+
else if (requestObject.body !== undefined) {
|
|
89
|
+
if (requestObject.form !== undefined && requestObject.body) {
|
|
90
|
+
requestObject.body = Object.assign(requestObject.body, requestObject.form);
|
|
91
|
+
}
|
|
92
|
+
axiosConfig.data = requestObject.body;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (requestObject.uri !== undefined) {
|
|
96
|
+
axiosConfig.url = requestObject.uri?.toString();
|
|
97
|
+
}
|
|
98
|
+
if (requestObject.url !== undefined) {
|
|
99
|
+
axiosConfig.url = requestObject.url?.toString();
|
|
100
|
+
}
|
|
101
|
+
if (requestObject.baseURL !== undefined) {
|
|
102
|
+
axiosConfig.baseURL = requestObject.baseURL?.toString();
|
|
103
|
+
}
|
|
104
|
+
if (requestObject.method !== undefined) {
|
|
105
|
+
axiosConfig.method = requestObject.method;
|
|
106
|
+
}
|
|
107
|
+
if (requestObject.qs !== undefined && Object.keys(requestObject.qs).length > 0) {
|
|
108
|
+
axiosConfig.params = requestObject.qs;
|
|
109
|
+
}
|
|
110
|
+
function hasArrayFormatOptions(arg) {
|
|
111
|
+
if (typeof arg.qsStringifyOptions === 'object' &&
|
|
112
|
+
arg.qsStringifyOptions !== null &&
|
|
113
|
+
!Array.isArray(arg.qsStringifyOptions) &&
|
|
114
|
+
'arrayFormat' in arg.qsStringifyOptions) {
|
|
115
|
+
return true;
|
|
116
|
+
}
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
119
|
+
if (requestObject.useQuerystring === true ||
|
|
120
|
+
(hasArrayFormatOptions(requestObject) &&
|
|
121
|
+
requestObject.qsStringifyOptions.arrayFormat === 'repeat')) {
|
|
122
|
+
axiosConfig.paramsSerializer = (params) => {
|
|
123
|
+
return (0, qs_1.stringify)(params, { arrayFormat: 'repeat' });
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
else if (requestObject.useQuerystring === false) {
|
|
127
|
+
axiosConfig.paramsSerializer = (params) => {
|
|
128
|
+
return (0, qs_1.stringify)(params, { arrayFormat: 'indices' });
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
if (hasArrayFormatOptions(requestObject) &&
|
|
132
|
+
requestObject.qsStringifyOptions.arrayFormat === 'brackets') {
|
|
133
|
+
axiosConfig.paramsSerializer = (params) => {
|
|
134
|
+
return (0, qs_1.stringify)(params, { arrayFormat: 'brackets' });
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
if (requestObject.auth !== undefined) {
|
|
138
|
+
if (requestObject.auth.bearer !== undefined) {
|
|
139
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
140
|
+
Authorization: `Bearer ${requestObject.auth.bearer}`,
|
|
141
|
+
});
|
|
142
|
+
}
|
|
143
|
+
else {
|
|
144
|
+
const authObj = requestObject.auth;
|
|
145
|
+
axiosConfig.auth = {
|
|
146
|
+
username: (authObj.user || authObj.username),
|
|
147
|
+
password: (authObj.password || authObj.pass),
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
if (requestObject.json === true) {
|
|
152
|
+
const acceptHeaderExists = axiosConfig.headers === undefined
|
|
153
|
+
? false
|
|
154
|
+
: Object.keys(axiosConfig.headers)
|
|
155
|
+
.map((headerKey) => headerKey.toLowerCase())
|
|
156
|
+
.includes('accept');
|
|
157
|
+
if (!acceptHeaderExists) {
|
|
158
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
159
|
+
Accept: 'application/json',
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
if (requestObject.json === false || requestObject.json === undefined) {
|
|
164
|
+
axiosConfig.transformResponse = (res) => res;
|
|
165
|
+
}
|
|
166
|
+
const { method } = requestObject;
|
|
167
|
+
if ((requestObject.followRedirect !== false &&
|
|
168
|
+
(!method || method === 'GET' || method === 'HEAD')) ||
|
|
169
|
+
requestObject.followAllRedirects) {
|
|
170
|
+
axiosConfig.maxRedirects = requestObject.maxRedirects;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
axiosConfig.maxRedirects = 0;
|
|
174
|
+
}
|
|
175
|
+
const host = (0, utils_1.getHostFromRequestObject)(requestObject);
|
|
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
|
+
}
|
|
184
|
+
if (requestObject.timeout !== undefined) {
|
|
185
|
+
axiosConfig.timeout = requestObject.timeout;
|
|
186
|
+
}
|
|
187
|
+
(0, utils_1.setAxiosAgents)(axiosConfig, agentOptions, requestObject.proxy, ssrfBridge ?? 'disabled');
|
|
188
|
+
axiosConfig.beforeRedirect = (0, utils_1.getBeforeRedirectFn)(agentOptions, axiosConfig, requestObject.proxy, requestObject.sendCredentialsOnCrossOriginRedirect ?? true, requestObject.allowedDomains, ssrfBridge ?? 'disabled');
|
|
189
|
+
if (requestObject.useStream) {
|
|
190
|
+
axiosConfig.responseType = 'stream';
|
|
191
|
+
}
|
|
192
|
+
else if (requestObject.encoding === null) {
|
|
193
|
+
axiosConfig.responseType = 'arraybuffer';
|
|
194
|
+
}
|
|
195
|
+
const allHeaders = axiosConfig.headers ? Object.keys(axiosConfig.headers) : [];
|
|
196
|
+
if (!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'accept')) {
|
|
197
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, { accept: '*/*' });
|
|
198
|
+
}
|
|
199
|
+
if (requestObject.json !== false &&
|
|
200
|
+
axiosConfig.data !== undefined &&
|
|
201
|
+
axiosConfig.data !== '' &&
|
|
202
|
+
!(axiosConfig.data instanceof Buffer) &&
|
|
203
|
+
!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'content-type')) {
|
|
204
|
+
axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
|
|
205
|
+
'content-type': 'application/json',
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
if (requestObject.simple === false) {
|
|
209
|
+
axiosConfig.validateStatus = () => true;
|
|
210
|
+
}
|
|
211
|
+
(0, user_agent_1.applyDefaultOutboundUserAgent)(axiosConfig);
|
|
212
|
+
return axiosConfig;
|
|
213
|
+
}
|
|
214
|
+
//# sourceMappingURL=legacy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"legacy.js","sourceRoot":"","sources":["../../../src/http/axios/legacy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import type { AxiosRequestConfig } from 'axios';
|
|
2
2
|
import type { IHttpRequestOptions, IN8nHttpFullResponse, IN8nHttpResponse, IRequestOptions } from 'n8n-workflow';
|
|
3
|
-
import type { SsrfBridge } from '
|
|
3
|
+
import type { SsrfBridge } from '../../ssrf';
|
|
4
4
|
export declare function invokeAxios(axiosConfig: AxiosRequestConfig, authOptions?: IRequestOptions['auth']): Promise<import("axios").AxiosResponse<any, any, {}>>;
|
|
5
5
|
export declare function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions, ssrfBridge?: SsrfBridge): AxiosRequestConfig;
|
|
6
6
|
export declare function removeEmptyBody(requestOptions: IHttpRequestOptions | IRequestOptions): void;
|
|
7
|
+
export declare function httpRequest(requestOptions: IHttpRequestOptions & {
|
|
8
|
+
returnFullResponse: true;
|
|
9
|
+
}, ssrfBridge?: SsrfBridge): Promise<IN8nHttpFullResponse>;
|
|
10
|
+
export declare function httpRequest(requestOptions: IHttpRequestOptions & {
|
|
11
|
+
returnFullResponse?: false;
|
|
12
|
+
}, ssrfBridge?: SsrfBridge): Promise<IN8nHttpResponse>;
|
|
7
13
|
export declare function httpRequest(requestOptions: IHttpRequestOptions, ssrfBridge?: SsrfBridge): Promise<IN8nHttpFullResponse | IN8nHttpResponse>;
|
|
@@ -10,8 +10,8 @@ exports.httpRequest = httpRequest;
|
|
|
10
10
|
const axios_1 = __importDefault(require("axios"));
|
|
11
11
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
12
12
|
const qs_1 = require("qs");
|
|
13
|
-
const
|
|
14
|
-
const
|
|
13
|
+
const user_agent_1 = require("./user-agent");
|
|
14
|
+
const utils_1 = require("./utils");
|
|
15
15
|
async function invokeAxios(axiosConfig, authOptions = {}) {
|
|
16
16
|
try {
|
|
17
17
|
return await (0, axios_1.default)(axiosConfig);
|
|
@@ -25,7 +25,7 @@ async function invokeAxios(axiosConfig, authOptions = {}) {
|
|
|
25
25
|
}
|
|
26
26
|
const { auth } = axiosConfig;
|
|
27
27
|
delete axiosConfig.auth;
|
|
28
|
-
axiosConfig = (0,
|
|
28
|
+
axiosConfig = (0, utils_1.digestAuthAxiosConfig)(axiosConfig, response, auth);
|
|
29
29
|
return await (0, axios_1.default)(axiosConfig);
|
|
30
30
|
}
|
|
31
31
|
}
|
|
@@ -53,7 +53,7 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
53
53
|
if (n8nRequest.encoding !== undefined) {
|
|
54
54
|
axiosRequest.responseType = n8nRequest.encoding;
|
|
55
55
|
}
|
|
56
|
-
const host = (0,
|
|
56
|
+
const host = (0, utils_1.getHostFromRequestObject)(n8nRequest);
|
|
57
57
|
const agentOptions = { ...n8nRequest.agentOptions };
|
|
58
58
|
if (host) {
|
|
59
59
|
agentOptions.servername = host;
|
|
@@ -61,9 +61,8 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
61
61
|
if (n8nRequest.skipSslCertificateValidation === true) {
|
|
62
62
|
agentOptions.rejectUnauthorized = false;
|
|
63
63
|
}
|
|
64
|
-
|
|
65
|
-
(0,
|
|
66
|
-
axiosRequest.beforeRedirect = (0, axios_utils_1.getBeforeRedirectFn)(agentOptions, axiosRequest, n8nRequest.proxy, n8nRequest.sendCredentialsOnCrossOriginRedirect ?? true, n8nRequest.allowedDomains, ssrfBridge);
|
|
64
|
+
(0, utils_1.setAxiosAgents)(axiosRequest, agentOptions, proxy, ssrfBridge ?? 'disabled');
|
|
65
|
+
axiosRequest.beforeRedirect = (0, utils_1.getBeforeRedirectFn)(agentOptions, axiosRequest, n8nRequest.proxy, n8nRequest.sendCredentialsOnCrossOriginRedirect ?? true, n8nRequest.allowedDomains, ssrfBridge ?? 'disabled');
|
|
67
66
|
if (n8nRequest.arrayFormat !== undefined) {
|
|
68
67
|
axiosRequest.paramsSerializer = (params) => {
|
|
69
68
|
return (0, qs_1.stringify)(params, { arrayFormat: n8nRequest.arrayFormat });
|
|
@@ -71,10 +70,10 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
71
70
|
}
|
|
72
71
|
const { body } = n8nRequest;
|
|
73
72
|
if (body) {
|
|
74
|
-
const existingContentTypeHeaderKey = (0,
|
|
73
|
+
const existingContentTypeHeaderKey = (0, utils_1.searchForHeader)(axiosRequest, 'content-type');
|
|
75
74
|
if (existingContentTypeHeaderKey === undefined) {
|
|
76
75
|
axiosRequest.headers = axiosRequest.headers || {};
|
|
77
|
-
if ((0,
|
|
76
|
+
if ((0, utils_1.isFormDataInstance)(body)) {
|
|
78
77
|
axiosRequest.headers = {
|
|
79
78
|
...axiosRequest.headers,
|
|
80
79
|
...body.getHeaders(),
|
|
@@ -92,7 +91,7 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
92
91
|
}
|
|
93
92
|
}
|
|
94
93
|
if (n8nRequest.json) {
|
|
95
|
-
const key = (0,
|
|
94
|
+
const key = (0, utils_1.searchForHeader)(axiosRequest, 'accept');
|
|
96
95
|
if (!key) {
|
|
97
96
|
axiosRequest.headers = {
|
|
98
97
|
...axiosRequest.headers,
|
|
@@ -100,10 +99,10 @@ function convertN8nRequestToAxios(n8nRequest, ssrfBridge) {
|
|
|
100
99
|
};
|
|
101
100
|
}
|
|
102
101
|
}
|
|
103
|
-
(0,
|
|
102
|
+
(0, user_agent_1.applyDefaultOutboundUserAgent)(axiosRequest);
|
|
104
103
|
if (n8nRequest.ignoreHttpStatusErrors) {
|
|
105
104
|
const ignoreHttpStatusErrors = n8nRequest.ignoreHttpStatusErrors;
|
|
106
|
-
if ((0,
|
|
105
|
+
if ((0, utils_1.isIgnoreStatusErrorConfig)(ignoreHttpStatusErrors)) {
|
|
107
106
|
axiosRequest.validateStatus = (status) => {
|
|
108
107
|
return !ignoreHttpStatusErrors.except.includes(status);
|
|
109
108
|
};
|
|
@@ -135,14 +134,14 @@ function removeEmptyBody(requestOptions) {
|
|
|
135
134
|
}
|
|
136
135
|
async function httpRequest(requestOptions, ssrfBridge) {
|
|
137
136
|
removeEmptyBody(requestOptions);
|
|
138
|
-
const url = (0,
|
|
139
|
-
await (0,
|
|
137
|
+
const url = (0, utils_1.buildTargetUrl)(requestOptions.url, requestOptions.baseURL) ?? requestOptions.url;
|
|
138
|
+
await (0, utils_1.validateUrlSsrf)(url, ssrfBridge);
|
|
140
139
|
const axiosRequest = convertN8nRequestToAxios(requestOptions, ssrfBridge);
|
|
141
140
|
if (axiosRequest.data === undefined ||
|
|
142
141
|
(axiosRequest.method !== undefined && axiosRequest.method.toUpperCase() === 'GET')) {
|
|
143
142
|
delete axiosRequest.data;
|
|
144
143
|
}
|
|
145
|
-
(0,
|
|
144
|
+
(0, utils_1.throwIfDomainNotAllowed)(axiosRequest, requestOptions.allowedDomains);
|
|
146
145
|
const result = await invokeAxios(axiosRequest, requestOptions.auth);
|
|
147
146
|
if (requestOptions.returnFullResponse) {
|
|
148
147
|
return {
|
|
@@ -154,4 +153,4 @@ async function httpRequest(requestOptions, ssrfBridge) {
|
|
|
154
153
|
}
|
|
155
154
|
return result.data;
|
|
156
155
|
}
|
|
157
|
-
//# sourceMappingURL=
|
|
156
|
+
//# sourceMappingURL=request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"request.js","sourceRoot":"","sources":["../../../src/http/axios/request.ts"],"names":[],"mappings":";;;;;AA6BA,kCAkBC;AAED,4DAmHC;AAqBD,0CAKC;AAmBD,kCAiCC;AA/OD,kDAA0B;AAQ1B,+CAA6C;AAC7C,2BAA+B;AAE/B,6CAA6D;AAC7D,mCAWiB;AAGV,KAAK,UAAU,WAAW,CAChC,WAA+B,EAC/B,cAAuC,EAAE;IAEzC,IAAI,CAAC;QACJ,OAAO,MAAM,IAAA,eAAK,EAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,WAAW,CAAC,eAAe,KAAK,KAAK,IAAI,CAAC,CAAC,KAAK,YAAY,eAAK,CAAC,UAAU,CAAC;YAAE,MAAM,KAAK,CAAC;QAE/F,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QAC3B,IAAI,QAAQ,EAAE,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1F,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;AAED,SAAgB,wBAAwB,CACvC,UAA+B,EAC/B,UAAuB;IAGvB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC;IAElE,MAAM,YAAY,GAAuB;QACxC,OAAO,EAAE,OAAO,IAAI,EAAE;QACtB,MAAM;QACN,OAAO;QACP,IAAI;QACJ,GAAG;QACH,aAAa,EAAE,QAAQ;QACvB,gBAAgB,EAAE,QAAQ;KACJ,CAAC;IAExB,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC,EAAE,CAAC;IAEpC,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC;QAC5B,YAAY,CAAC,MAAM,GAAG,UAAU,CAAC,WAAW,CAAC;IAC9C,CAAC;IAED,IAAI,UAAU,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;QACtC,YAAY,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAC3C,CAAC;IAED,IAAI,UAAU,CAAC,qBAAqB,KAAK,IAAI,EAAE,CAAC;QAC/C,YAAY,CAAC,YAAY,GAAG,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,UAAU,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACvC,YAAY,CAAC,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC;IACjD,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,gCAAwB,EAAC,UAAU,CAAC,CAAC;IAClD,MAAM,YAAY,GAAiB,EAAE,GAAG,UAAU,CAAC,YAAY,EAAE,CAAC;IAClE,IAAI,IAAI,EAAE,CAAC;QACV,YAAY,CAAC,UAAU,GAAG,IAAI,CAAC;IAChC,CAAC;IACD,IAAI,UAAU,CAAC,4BAA4B,KAAK,IAAI,EAAE,CAAC;QACtD,YAAY,CAAC,kBAAkB,GAAG,KAAK,CAAC;IACzC,CAAC;IACD,IAAA,sBAAc,EAAC,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,IAAI,UAAU,CAAC,CAAC;IAE5E,YAAY,CAAC,cAAc,GAAG,IAAA,2BAAmB,EAChD,YAAY,EACZ,YAAY,EACZ,UAAU,CAAC,KAAK,EAChB,UAAU,CAAC,oCAAoC,IAAI,IAAI,EACvD,UAAU,CAAC,cAAc,EACzB,UAAU,IAAI,UAAU,CACxB,CAAC;IAEF,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC1C,YAAY,CAAC,gBAAgB,GAAG,CAAC,MAAM,EAAE,EAAE;YAC1C,OAAO,IAAA,cAAS,EAAC,MAAM,EAAE,EAAE,WAAW,EAAE,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;QACnE,CAAC,CAAC;IACH,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAC5B,IAAI,IAAI,EAAE,CAAC;QAEV,MAAM,4BAA4B,GAAG,IAAA,uBAAe,EAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QACnF,IAAI,4BAA4B,KAAK,SAAS,EAAE,CAAC;YAChD,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC,OAAO,IAAI,EAAE,CAAC;YAGlD,IAAI,IAAA,0BAAkB,EAAC,IAAI,CAAC,EAAE,CAAC;gBAC9B,YAAY,CAAC,OAAO,GAAG;oBACtB,GAAG,YAAY,CAAC,OAAO;oBACvB,GAAG,IAAI,CAAC,UAAU,EAAE;iBACpB,CAAC;YACH,CAAC;iBAAM,IAAI,IAAI,YAAY,eAAe,EAAE,CAAC;gBAC5C,YAAY,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,mCAAmC,CAAC;YAC5E,CAAC;QACF,CAAC;aAAM,IACN,YAAY,CAAC,OAAO,EAAE,CAAC,4BAA4B,CAAC,KAAK,mCAAmC,EAC3F,CAAC;YACF,YAAY,CAAC,IAAI,GAAG,IAAI,eAAe,CAAC,UAAU,CAAC,IAA8B,CAAC,CAAC;QACpF,CAAC;QAID,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAA,4BAAa,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACpF,YAAY,CAAC,IAAI,GAAG,IAAI,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,IAAA,uBAAe,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAGpD,IAAI,CAAC,GAAG,EAAE,CAAC;YACV,YAAY,CAAC,OAAO,GAAG;gBACtB,GAAG,YAAY,CAAC,OAAO;gBACvB,MAAM,EAAE,kBAAkB;aAC1B,CAAC;QACH,CAAC;IACF,CAAC;IAED,IAAA,0CAA6B,EAAC,YAAY,CAAC,CAAC;IAE5C,IAAI,UAAU,CAAC,sBAAsB,EAAE,CAAC;QACvC,MAAM,sBAAsB,GAAG,UAAU,CAAC,sBAAsB,CAAC;QACjE,IAAI,IAAA,iCAAyB,EAAC,sBAAsB,CAAC,EAAE,CAAC;YACvD,YAAY,CAAC,cAAc,GAAG,CAAC,MAAM,EAAE,EAAE;gBACxC,OAAO,CAAC,sBAAsB,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACxD,CAAC,CAAC;QACH,CAAC;aAAM,CAAC;YACP,YAAY,CAAC,cAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;QAC1C,CAAC;IACF,CAAC;IAED,OAAO,YAAY,CAAC;AACrB,CAAC;AAED,MAAM,iBAAiB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;AAKrD,SAAS,OAAO,CAAC,KAAc;IAC9B,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACjF,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC;IAC3B,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAGD,SAAgB,eAAe,CAAC,cAAqD;IACpF,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,IAAI,KAAK,CAAC;IAC9C,IAAI,iBAAiB,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QACxE,OAAO,cAAc,CAAC,IAAI,CAAC;IAC5B,CAAC;AACF,CAAC;AAmBM,KAAK,UAAU,WAAW,CAChC,cAAmC,EACnC,UAAuB;IAEvB,eAAe,CAAC,cAAc,CAAC,CAAC;IAEhC,MAAM,GAAG,GAAG,IAAA,sBAAc,EAAC,cAAc,CAAC,GAAG,EAAE,cAAc,CAAC,OAAO,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC;IAC7F,MAAM,IAAA,uBAAe,EAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAEvC,MAAM,YAAY,GAAG,wBAAwB,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;IAC1E,IACC,YAAY,CAAC,IAAI,KAAK,SAAS;QAC/B,CAAC,YAAY,CAAC,MAAM,KAAK,SAAS,IAAI,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,EACjF,CAAC;QACF,OAAO,YAAY,CAAC,IAAI,CAAC;IAC1B,CAAC;IAED,IAAA,+BAAuB,EAAC,YAAY,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAErE,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;IAEpE,IAAI,cAAc,CAAC,kBAAkB,EAAE,CAAC;QACvC,OAAO;YAEN,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,UAAU,EAAE,MAAM,CAAC,MAAM;YACzB,aAAa,EAAE,MAAM,CAAC,UAAU;SAChC,CAAC;IACH,CAAC;IAGD,OAAO,MAAM,CAAC,IAAI,CAAC;AACpB,CAAC"}
|
|
@@ -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
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"user-agent.js","sourceRoot":"","sources":["../../../src/http/axios/user-agent.ts"],"names":[],"mappings":";;AA2BA,wDAEC;AAUD,wEAQC;AAMD,sEAOC;AA5DD,wCAAgD;AAChD,gCAAoC;AAEpC,yCAAiC;AAEjC,mCAA0C;AAE1C,MAAM,eAAe,GAAG,iBAAiB,CAAC;AAC1C,MAAM,iBAAiB,GAAG,KAAK,CAAC;AAEhC,SAAS,cAAc;IACtB,IAAI,CAAC;QAGJ,MAAM,GAAG,GAAG,OAAO,CAAC,IAAA,gBAAI,EAAC,SAAS,EAAE,0BAA0B,CAAC,CAAwB,CAAC;QACxF,OAAO,GAAG,CAAC,OAAO,CAAC;IACpB,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,OAAO,CAAC;IAChB,CAAC;AACF,CAAC;AAQD,SAAgB,sBAAsB,CAAC,OAAe;IACrD,OAAO,gCAAgC,OAAO,MAAM,eAAe,GAAG,CAAC;AACxE,CAAC;AAUD,SAAgB,8BAA8B;IAC7C,MAAM,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,GAAG,cAAS,CAAC,GAAG,CAAC,0BAAiB,CAAC,CAAC;IAE1F,IAAI,CAAC,sBAAsB;QAAE,OAAO,iBAAiB,CAAC;IAEtD,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,oBAAoB,CAAC;IAEjE,OAAO,sBAAsB,CAAC,cAAc,EAAE,CAAC,CAAC;AACjD,CAAC;AAMD,SAAgB,6BAA6B,CAAC,WAA+B;IAC5E,IAAI,IAAA,uBAAe,EAAC,WAAW,EAAE,YAAY,CAAC;QAAE,OAAO;IAEvD,WAAW,CAAC,OAAO,GAAG;QACrB,GAAG,WAAW,CAAC,OAAO;QACtB,YAAY,EAAE,8BAA8B,EAAE;KAC9C,CAAC;AACH,CAAC"}
|
|
@@ -2,7 +2,8 @@ import type { AxiosRequestConfig, AxiosResponse } from 'axios';
|
|
|
2
2
|
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
|
-
import type { SsrfBridge } from '
|
|
5
|
+
import type { SsrfBridge } from '../../ssrf';
|
|
6
|
+
import type { SsrfOption } from '../node-agents';
|
|
6
7
|
export declare function throwIfDomainNotAllowed(configOrUrl: AxiosRequestConfig | string, allowedDomains?: string): void;
|
|
7
8
|
export declare function tryParseUrl(url: string): URL | null;
|
|
8
9
|
export declare function isIgnoreStatusErrorConfig(ignoreHttpStatusErrors: unknown): ignoreHttpStatusErrors is IgnoreStatusErrorConfig;
|
|
@@ -12,13 +13,13 @@ export declare const getHostFromRequestObject: (requestObject: Partial<{
|
|
|
12
13
|
uri: string;
|
|
13
14
|
baseURL: string;
|
|
14
15
|
}>) => string | null;
|
|
15
|
-
export declare const getBeforeRedirectFn: (agentOptions: AgentOptions, axiosConfig: AxiosRequestConfig, proxyConfig: IHttpRequestOptions["proxy"] | string | undefined, sendCredentialsOnCrossOriginRedirect: boolean, allowedDomains?: string,
|
|
16
|
+
export declare const getBeforeRedirectFn: (agentOptions: AgentOptions, axiosConfig: AxiosRequestConfig, proxyConfig: IHttpRequestOptions["proxy"] | string | undefined, sendCredentialsOnCrossOriginRedirect: boolean, allowedDomains?: string, ssrf?: SsrfOption) => (redirectedRequest: Record<string, any>) => void;
|
|
16
17
|
export declare function digestAuthAxiosConfig(axiosConfig: AxiosRequestConfig, response: AxiosResponse, auth: AxiosRequestConfig['auth']): AxiosRequestConfig;
|
|
17
18
|
export declare const createFormDataObject: (data: Record<string, unknown>) => FormData;
|
|
18
19
|
export declare function isFormDataInstance(data: unknown): data is FormData;
|
|
19
20
|
export declare function generateContentLengthHeader(config: AxiosRequestConfig): Promise<void>;
|
|
20
21
|
export declare function getUrlFromProxyConfig(proxyConfig: IHttpRequestOptions['proxy'] | string): string | null;
|
|
21
22
|
export declare function buildTargetUrl(url?: string, baseURL?: string): string | undefined;
|
|
22
|
-
export declare function setAxiosAgents(config: AxiosRequestConfig, agentOptions?: AgentOptions, proxyConfig?: IHttpRequestOptions['proxy'] | string,
|
|
23
|
+
export declare function setAxiosAgents(config: AxiosRequestConfig, agentOptions?: AgentOptions, proxyConfig?: IHttpRequestOptions['proxy'] | string, ssrf?: SsrfOption): void;
|
|
23
24
|
export declare function validateUrlSsrf(url: string | undefined, ssrfBridge?: SsrfBridge): Promise<void>;
|
|
24
25
|
export declare function resolveLegacyRequestUrl(requestObject: IRequestOptions): string | undefined;
|
|
@@ -22,7 +22,7 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
22
22
|
const crypto_1 = __importDefault(require("crypto"));
|
|
23
23
|
const form_data_1 = __importDefault(require("form-data"));
|
|
24
24
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
25
|
-
const
|
|
25
|
+
const node_agents_1 = require("../node-agents");
|
|
26
26
|
function throwIfDomainNotAllowed(configOrUrl, allowedDomains) {
|
|
27
27
|
const url = typeof configOrUrl === 'string' ? configOrUrl : axios_1.default.getUri(configOrUrl);
|
|
28
28
|
(0, n8n_workflow_1.assertUrlAllowed)({ url, allowedDomains });
|
|
@@ -59,22 +59,29 @@ const getHostFromRequestObject = (requestObject) => {
|
|
|
59
59
|
}
|
|
60
60
|
};
|
|
61
61
|
exports.getHostFromRequestObject = getHostFromRequestObject;
|
|
62
|
-
|
|
62
|
+
function resolveProxyOption(customProxyUrl) {
|
|
63
|
+
if (!customProxyUrl) {
|
|
64
|
+
return 'env';
|
|
65
|
+
}
|
|
66
|
+
if ((0, node_agents_1.isSupportedProxyUrl)(customProxyUrl)) {
|
|
67
|
+
return customProxyUrl;
|
|
68
|
+
}
|
|
69
|
+
di_1.Container.get(backend_common_1.Logger).warn(`Ignoring unsupported proxy URL "${customProxyUrl}", falling back to environment proxy settings`);
|
|
70
|
+
return 'env';
|
|
71
|
+
}
|
|
72
|
+
const getBeforeRedirectFn = (agentOptions, axiosConfig, proxyConfig, sendCredentialsOnCrossOriginRedirect, allowedDomains, ssrf = 'disabled') => (redirectedRequest) => {
|
|
63
73
|
throwIfDomainNotAllowed(redirectedRequest.href, allowedDomains);
|
|
64
|
-
if (
|
|
65
|
-
|
|
74
|
+
if (ssrf !== 'disabled') {
|
|
75
|
+
ssrf.validateRedirectSync(redirectedRequest.href);
|
|
66
76
|
}
|
|
67
77
|
const redirectAgentOptions = {
|
|
68
78
|
...agentOptions,
|
|
69
79
|
servername: redirectedRequest.hostname,
|
|
70
80
|
};
|
|
71
81
|
const customProxyUrl = proxyConfig ? getUrlFromProxyConfig(proxyConfig) : null;
|
|
72
|
-
const
|
|
73
|
-
? { ...redirectAgentOptions, lookup: ssrfBridge.createSecureLookup() }
|
|
74
|
-
: redirectAgentOptions;
|
|
82
|
+
const proxy = resolveProxyOption(customProxyUrl);
|
|
75
83
|
const targetUrl = redirectedRequest.href;
|
|
76
|
-
const httpAgent = (0,
|
|
77
|
-
const httpsAgent = (0, http_proxy_1.createHttpsProxyAgent)(customProxyUrl, targetUrl, effectiveRedirectOptions);
|
|
84
|
+
const { httpAgent, httpsAgent } = (0, node_agents_1.buildNodeAgents)(proxy, ssrf, redirectAgentOptions);
|
|
78
85
|
redirectedRequest.agent = redirectedRequest.href.startsWith('https://')
|
|
79
86
|
? httpsAgent
|
|
80
87
|
: httpAgent;
|
|
@@ -227,16 +234,17 @@ function buildTargetUrl(url, baseURL) {
|
|
|
227
234
|
return undefined;
|
|
228
235
|
}
|
|
229
236
|
}
|
|
230
|
-
function setAxiosAgents(config, agentOptions, proxyConfig,
|
|
237
|
+
function setAxiosAgents(config, agentOptions, proxyConfig, ssrf = 'disabled') {
|
|
231
238
|
if (config.httpAgent || config.httpsAgent)
|
|
232
239
|
return;
|
|
233
|
-
const customProxyUrl = getUrlFromProxyConfig(proxyConfig);
|
|
234
240
|
const targetUrl = buildTargetUrl(config.url, config.baseURL);
|
|
235
241
|
if (!targetUrl)
|
|
236
242
|
return;
|
|
237
|
-
const
|
|
238
|
-
|
|
239
|
-
|
|
243
|
+
const customProxyUrl = proxyConfig ? getUrlFromProxyConfig(proxyConfig) : null;
|
|
244
|
+
const proxy = resolveProxyOption(customProxyUrl);
|
|
245
|
+
const { httpAgent, httpsAgent } = (0, node_agents_1.buildNodeAgents)(proxy, ssrf, agentOptions);
|
|
246
|
+
config.httpAgent = httpAgent;
|
|
247
|
+
config.httpsAgent = httpsAgent;
|
|
240
248
|
}
|
|
241
249
|
async function validateUrlSsrf(url, ssrfBridge) {
|
|
242
250
|
if (!ssrfBridge || !url)
|
|
@@ -254,4 +262,4 @@ function resolveLegacyRequestUrl(requestObject) {
|
|
|
254
262
|
const baseURL = requestObject.baseURL?.toString();
|
|
255
263
|
return buildTargetUrl(rawUrl, baseURL) ?? rawUrl;
|
|
256
264
|
}
|
|
257
|
-
//# sourceMappingURL=
|
|
265
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/http/axios/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import http from 'node:http';
|
|
2
|
+
import type { LookupFunction } from 'node:net';
|
|
3
|
+
import type { NodeAgentOptions } from './node-agents';
|
|
4
|
+
export declare class EnvProxyHttpAgent extends http.Agent {
|
|
5
|
+
private readonly router;
|
|
6
|
+
constructor(lookup?: LookupFunction, agentOptions?: NodeAgentOptions);
|
|
7
|
+
addRequest(req: http.ClientRequest, options: http.RequestOptions): void;
|
|
8
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
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.EnvProxyHttpAgent = void 0;
|
|
7
|
+
const http_proxy_agent_1 = require("http-proxy-agent");
|
|
8
|
+
const node_http_1 = __importDefault(require("node:http"));
|
|
9
|
+
const env_proxy_router_1 = require("./env-proxy-router");
|
|
10
|
+
class EnvProxyHttpAgent extends node_http_1.default.Agent {
|
|
11
|
+
constructor(lookup, agentOptions) {
|
|
12
|
+
super({ ...agentOptions, lookup });
|
|
13
|
+
this.router = new env_proxy_router_1.EnvProxyRouter('http', 80, (proxyUrl) => new http_proxy_agent_1.HttpProxyAgent(proxyUrl, { ...agentOptions }));
|
|
14
|
+
}
|
|
15
|
+
addRequest(req, options) {
|
|
16
|
+
const proxyAgent = this.router.resolve(options);
|
|
17
|
+
if (proxyAgent) {
|
|
18
|
+
return proxyAgent.addRequest(req, options);
|
|
19
|
+
}
|
|
20
|
+
super.addRequest(req, options);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.EnvProxyHttpAgent = EnvProxyHttpAgent;
|
|
24
|
+
//# sourceMappingURL=env-proxy-http-agent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-proxy-http-agent.js","sourceRoot":"","sources":["../../src/http/env-proxy-http-agent.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAkD;AAClD,0DAA6B;AAG7B,yDAAoD;AAepD,MAAa,iBAAkB,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,CAC/B,MAAM,EACN,EAAE,EACF,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,iCAAc,CAAC,QAAQ,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC,CAC/D,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;AAtBD,8CAsBC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type http from 'node:http';
|
|
2
|
+
import https from 'node:https';
|
|
3
|
+
import type { LookupFunction } from 'node:net';
|
|
4
|
+
import type { NodeAgentOptions } from './node-agents';
|
|
5
|
+
export declare class EnvProxyHttpsAgent extends https.Agent {
|
|
6
|
+
private readonly router;
|
|
7
|
+
constructor(lookup?: LookupFunction, agentOptions?: NodeAgentOptions);
|
|
8
|
+
addRequest(req: http.ClientRequest, options: https.RequestOptions): void;
|
|
9
|
+
}
|
|
@@ -0,0 +1,24 @@
|
|
|
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.EnvProxyHttpsAgent = void 0;
|
|
7
|
+
const https_proxy_agent_1 = require("https-proxy-agent");
|
|
8
|
+
const node_https_1 = __importDefault(require("node:https"));
|
|
9
|
+
const env_proxy_router_1 = require("./env-proxy-router");
|
|
10
|
+
class EnvProxyHttpsAgent extends node_https_1.default.Agent {
|
|
11
|
+
constructor(lookup, agentOptions) {
|
|
12
|
+
super({ ...agentOptions, lookup });
|
|
13
|
+
this.router = new env_proxy_router_1.EnvProxyRouter('https', 443, (proxyUrl) => new https_proxy_agent_1.HttpsProxyAgent(proxyUrl, { ...agentOptions }));
|
|
14
|
+
}
|
|
15
|
+
addRequest(req, options) {
|
|
16
|
+
const proxyAgent = this.router.resolve(options);
|
|
17
|
+
if (proxyAgent) {
|
|
18
|
+
return proxyAgent.addRequest(req, options);
|
|
19
|
+
}
|
|
20
|
+
super.addRequest(req, options);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
exports.EnvProxyHttpsAgent = EnvProxyHttpsAgent;
|
|
24
|
+
//# sourceMappingURL=env-proxy-https-agent.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"env-proxy-https-agent.js","sourceRoot":"","sources":["../../src/http/env-proxy-https-agent.ts"],"names":[],"mappings":";;;;;;AAAA,yDAAoD;AAEpD,4DAA+B;AAG/B,yDAAoD;AAQpD,MAAa,kBAAmB,SAAQ,oBAAK,CAAC,KAAK;IAGlD,YAAY,MAAuB,EAAE,YAA+B;QACnE,KAAK,CAAC,EAAE,GAAG,YAAY,EAAE,MAAM,EAAE,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,GAAG,IAAI,iCAAc,CAC/B,OAAO,EACP,GAAG,EACH,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,mCAAe,CAAC,QAAQ,EAAE,EAAE,GAAG,YAAY,EAAE,CAAC,CAChE,CAAC;IACH,CAAC;IAED,UAAU,CAAC,GAAuB,EAAE,OAA6B;QAChE,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAEhD,IAAI,UAAU,EAAE,CAAC;YAChB,OAAO,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,OAA4B,CAAC,CAAC;QACjE,CAAC;QAGD,KAAK,CAAC,UAAU,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAChC,CAAC;CACD;AAtBD,gDAsBC"}
|