n8n-core 2.19.0 → 2.20.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/credentials.d.ts +3 -3
- package/dist/credentials.js +10 -8
- package/dist/credentials.js.map +1 -1
- package/dist/encryption/cipher.d.ts +3 -0
- package/dist/encryption/cipher.js +13 -3
- package/dist/encryption/cipher.js.map +1 -1
- package/dist/errors/error-reporter.js +3 -0
- package/dist/errors/error-reporter.js.map +1 -1
- package/dist/execution-engine/active-workflows.js +2 -1
- package/dist/execution-engine/active-workflows.js.map +1 -1
- package/dist/execution-engine/execution-context.d.ts +1 -1
- package/dist/execution-engine/execution-context.js.map +1 -1
- package/dist/execution-engine/execution-context.service.d.ts +2 -2
- package/dist/execution-engine/execution-context.service.js +6 -6
- package/dist/execution-engine/execution-context.service.js.map +1 -1
- package/dist/execution-engine/index.d.ts +5 -1
- package/dist/execution-engine/index.js +3 -1
- package/dist/execution-engine/index.js.map +1 -1
- package/dist/execution-engine/node-execution-context/utils/request-helper-functions.js +39 -19
- package/dist/execution-engine/node-execution-context/utils/request-helper-functions.js.map +1 -1
- package/dist/execution-engine/routing-node.js +10 -0
- package/dist/execution-engine/routing-node.js.map +1 -1
- package/dist/utils/assertions.d.ts +1 -1
- package/dist/utils/assertions.js +1 -1
- package/dist/utils/assertions.js.map +1 -1
- package/package.json +12 -12
package/dist/credentials.d.ts
CHANGED
|
@@ -5,8 +5,8 @@ export declare class CredentialDataError extends ApplicationError {
|
|
|
5
5
|
}
|
|
6
6
|
export declare class Credentials<T extends object = ICredentialDataDecryptedObject> extends ICredentials<T> {
|
|
7
7
|
private readonly cipher;
|
|
8
|
-
setData(data: T): void
|
|
9
|
-
updateData(toUpdate: Partial<T>, toDelete?: Array<keyof T>): void
|
|
10
|
-
getData(): T
|
|
8
|
+
setData(data: T): Promise<void>;
|
|
9
|
+
updateData(toUpdate: Partial<T>, toDelete?: Array<keyof T>): Promise<void>;
|
|
10
|
+
getData(): Promise<T>;
|
|
11
11
|
getDataToSave(): ICredentialsEncrypted;
|
|
12
12
|
}
|
package/dist/credentials.js
CHANGED
|
@@ -54,34 +54,36 @@ class Credentials extends n8n_workflow_1.ICredentials {
|
|
|
54
54
|
super(...arguments);
|
|
55
55
|
this.cipher = di_1.Container.get(cipher_1.Cipher);
|
|
56
56
|
}
|
|
57
|
-
setData(data) {
|
|
57
|
+
async setData(data) {
|
|
58
58
|
a.ok((0, backend_common_1.isObjectLiteral)(data));
|
|
59
|
-
this.data = this.cipher.
|
|
59
|
+
this.data = await this.cipher.encryptV2(data);
|
|
60
60
|
}
|
|
61
|
-
updateData(toUpdate, toDelete = []) {
|
|
62
|
-
const updatedData = { ...this.getData(), ...toUpdate };
|
|
61
|
+
async updateData(toUpdate, toDelete = []) {
|
|
62
|
+
const updatedData = { ...(await this.getData()), ...toUpdate };
|
|
63
63
|
for (const key of toDelete) {
|
|
64
64
|
delete updatedData[key];
|
|
65
65
|
}
|
|
66
|
-
this.setData(updatedData);
|
|
66
|
+
await this.setData(updatedData);
|
|
67
67
|
}
|
|
68
|
-
getData() {
|
|
68
|
+
async getData() {
|
|
69
69
|
if (this.data === undefined) {
|
|
70
70
|
throw new CredentialDataError(this, constants_1.CREDENTIAL_ERRORS.NO_DATA);
|
|
71
71
|
}
|
|
72
72
|
let decryptedData;
|
|
73
73
|
try {
|
|
74
|
-
decryptedData = this.cipher.
|
|
74
|
+
decryptedData = await this.cipher.decryptV2(this.data);
|
|
75
75
|
}
|
|
76
76
|
catch (cause) {
|
|
77
77
|
throw new CredentialDataError(this, constants_1.CREDENTIAL_ERRORS.DECRYPTION_FAILED, cause);
|
|
78
78
|
}
|
|
79
|
+
let parsed;
|
|
79
80
|
try {
|
|
80
|
-
|
|
81
|
+
parsed = (0, n8n_workflow_1.jsonParse)(decryptedData);
|
|
81
82
|
}
|
|
82
83
|
catch (cause) {
|
|
83
84
|
throw new CredentialDataError(this, constants_1.CREDENTIAL_ERRORS.INVALID_JSON, cause);
|
|
84
85
|
}
|
|
86
|
+
return parsed;
|
|
85
87
|
}
|
|
86
88
|
getDataToSave() {
|
|
87
89
|
if (this.data === undefined) {
|
package/dist/credentials.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAsD;AACtD,gCAAoC;AAEpC,+CAAyE;AACzE,+CAAiC;AAEjC,2CAAgD;AAChD,gDAA6C;AAE7C,MAAa,mBAAoB,SAAQ,+BAAgB;IACxD,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAuB,EAAE,OAAe,EAAE,KAAe;QACpF,KAAK,CAAC,OAAO,EAAE;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACzB,KAAK;SACL,CAAC,CAAC;IACJ,CAAC;CACD;AAPD,kDAOC;AAED,MAAa,WAEX,SAAQ,2BAAe;IAFzB;;QAGkB,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../src/credentials.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAsD;AACtD,gCAAoC;AAEpC,+CAAyE;AACzE,+CAAiC;AAEjC,2CAAgD;AAChD,gDAA6C;AAE7C,MAAa,mBAAoB,SAAQ,+BAAgB;IACxD,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAuB,EAAE,OAAe,EAAE,KAAe;QACpF,KAAK,CAAC,OAAO,EAAE;YACd,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACzB,KAAK;SACL,CAAC,CAAC;IACJ,CAAC;CACD;AAPD,kDAOC;AAED,MAAa,WAEX,SAAQ,2BAAe;IAFzB;;QAGkB,WAAM,GAAG,cAAS,CAAC,GAAG,CAAC,eAAM,CAAC,CAAC;IA8DjD,CAAC;IAzDA,KAAK,CAAC,OAAO,CAAC,IAAO;QACpB,CAAC,CAAC,EAAE,CAAC,IAAA,gCAAe,EAAC,IAAI,CAAC,CAAC,CAAC;QAE5B,IAAI,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAMD,KAAK,CAAC,UAAU,CAAC,QAAoB,EAAE,WAA2B,EAAE;QACnE,MAAM,WAAW,GAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC;QAClE,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;YAC5B,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;IAKD,KAAK,CAAC,OAAO;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,6BAAiB,CAAC,OAAO,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,aAAqB,CAAC;QAC1B,IAAI,CAAC;YACJ,aAAa,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,6BAAiB,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;QACjF,CAAC;QAED,IAAI,MAAS,CAAC;QACd,IAAI,CAAC;YACJ,MAAM,GAAG,IAAA,wBAAS,EAAC,aAAa,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mBAAmB,CAAC,IAAI,EAAE,6BAAiB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC5E,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAKD,aAAa;QACZ,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,IAAI,+BAAgB,CAAC,kCAAkC,CAAC,CAAC;QAChE,CAAC;QAED,OAAO;YACN,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,IAAI,CAAC,IAAI;SACf,CAAC;IACH,CAAC;CACD;AAjED,kCAiEC"}
|
|
@@ -15,6 +15,9 @@ export declare class Cipher {
|
|
|
15
15
|
decryptV2(data: string, customEncryptionKey?: string): Promise<string>;
|
|
16
16
|
encryptWithInstanceKey(data: string | object): string;
|
|
17
17
|
decryptWithInstanceKey(data: string): string;
|
|
18
|
+
encryptDEKWithInstanceKey(data: string): string;
|
|
19
|
+
decryptDEKWithInstanceKey(data: string): string;
|
|
20
|
+
private get dekWrappingKey();
|
|
18
21
|
encryptWithKey(data: string, key: string, algorithm: CipherAlgorithm): string;
|
|
19
22
|
decryptWithKey(data: string, key: string, algorithm: CipherAlgorithm): string;
|
|
20
23
|
}
|
|
@@ -11,6 +11,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.Cipher = void 0;
|
|
13
13
|
const di_1 = require("@n8n/di");
|
|
14
|
+
const crypto_1 = require("crypto");
|
|
14
15
|
const instance_settings_1 = require("../instance-settings");
|
|
15
16
|
const assertions_1 = require("../utils/assertions");
|
|
16
17
|
const aes_256_cbc_1 = require("./aes-256-cbc");
|
|
@@ -38,7 +39,7 @@ let Cipher = class Cipher {
|
|
|
38
39
|
this.encryptionKeyProxy.isConfigured() &&
|
|
39
40
|
process.env.N8N_ENV_FEAT_ENCRYPTION_KEY_ROTATION === 'true') {
|
|
40
41
|
const keyInfo = await this.encryptionKeyProxy.getActiveKey();
|
|
41
|
-
const plaintextKey = this.
|
|
42
|
+
const plaintextKey = this.decryptDEKWithInstanceKey(keyInfo.value);
|
|
42
43
|
const ciphertext = this.encryptWithKey(plaintext, plaintextKey, keyInfo.algorithm);
|
|
43
44
|
return `${keyInfo.id}:${ciphertext}`;
|
|
44
45
|
}
|
|
@@ -56,11 +57,11 @@ let Cipher = class Cipher {
|
|
|
56
57
|
const keyInfo = await this.encryptionKeyProxy.getKeyById(keyId);
|
|
57
58
|
if (!keyInfo)
|
|
58
59
|
throw new Error(`Encryption key not found: ${keyId}`);
|
|
59
|
-
const plaintextKey = this.
|
|
60
|
+
const plaintextKey = this.decryptDEKWithInstanceKey(keyInfo.value);
|
|
60
61
|
return this.decryptWithKey(ciphertext, plaintextKey, keyInfo.algorithm);
|
|
61
62
|
}
|
|
62
63
|
const keyInfo = await this.encryptionKeyProxy.getLegacyKey();
|
|
63
|
-
const plaintextKey = this.
|
|
64
|
+
const plaintextKey = this.decryptDEKWithInstanceKey(keyInfo.value);
|
|
64
65
|
return this.decryptWithKey(data, plaintextKey, keyInfo.algorithm);
|
|
65
66
|
}
|
|
66
67
|
const key = customEncryptionKey ?? this.instanceSettings.encryptionKey;
|
|
@@ -73,6 +74,15 @@ let Cipher = class Cipher {
|
|
|
73
74
|
decryptWithInstanceKey(data) {
|
|
74
75
|
return this.decryptWithKey(data, this.instanceSettings.encryptionKey, 'aes-256-cbc');
|
|
75
76
|
}
|
|
77
|
+
encryptDEKWithInstanceKey(data) {
|
|
78
|
+
return this.encryptWithKey(data, this.dekWrappingKey, 'aes-256-gcm');
|
|
79
|
+
}
|
|
80
|
+
decryptDEKWithInstanceKey(data) {
|
|
81
|
+
return this.decryptWithKey(data, this.dekWrappingKey, 'aes-256-gcm');
|
|
82
|
+
}
|
|
83
|
+
get dekWrappingKey() {
|
|
84
|
+
return (0, crypto_1.createHash)('sha256').update(this.instanceSettings.encryptionKey).digest('hex');
|
|
85
|
+
}
|
|
76
86
|
encryptWithKey(data, key, algorithm) {
|
|
77
87
|
switch (algorithm) {
|
|
78
88
|
case 'aes-256-cbc':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cipher.js","sourceRoot":"","sources":["../../src/encryption/cipher.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;
|
|
1
|
+
{"version":3,"file":"cipher.js","sourceRoot":"","sources":["../../src/encryption/cipher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"error-reporter.js","sourceRoot":"","sources":["../../src/errors/error-reporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,8 @@ let ActiveWorkflows = class ActiveWorkflows {
|
|
|
74
74
|
const executeTrigger = this.createPollExecuteFn(workflow, node, pollFunctions);
|
|
75
75
|
await executeTrigger(true);
|
|
76
76
|
for (const expression of cronExpressions) {
|
|
77
|
-
|
|
77
|
+
const fields = expression.split(' ');
|
|
78
|
+
if (fields.length === 6 && fields[0].includes('*')) {
|
|
78
79
|
throw new n8n_workflow_1.UserError('The polling interval is too short. It has to be at least a minute.');
|
|
79
80
|
}
|
|
80
81
|
const ctx = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"active-workflows.js","sourceRoot":"","sources":["../../src/execution-engine/active-workflows.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { type IWorkflowExecuteAdditionalData, type WorkflowExecuteMode, type IRunExecutionData, type Workflow } from 'n8n-workflow';
|
|
2
|
-
export declare const establishExecutionContext: (workflow: Workflow, runExecutionData: IRunExecutionData, additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode) => Promise<void>;
|
|
2
|
+
export declare const establishExecutionContext: (workflow: Workflow, runExecutionData: IRunExecutionData, additionalData: IWorkflowExecuteAdditionalData | undefined, mode: WorkflowExecuteMode) => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-context.js","sourceRoot":"","sources":["../../src/execution-engine/execution-context.ts"],"names":[],"mappings":";;;AAAA,wDAA6C;AAC7C,gCAAoC;AAQpC,mDAA+D;AAE/D,2EAAsE;AAiG/D,MAAM,yBAAyB,GAAG,KAAK,EAC7C,QAAkB,EAClB,gBAAmC,EACnC,
|
|
1
|
+
{"version":3,"file":"execution-context.js","sourceRoot":"","sources":["../../src/execution-engine/execution-context.ts"],"names":[],"mappings":";;;AAAA,wDAA6C;AAC7C,gCAAoC;AAQpC,mDAA+D;AAE/D,2EAAsE;AAiG/D,MAAM,yBAAyB,GAAG,KAAK,EAC7C,QAAkB,EAClB,gBAAmC,EACnC,cAA0D,EAC1D,IAAyB,EACT,EAAE;IAClB,IAAA,sCAAyB,EAAC,gBAAgB,CAAC,aAAa,EAAE,QAAQ,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAE1F,MAAM,aAAa,GAAG,gBAAgB,CAAC,aAAa,CAAC;IAErD,IAAI,aAAa,CAAC,WAAW,EAAE,CAAC;QAG/B,OAAO;IACR,CAAC;IAKD,aAAa,CAAC,WAAW,GAAG;QAC3B,OAAO,EAAE,CAAC;QACV,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE;QACzB,MAAM,EAAE,IAAI;QACZ,SAAS,EAAE;YACV,OAAO,EAAE,CAAC;YACV,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,eAAe,IAAI,MAAM;SACpD;KACD,CAAC;IAEF,IAAI,gBAAgB,CAAC,eAAe,EAAE,CAAC;QAMtC,aAAa,CAAC,WAAW,GAAG;YAC3B,GAAG,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,IAAI,EAAE,CAAC;YAC5D,GAAG,aAAa,CAAC,WAAW;YAC5B,iBAAiB,EAAE,gBAAgB,CAAC,eAAe,CAAC,WAAW;SAC/D,CAAC;QACF,OAAO;IACR,CAAC;IAGD,MAAM,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,kBAAkB,CAAC;IAYrD,IAAI,CAAC,SAAS,EAAE,CAAC;QAChB,OAAO;IACR,CAAC;IAGD,aAAa,CAAC,WAAW,CAAC,WAAW,GAAG;QACvC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;QACzB,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI;KACzB,CAAC;IAIF,IAAI,SAAS,CAAC,QAAQ,EAAE,eAAe,EAAE,gBAAgB,EAAE,CAAC;QAC3D,aAAa,CAAC,WAAW,GAAG;YAC3B,GAAG,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,gBAAgB;YACtD,GAAG,aAAa,CAAC,WAAW;YAC5B,iBAAiB,EAAE,SAAS,CAAC,QAAQ,CAAC,eAAe,CAAC,WAAW;SACjE,CAAC;QACF,OAAO;IACR,CAAC;IAGD,MAAM,uBAAuB,GAAG,cAAS,CAAC,GAAG,CAAC,mDAAuB,CAAC,CAAC;IAEvE,IAAI,CAAC;QACJ,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAC9B,MAAM,uBAAuB,CAAC,gCAAgC,CAC7D,QAAQ,EACR,SAAS,EACT,aAAa,CAAC,WAAW,CACzB,CAAC;QAEH,aAAa,CAAC,WAAW,GAAG,OAAO,CAAC;QAGpC,IAAI,YAAY,EAAE,CAAC;YAClB,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;QAC1C,CAAC;IACF,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEhB,cAAS,CAAC,GAAG,CAAC,uBAAM,CAAC,CAAC,KAAK,CAAC,iDAAiD,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1F,MAAM,KAAK,CAAC;IACb,CAAC;AACF,CAAC,CAAC;AAnGW,QAAA,yBAAyB,6BAmGpC"}
|
|
@@ -7,8 +7,8 @@ export declare class ExecutionContextService {
|
|
|
7
7
|
private readonly executionContextHookRegistry;
|
|
8
8
|
private readonly cipher;
|
|
9
9
|
constructor(logger: Logger, executionContextHookRegistry: ExecutionContextHookRegistry, cipher: Cipher);
|
|
10
|
-
decryptExecutionContext(context: IExecutionContext): PlaintextExecutionContext
|
|
11
|
-
encryptExecutionContext(context: PlaintextExecutionContext): IExecutionContext
|
|
10
|
+
decryptExecutionContext(context: IExecutionContext): Promise<PlaintextExecutionContext>;
|
|
11
|
+
encryptExecutionContext(context: PlaintextExecutionContext): Promise<IExecutionContext>;
|
|
12
12
|
mergeExecutionContexts(baseContext: PlaintextExecutionContext, contextToMerge: Partial<PlaintextExecutionContext>): PlaintextExecutionContext;
|
|
13
13
|
augmentExecutionContextWithHooks(workflow: Workflow, startItem: IExecuteData, contextToAugment: IExecutionContext): Promise<{
|
|
14
14
|
context: IExecutionContext;
|
|
@@ -22,10 +22,10 @@ let ExecutionContextService = class ExecutionContextService {
|
|
|
22
22
|
this.executionContextHookRegistry = executionContextHookRegistry;
|
|
23
23
|
this.cipher = cipher;
|
|
24
24
|
}
|
|
25
|
-
decryptExecutionContext(context) {
|
|
25
|
+
async decryptExecutionContext(context) {
|
|
26
26
|
let credentials = undefined;
|
|
27
27
|
if (context.credentials) {
|
|
28
|
-
const decrypted = this.cipher.
|
|
28
|
+
const decrypted = await this.cipher.decryptV2(context.credentials);
|
|
29
29
|
credentials = (0, n8n_workflow_1.toCredentialContext)(decrypted);
|
|
30
30
|
}
|
|
31
31
|
return {
|
|
@@ -33,10 +33,10 @@ let ExecutionContextService = class ExecutionContextService {
|
|
|
33
33
|
credentials,
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
|
-
encryptExecutionContext(context) {
|
|
36
|
+
async encryptExecutionContext(context) {
|
|
37
37
|
let credentials = undefined;
|
|
38
38
|
if (context.credentials) {
|
|
39
|
-
credentials = this.cipher.
|
|
39
|
+
credentials = await this.cipher.encryptV2(context.credentials);
|
|
40
40
|
}
|
|
41
41
|
return {
|
|
42
42
|
...context,
|
|
@@ -63,7 +63,7 @@ let ExecutionContextService = class ExecutionContextService {
|
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
65
|
const startNodeParameters = startNodeParametersResult.data;
|
|
66
|
-
let context = this.decryptExecutionContext(contextToAugment);
|
|
66
|
+
let context = await this.decryptExecutionContext(contextToAugment);
|
|
67
67
|
for (const hookParameters of startNodeParameters.contextEstablishmentHooks.hooks) {
|
|
68
68
|
const hook = this.executionContextHookRegistry.getHookByName(hookParameters.hookName);
|
|
69
69
|
if (!hook) {
|
|
@@ -93,7 +93,7 @@ let ExecutionContextService = class ExecutionContextService {
|
|
|
93
93
|
}
|
|
94
94
|
}
|
|
95
95
|
return {
|
|
96
|
-
context: this.encryptExecutionContext(context),
|
|
96
|
+
context: await this.encryptExecutionContext(context),
|
|
97
97
|
triggerItems: currentTriggerItems,
|
|
98
98
|
};
|
|
99
99
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution-context.service.js","sourceRoot":"","sources":["../../src/execution-engine/execution-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAAkC;AAClC,+CAQsB;AAEtB,6CAAsC;AACtC,mDAA+C;AAE/C,uGAAyF;AAGlF,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IACnC,YACkB,MAAc,EACd,4BAA0D,EAC1D,MAAc;QAFd,WAAM,GAAN,MAAM,CAAQ;QACd,iCAA4B,GAA5B,4BAA4B,CAA8B;QAC1D,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEJ,uBAAuB,CAAC,OAA0B;
|
|
1
|
+
{"version":3,"file":"execution-context.service.js","sourceRoot":"","sources":["../../src/execution-engine/execution-context.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { DataTableProxyProvider, DynamicCredentialCheckProxyProvider, IExecutionContext, IHttpRequestOptions, INode, IWorkflowSettings, Result } from 'n8n-workflow';
|
|
1
|
+
import type { DataTableProxyProvider, DynamicCredentialCheckProxyProvider, IExecutionContext, IHttpRequestOptions, INode, IWorkflowSettings, OauthJweProxyProvider, Result } from 'n8n-workflow';
|
|
2
2
|
import type { LookupFunction } from 'node:net';
|
|
3
3
|
import type { ExecutionLifecycleHooks } from './execution-lifecycle-hooks';
|
|
4
4
|
import type { ExternalSecretsProxy } from './external-secrets-proxy';
|
|
@@ -28,6 +28,9 @@ declare module 'n8n-workflow' {
|
|
|
28
28
|
'dynamic-credentials'?: {
|
|
29
29
|
credentialCheckProxy: DynamicCredentialCheckProxyProvider;
|
|
30
30
|
};
|
|
31
|
+
'oauth-jwe'?: {
|
|
32
|
+
oauthJweProxyProvider: OauthJweProxyProvider;
|
|
33
|
+
};
|
|
31
34
|
dataTableProjectId?: string;
|
|
32
35
|
executionContext?: IExecutionContext;
|
|
33
36
|
workflowSettings?: IWorkflowSettings;
|
|
@@ -44,4 +47,5 @@ export * from './execution-context-hook-registry.service';
|
|
|
44
47
|
export { ExecutionLifecycleHooks } from './execution-lifecycle-hooks';
|
|
45
48
|
export { ExternalSecretsProxy, type IExternalSecretsManager } from './external-secrets-proxy';
|
|
46
49
|
export { ExecutionContextService } from './execution-context.service';
|
|
50
|
+
export { establishExecutionContext } from './execution-context';
|
|
47
51
|
export { isEngineRequest } from './requests-response';
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.isEngineRequest = exports.ExecutionContextService = exports.ExternalSecretsProxy = exports.ExecutionLifecycleHooks = void 0;
|
|
17
|
+
exports.isEngineRequest = exports.establishExecutionContext = exports.ExecutionContextService = exports.ExternalSecretsProxy = exports.ExecutionLifecycleHooks = void 0;
|
|
18
18
|
__exportStar(require("./active-workflows"), exports);
|
|
19
19
|
__exportStar(require("./routing-node"), exports);
|
|
20
20
|
__exportStar(require("./node-execution-context"), exports);
|
|
@@ -28,6 +28,8 @@ var external_secrets_proxy_1 = require("./external-secrets-proxy");
|
|
|
28
28
|
Object.defineProperty(exports, "ExternalSecretsProxy", { enumerable: true, get: function () { return external_secrets_proxy_1.ExternalSecretsProxy; } });
|
|
29
29
|
var execution_context_service_1 = require("./execution-context.service");
|
|
30
30
|
Object.defineProperty(exports, "ExecutionContextService", { enumerable: true, get: function () { return execution_context_service_1.ExecutionContextService; } });
|
|
31
|
+
var execution_context_1 = require("./execution-context");
|
|
32
|
+
Object.defineProperty(exports, "establishExecutionContext", { enumerable: true, get: function () { return execution_context_1.establishExecutionContext; } });
|
|
31
33
|
var requests_response_1 = require("./requests-response");
|
|
32
34
|
Object.defineProperty(exports, "isEngineRequest", { enumerable: true, get: function () { return requests_response_1.isEngineRequest; } });
|
|
33
35
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/execution-engine/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/execution-engine/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAoFA,qDAAmC;AAEnC,iDAA+B;AAC/B,2DAAyC;AACzC,4DAA0C;AAC1C,oFAAkE;AAClE,qDAAmC;AACnC,4EAA0D;AAC1D,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,mEAA8F;AAArF,8HAAA,oBAAoB,OAAA;AAC7B,yEAAsE;AAA7D,oIAAA,uBAAuB,OAAA;AAChC,yDAAgE;AAAvD,8HAAA,yBAAyB,OAAA;AAClC,yDAAsD;AAA7C,oHAAA,eAAe,OAAA"}
|
|
@@ -530,8 +530,25 @@ function createOAuth2Client(credentials) {
|
|
|
530
530
|
}),
|
|
531
531
|
});
|
|
532
532
|
}
|
|
533
|
+
function buildSigningToken(client, tokenData, oAuth2Options) {
|
|
534
|
+
const accessToken = (0, get_1.default)(tokenData, oAuth2Options?.property) || tokenData.accessToken;
|
|
535
|
+
const refreshToken = tokenData.refreshToken;
|
|
536
|
+
return client.createToken({
|
|
537
|
+
...tokenData,
|
|
538
|
+
...(accessToken ? { access_token: accessToken } : {}),
|
|
539
|
+
...(refreshToken ? { refresh_token: refreshToken } : {}),
|
|
540
|
+
}, oAuth2Options?.tokenType || tokenData.tokenType);
|
|
541
|
+
}
|
|
542
|
+
async function decryptOAuth2TokenDataIfConfigured(additionalData, tokenData, jweEnabled) {
|
|
543
|
+
if (!jweEnabled)
|
|
544
|
+
return tokenData;
|
|
545
|
+
const proxy = additionalData['oauth-jwe']?.oauthJweProxyProvider;
|
|
546
|
+
if (!proxy || !tokenData)
|
|
547
|
+
return tokenData;
|
|
548
|
+
return await proxy.decryptOAuth2TokenData(tokenData);
|
|
549
|
+
}
|
|
533
550
|
async function refreshOrFetchToken(ctx) {
|
|
534
|
-
const { credentials, token, credentialsType, node, additionalData, oAuth2Options, logger } = ctx;
|
|
551
|
+
const { credentials, token, credentialsType, node, additionalData, oAuth2Options, logger, helpers, } = ctx;
|
|
535
552
|
const tokenRefreshOptions = {};
|
|
536
553
|
if (oAuth2Options?.includeCredentialsOnRefreshOnBody) {
|
|
537
554
|
const body = {
|
|
@@ -552,7 +569,14 @@ async function refreshOrFetchToken(ctx) {
|
|
|
552
569
|
newToken = await token.refresh(tokenRefreshOptions);
|
|
553
570
|
}
|
|
554
571
|
logger.debug(`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`);
|
|
555
|
-
|
|
572
|
+
const refreshedTokenData = await decryptOAuth2TokenDataIfConfigured(additionalData, newToken.data, credentials.jweEnabled === true);
|
|
573
|
+
credentials.oauthTokenData = refreshedTokenData;
|
|
574
|
+
const preAuthData = await additionalData.credentialsHelper.runPreAuthentication({ helpers }, credentials, credentialsType);
|
|
575
|
+
let signingToken = newToken;
|
|
576
|
+
if (preAuthData) {
|
|
577
|
+
Object.assign(credentials, preAuthData);
|
|
578
|
+
signingToken = buildSigningToken(token.client, credentials.oauthTokenData, oAuth2Options);
|
|
579
|
+
}
|
|
556
580
|
if (!node.credentials?.[credentialsType]) {
|
|
557
581
|
throw new n8n_workflow_1.ApplicationError('Node does not have credential type', {
|
|
558
582
|
extra: { nodeName: node.name, credentialType: credentialsType },
|
|
@@ -560,7 +584,7 @@ async function refreshOrFetchToken(ctx) {
|
|
|
560
584
|
}
|
|
561
585
|
const nodeCredentials = node.credentials[credentialsType];
|
|
562
586
|
await additionalData.credentialsHelper.updateCredentialsOauthTokenData(nodeCredentials, credentialsType, credentials, additionalData);
|
|
563
|
-
return
|
|
587
|
+
return signingToken;
|
|
564
588
|
}
|
|
565
589
|
function resolveTokenExpiredStatusCode(oAuth2Options, credentials) {
|
|
566
590
|
return credentials?.tokenExpiredStatusCode ?? oAuth2Options?.tokenExpiredStatusCode ?? 401;
|
|
@@ -595,17 +619,17 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
|
|
|
595
619
|
});
|
|
596
620
|
}
|
|
597
621
|
const nodeCredentials = node.credentials[credentialsType];
|
|
598
|
-
credentials.
|
|
622
|
+
const initialTokenData = (await decryptOAuth2TokenDataIfConfigured(additionalData, data, credentials.jweEnabled === true));
|
|
623
|
+
credentials.oauthTokenData = initialTokenData;
|
|
599
624
|
await additionalData.credentialsHelper.updateCredentialsOauthTokenData(nodeCredentials, credentialsType, credentials, additionalData);
|
|
600
|
-
oauthTokenData =
|
|
625
|
+
oauthTokenData = initialTokenData;
|
|
601
626
|
}
|
|
602
|
-
const
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
}, oAuth2Options?.tokenType || oauthTokenData.tokenType);
|
|
627
|
+
const preAuthData = await additionalData.credentialsHelper.runPreAuthentication({ helpers: this.helpers }, credentials, credentialsType);
|
|
628
|
+
if (preAuthData) {
|
|
629
|
+
Object.assign(credentials, preAuthData);
|
|
630
|
+
oauthTokenData = credentials.oauthTokenData;
|
|
631
|
+
}
|
|
632
|
+
const token = buildSigningToken(oAuthClient, oauthTokenData, oAuth2Options);
|
|
609
633
|
requestOptions.rejectUnauthorized = !credentials.ignoreSSLIssues;
|
|
610
634
|
const newRequestOptions = token.sign(requestOptions);
|
|
611
635
|
const newRequestHeaders = (newRequestOptions.headers = newRequestOptions.headers ?? {});
|
|
@@ -627,6 +651,7 @@ async function requestOAuth2(credentialsType, requestOptions, node, additionalDa
|
|
|
627
651
|
additionalData,
|
|
628
652
|
oAuth2Options,
|
|
629
653
|
logger: this.logger,
|
|
654
|
+
helpers: this.helpers,
|
|
630
655
|
};
|
|
631
656
|
const retryWithNewToken = async (makeRequest) => {
|
|
632
657
|
const newToken = await refreshOrFetchToken(refreshCtx);
|
|
@@ -724,13 +749,7 @@ async function refreshOAuth2Token(credentialsType, node, additionalData, oAuth2O
|
|
|
724
749
|
}
|
|
725
750
|
const oAuthClient = createOAuth2Client(credentials);
|
|
726
751
|
const oauthTokenData = credentials.oauthTokenData;
|
|
727
|
-
const
|
|
728
|
-
const refreshToken = oauthTokenData.refreshToken;
|
|
729
|
-
const token = oAuthClient.createToken({
|
|
730
|
-
...oauthTokenData,
|
|
731
|
-
...(accessToken ? { access_token: accessToken } : {}),
|
|
732
|
-
...(refreshToken ? { refresh_token: refreshToken } : {}),
|
|
733
|
-
}, oAuth2Options?.tokenType || oauthTokenData.tokenType);
|
|
752
|
+
const token = buildSigningToken(oAuthClient, oauthTokenData, oAuth2Options);
|
|
734
753
|
const newToken = await refreshOrFetchToken({
|
|
735
754
|
credentials,
|
|
736
755
|
token,
|
|
@@ -739,6 +758,7 @@ async function refreshOAuth2Token(credentialsType, node, additionalData, oAuth2O
|
|
|
739
758
|
additionalData,
|
|
740
759
|
oAuth2Options,
|
|
741
760
|
logger: this.logger,
|
|
761
|
+
helpers: this.helpers,
|
|
742
762
|
});
|
|
743
763
|
return newToken.data;
|
|
744
764
|
}
|