n8n 2.2.2 → 2.2.4
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/oauth/oauth.service.d.ts +8 -4
- package/dist/oauth/oauth.service.js +20 -17
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/oauth/types.d.ts +2 -1
- package/dist/oauth/types.js.map +1 -1
- package/dist/utils/cors.util.d.ts +2 -0
- package/dist/utils/cors.util.js +18 -0
- package/dist/utils/cors.util.js.map +1 -0
- package/dist/webhooks/waiting-forms.js +3 -3
- package/dist/webhooks/waiting-forms.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.js +2 -0
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/package.json +9 -9
|
@@ -35,13 +35,17 @@ export declare class OauthService {
|
|
|
35
35
|
protected applyDefaultsAndOverwrites<T>(credential: ICredentialsDb, decryptedData: ICredentialDataDecryptedObject, additionalData: IWorkflowExecuteAdditionalData): Promise<T>;
|
|
36
36
|
encryptAndSaveData(credential: ICredentialsDb, toUpdate: ICredentialDataDecryptedObject, toDelete?: string[]): Promise<void>;
|
|
37
37
|
protected getCredentialWithoutUser(credentialId: string): Promise<CredentialsEntity | null>;
|
|
38
|
-
createCsrfState(data: CreateCsrfStateData): [string, string
|
|
39
|
-
|
|
40
|
-
protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfState;
|
|
38
|
+
createCsrfState(data: CreateCsrfStateData): [string, string];
|
|
39
|
+
protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfState & CreateCsrfStateData;
|
|
41
40
|
protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject & {
|
|
42
41
|
csrfSecret?: string;
|
|
43
42
|
}, state: CsrfState): boolean;
|
|
44
|
-
resolveCredential<T>(req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback): Promise<[
|
|
43
|
+
resolveCredential<T>(req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback): Promise<[
|
|
44
|
+
CredentialsEntity,
|
|
45
|
+
ICredentialDataDecryptedObject,
|
|
46
|
+
T,
|
|
47
|
+
CsrfState & CreateCsrfStateData
|
|
48
|
+
]>;
|
|
45
49
|
renderCallbackError(res: Response, message: string, reason?: string): void;
|
|
46
50
|
getOAuthCredentials<T>(credential: CredentialsEntity): Promise<T>;
|
|
47
51
|
generateAOauth2AuthUri(credential: CredentialsEntity, csrfData: CreateCsrfStateData): Promise<string>;
|
|
@@ -139,32 +139,36 @@ let OauthService = class OauthService {
|
|
|
139
139
|
const state = {
|
|
140
140
|
token: token.create(csrfSecret),
|
|
141
141
|
createdAt: Date.now(),
|
|
142
|
-
|
|
142
|
+
data: this.cipher.encrypt(JSON.stringify(data)),
|
|
143
143
|
};
|
|
144
144
|
const base64State = Buffer.from(JSON.stringify(state)).toString('base64');
|
|
145
|
-
|
|
146
|
-
return [csrfSecret, encryptedState, base64State];
|
|
147
|
-
}
|
|
148
|
-
encryptBase64EncodedState(base64EncodedState) {
|
|
149
|
-
const state = Buffer.from(base64EncodedState, 'base64').toString();
|
|
150
|
-
return this.cipher.encrypt(state);
|
|
145
|
+
return [csrfSecret, base64State];
|
|
151
146
|
}
|
|
152
147
|
decodeCsrfState(encodedState, req) {
|
|
153
148
|
const errorMessage = 'Invalid state format';
|
|
154
|
-
const
|
|
155
|
-
const decoded = (0, n8n_workflow_1.jsonParse)(
|
|
149
|
+
const decodedState = Buffer.from(encodedState, 'base64').toString();
|
|
150
|
+
const decoded = (0, n8n_workflow_1.jsonParse)(decodedState, {
|
|
151
|
+
errorMessage,
|
|
152
|
+
});
|
|
153
|
+
const decryptedState = (0, n8n_workflow_1.jsonParse)(this.cipher.decrypt(decoded.data), {
|
|
156
154
|
errorMessage,
|
|
157
155
|
});
|
|
158
|
-
if (typeof
|
|
156
|
+
if (typeof decryptedState.cid !== 'string' || typeof decoded.token !== 'string') {
|
|
159
157
|
throw new n8n_workflow_1.UnexpectedError(errorMessage);
|
|
160
158
|
}
|
|
161
|
-
if (
|
|
162
|
-
return
|
|
159
|
+
if (decryptedState.origin === 'dynamic-credential') {
|
|
160
|
+
return {
|
|
161
|
+
...decoded,
|
|
162
|
+
...decryptedState,
|
|
163
|
+
};
|
|
163
164
|
}
|
|
164
|
-
if (!exports.skipAuthOnOAuthCallback &&
|
|
165
|
+
if (!exports.skipAuthOnOAuthCallback && decryptedState.userId !== req.user?.id) {
|
|
165
166
|
throw new auth_error_1.AuthError('Unauthorized');
|
|
166
167
|
}
|
|
167
|
-
return
|
|
168
|
+
return {
|
|
169
|
+
...decoded,
|
|
170
|
+
...decryptedState,
|
|
171
|
+
};
|
|
168
172
|
}
|
|
169
173
|
verifyCsrfState(decrypted, state) {
|
|
170
174
|
const token = new csrf_1.default();
|
|
@@ -252,16 +256,15 @@ let OauthService = class OauthService {
|
|
|
252
256
|
toUpdate.clientSecret = client_secret;
|
|
253
257
|
}
|
|
254
258
|
}
|
|
255
|
-
const [csrfSecret,
|
|
259
|
+
const [csrfSecret, state] = this.createCsrfState(csrfData);
|
|
256
260
|
const oAuthOptions = {
|
|
257
261
|
...this.convertCredentialToOptions(oauthCredentials),
|
|
258
|
-
state
|
|
262
|
+
state,
|
|
259
263
|
};
|
|
260
264
|
if (oauthCredentials.authQueryParameters) {
|
|
261
265
|
oAuthOptions.query = qs.parse(oauthCredentials.authQueryParameters);
|
|
262
266
|
}
|
|
263
267
|
await this.externalHooks.run('oauth2.authenticate', [oAuthOptions]);
|
|
264
|
-
oAuthOptions.state = this.encryptBase64EncodedState(oAuthOptions.state);
|
|
265
268
|
toUpdate.csrfSecret = csrfSecret;
|
|
266
269
|
if (oauthCredentials.grantType === 'pkce') {
|
|
267
270
|
const { code_verifier, code_challenge } = await (0, pkce_challenge_1.default)();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
package/dist/oauth/types.d.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
export type CsrfStateRequired = {
|
|
2
2
|
token: string;
|
|
3
3
|
createdAt: number;
|
|
4
|
+
data: string;
|
|
4
5
|
};
|
|
5
6
|
export type CreateCsrfStateData = {
|
|
6
7
|
cid: string;
|
|
7
8
|
origin: 'static-credential' | 'dynamic-credential';
|
|
8
9
|
[key: string]: unknown;
|
|
9
10
|
};
|
|
10
|
-
export type CsrfState = CsrfStateRequired
|
|
11
|
+
export type CsrfState = CsrfStateRequired;
|
|
11
12
|
export declare const MAX_CSRF_AGE: number;
|
|
12
13
|
export declare const enum OauthVersion {
|
|
13
14
|
V1 = 1,
|
package/dist/oauth/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AAmBzB,QAAA,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAE5D,IAAkB,YAGjB;AAHD,WAAkB,YAAY;IAC7B,2CAAM,CAAA;IACN,2CAAM,CAAA;AACP,CAAC,EAHiB,YAAY,4BAAZ,YAAY,QAG7B;AAWY,QAAA,YAAY,GAAG;IAC3B,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.applyCors = applyCors;
|
|
4
|
+
function applyCors(req, res) {
|
|
5
|
+
if (res.getHeader('Access-Control-Allow-Origin')) {
|
|
6
|
+
return;
|
|
7
|
+
}
|
|
8
|
+
const origin = req.headers.origin;
|
|
9
|
+
if (!origin || origin === 'null') {
|
|
10
|
+
res.setHeader('Access-Control-Allow-Origin', '*');
|
|
11
|
+
}
|
|
12
|
+
else {
|
|
13
|
+
res.setHeader('Access-Control-Allow-Origin', origin);
|
|
14
|
+
}
|
|
15
|
+
res.setHeader('Access-Control-Allow-Methods', 'POST, GET, OPTIONS');
|
|
16
|
+
res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
|
|
17
|
+
}
|
|
18
|
+
//# sourceMappingURL=cors.util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cors.util.js","sourceRoot":"","sources":["../../src/utils/cors.util.ts"],"names":[],"mappings":";;AAEA,8BAeC;AAfD,SAAgB,SAAS,CAAC,GAAY,EAAE,GAAa;IACpD,IAAI,GAAG,CAAC,SAAS,CAAC,6BAA6B,CAAC,EAAE,CAAC;QAClD,OAAO;IACR,CAAC;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;IAElC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QAClC,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACP,GAAG,CAAC,SAAS,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,oBAAoB,CAAC,CAAC;IACpE,GAAG,CAAC,SAAS,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;AAC/D,CAAC"}
|
|
@@ -15,6 +15,7 @@ const execution_utils_1 = require("../executions/execution.utils");
|
|
|
15
15
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
16
16
|
const waiting_webhooks_1 = require("../webhooks/waiting-webhooks");
|
|
17
17
|
const webhook_request_sanitizer_1 = require("./webhook-request-sanitizer");
|
|
18
|
+
const cors_util_1 = require("../utils/cors.util");
|
|
18
19
|
let WaitingForms = class WaitingForms extends waiting_webhooks_1.WaitingWebhooks {
|
|
19
20
|
constructor() {
|
|
20
21
|
super(...arguments);
|
|
@@ -76,9 +77,7 @@ let WaitingForms = class WaitingForms extends waiting_webhooks_1.WaitingWebhooks
|
|
|
76
77
|
status = 'form-waiting';
|
|
77
78
|
}
|
|
78
79
|
}
|
|
79
|
-
|
|
80
|
-
res.header('Access-Control-Allow-Origin', req.headers.origin);
|
|
81
|
-
}
|
|
80
|
+
(0, cors_util_1.applyCors)(req, res);
|
|
82
81
|
res.send(status);
|
|
83
82
|
return { noWebhookResponse: true };
|
|
84
83
|
}
|
|
@@ -112,6 +111,7 @@ let WaitingForms = class WaitingForms extends waiting_webhooks_1.WaitingWebhooks
|
|
|
112
111
|
lastNodeExecuted = completionPage;
|
|
113
112
|
}
|
|
114
113
|
}
|
|
114
|
+
(0, cors_util_1.applyCors)(req, res);
|
|
115
115
|
return await this.getWebhookExecutionData({
|
|
116
116
|
execution,
|
|
117
117
|
req,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waiting-forms.js","sourceRoot":"","sources":["../../src/webhooks/waiting-forms.ts"],"names":[],"mappings":";;;;;;;;;AACA,gCAAkC;AAGlC,uCAAgD;AAChD,+CAKsB;AAEtB,4EAAwE;AACxE,kEAAuF;AACvF,8EAAyE;AACzE,kEAA8D;AAE9D,2EAAqE;
|
|
1
|
+
{"version":3,"file":"waiting-forms.js","sourceRoot":"","sources":["../../src/webhooks/waiting-forms.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,6 +60,7 @@ const execution_utils_1 = require("../executions/execution.utils");
|
|
|
60
60
|
const node_types_1 = require("../node-types");
|
|
61
61
|
const WebhookHelpers = __importStar(require("../webhooks/webhook-helpers"));
|
|
62
62
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
63
|
+
const cors_util_1 = require("../utils/cors.util");
|
|
63
64
|
let WaitingWebhooks = class WaitingWebhooks {
|
|
64
65
|
constructor(logger, nodeTypes, executionRepository, webhookService, instanceSettings) {
|
|
65
66
|
this.logger = logger;
|
|
@@ -151,6 +152,7 @@ let WaitingWebhooks = class WaitingWebhooks {
|
|
|
151
152
|
}
|
|
152
153
|
}
|
|
153
154
|
const lastNodeExecuted = execution.data.resultData.lastNodeExecuted;
|
|
155
|
+
(0, cors_util_1.applyCors)(req, res);
|
|
154
156
|
return await this.getWebhookExecutionData({
|
|
155
157
|
execution,
|
|
156
158
|
req,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waiting-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/waiting-webhooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAA8C;AAC9C,gCAAkC;AAClC,oDAA4B;AAE5B,uCAKkB;AAClB,+CAOsB;AAEtB,2EAAqE;AACrE,uDAAmD;AAOnD,4EAAwE;AACxE,8EAAyE;AACzE,kEAAuF;AACvF,6CAAyC;AACzC,2EAA6D;AAC7D,kGAAoF;
|
|
1
|
+
{"version":3,"file":"waiting-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/waiting-webhooks.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "n8n",
|
|
3
|
-
"version": "2.2.
|
|
3
|
+
"version": "2.2.4",
|
|
4
4
|
"description": "n8n Workflow Automation Tool",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
"openapi-types": "^12.1.3",
|
|
59
59
|
"ts-essentials": "^7.0.3",
|
|
60
60
|
"@n8n/typescript-config": "1.3.0",
|
|
61
|
-
"@n8n/backend-test-utils": "1.2.
|
|
61
|
+
"@n8n/backend-test-utils": "1.2.3"
|
|
62
62
|
},
|
|
63
63
|
"dependencies": {
|
|
64
64
|
"@aws-sdk/client-secrets-manager": "3.808.0",
|
|
@@ -144,21 +144,21 @@
|
|
|
144
144
|
"yargs-parser": "21.1.1",
|
|
145
145
|
"zod": "3.25.67",
|
|
146
146
|
"@n8n/ai-workflow-builder": "1.2.2",
|
|
147
|
-
"@n8n/api-types": "1.2.2",
|
|
148
|
-
"@n8n/client-oauth2": "1.0.0-rc.0",
|
|
149
147
|
"@n8n/backend-common": "1.2.2",
|
|
148
|
+
"@n8n/client-oauth2": "1.0.0-rc.0",
|
|
149
|
+
"@n8n/config": "2.1.0",
|
|
150
|
+
"@n8n/api-types": "1.2.2",
|
|
150
151
|
"@n8n/constants": "0.15.0",
|
|
151
|
-
"@n8n/db": "1.2.
|
|
152
|
+
"@n8n/db": "1.2.3",
|
|
152
153
|
"@n8n/decorators": "1.2.2",
|
|
153
|
-
"@n8n/config": "2.1.0",
|
|
154
|
-
"@n8n/errors": "0.5.0",
|
|
155
154
|
"@n8n/di": "0.10.0",
|
|
155
|
+
"@n8n/errors": "0.5.0",
|
|
156
156
|
"@n8n/n8n-nodes-langchain": "2.2.2",
|
|
157
157
|
"@n8n/permissions": "0.45.0",
|
|
158
|
-
"@n8n/task-runner": "2.2.2",
|
|
159
158
|
"@n8n/utils": "1.21.0",
|
|
160
159
|
"n8n-core": "2.2.2",
|
|
161
|
-
"n8n-editor-ui": "2.2.
|
|
160
|
+
"n8n-editor-ui": "2.2.3",
|
|
161
|
+
"@n8n/task-runner": "2.2.2",
|
|
162
162
|
"n8n-nodes-base": "2.2.2",
|
|
163
163
|
"n8n-workflow": "2.2.2"
|
|
164
164
|
},
|