n8n 2.35.4 → 2.35.6
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/commands/base-command.d.ts +2 -1
- package/dist/commands/base-command.js +23 -10
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/execute-batch.d.ts +1 -0
- package/dist/commands/execute-batch.js +1 -0
- package/dist/commands/execute-batch.js.map +1 -1
- package/dist/commands/execute.d.ts +1 -0
- package/dist/commands/execute.js +1 -0
- package/dist/commands/execute.js.map +1 -1
- package/dist/commands/import/workflow.d.ts +1 -0
- package/dist/commands/import/workflow.js +4 -0
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/ldap/reset.d.ts +1 -0
- package/dist/commands/ldap/reset.js +4 -0
- package/dist/commands/ldap/reset.js.map +1 -1
- package/dist/commands/start.d.ts +1 -0
- package/dist/commands/start.js +1 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.d.ts +1 -0
- package/dist/commands/webhook.js +1 -0
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.d.ts +1 -0
- package/dist/commands/worker.js +1 -0
- package/dist/commands/worker.js.map +1 -1
- package/dist/controllers/dynamic-node-parameters.controller.d.ts +6 -1
- package/dist/controllers/dynamic-node-parameters.controller.js +21 -2
- package/dist/controllers/dynamic-node-parameters.controller.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.d.ts +34 -0
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.js +19 -6
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/errors/n8n-identity-not-supported.error.d.ts +4 -0
- package/dist/modules/dynamic-credentials.ee/errors/n8n-identity-not-supported.error.js +12 -0
- package/dist/modules/dynamic-credentials.ee/errors/n8n-identity-not-supported.error.js.map +1 -0
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.d.ts +3 -1
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.js +9 -12
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js +11 -0
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js.map +1 -1
- package/dist/services/dynamic-node-parameters.service.d.ts +4 -2
- package/dist/services/dynamic-node-parameters.service.js +17 -3
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker.service.d.ts +3 -0
- package/dist/task-runners/task-broker/task-broker.service.js +45 -7
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/webhooks/test-webhooks.js +15 -8
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/package.json +32 -32
|
@@ -1,10 +1,15 @@
|
|
|
1
1
|
import { OptionsRequestDto, ResourceLocatorRequestDto, ResourceMapperFieldsRequestDto, ActionResultRequestDto } from '@n8n/api-types';
|
|
2
2
|
import { AuthenticatedRequest } from '@n8n/db';
|
|
3
|
+
import { ExecutionContextService } from 'n8n-core';
|
|
3
4
|
import type { INodePropertyOptions, NodeParameterValueType } from 'n8n-workflow';
|
|
5
|
+
import { AuthService } from '../auth/auth.service';
|
|
4
6
|
import { DynamicNodeParametersService } from '../services/dynamic-node-parameters.service';
|
|
5
7
|
export declare class DynamicNodeParametersController {
|
|
6
8
|
private readonly dynamicNodeParametersService;
|
|
7
|
-
|
|
9
|
+
private readonly authService;
|
|
10
|
+
private readonly executionContextService;
|
|
11
|
+
constructor(dynamicNodeParametersService: DynamicNodeParametersService, authService: AuthService, executionContextService: ExecutionContextService);
|
|
12
|
+
private buildExecutionContext;
|
|
8
13
|
getOptions(req: AuthenticatedRequest, _res: Response, payload: OptionsRequestDto): Promise<INodePropertyOptions[]>;
|
|
9
14
|
getResourceLocatorResults(req: AuthenticatedRequest, _res: Response, payload: ResourceLocatorRequestDto): Promise<import("n8n-workflow").INodeListSearchResult>;
|
|
10
15
|
getResourceMappingFields(req: AuthenticatedRequest, _res: Response, payload: ResourceMapperFieldsRequestDto): Promise<import("n8n-workflow").ResourceMapperFields>;
|
|
@@ -15,11 +15,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.DynamicNodeParametersController = void 0;
|
|
16
16
|
const api_types_1 = require("@n8n/api-types");
|
|
17
17
|
const decorators_1 = require("@n8n/decorators");
|
|
18
|
+
const n8n_core_1 = require("n8n-core");
|
|
19
|
+
const auth_service_1 = require("../auth/auth.service");
|
|
18
20
|
const dynamic_node_parameters_service_1 = require("../services/dynamic-node-parameters.service");
|
|
19
21
|
const workflow_execute_additional_data_1 = require("../workflow-execute-additional-data");
|
|
20
22
|
let DynamicNodeParametersController = class DynamicNodeParametersController {
|
|
21
|
-
constructor(dynamicNodeParametersService) {
|
|
23
|
+
constructor(dynamicNodeParametersService, authService, executionContextService) {
|
|
22
24
|
this.dynamicNodeParametersService = dynamicNodeParametersService;
|
|
25
|
+
this.authService = authService;
|
|
26
|
+
this.executionContextService = executionContextService;
|
|
27
|
+
}
|
|
28
|
+
async buildExecutionContext(req) {
|
|
29
|
+
const authCookie = this.authService.getCookieToken(req);
|
|
30
|
+
if (authCookie === undefined)
|
|
31
|
+
return undefined;
|
|
32
|
+
const credentials = await this.executionContextService.buildRequestBoundCredentials(authCookie, {
|
|
33
|
+
method: this.authService.getMethod(req),
|
|
34
|
+
endpoint: this.authService.getEndpoint(req),
|
|
35
|
+
browserId: this.authService.getBrowserId(req),
|
|
36
|
+
});
|
|
37
|
+
return { version: 1, establishedAt: Date.now(), source: 'internal', credentials };
|
|
23
38
|
}
|
|
24
39
|
async getOptions(req, _res, payload) {
|
|
25
40
|
await this.dynamicNodeParametersService.refineResourceIds(req.user, payload);
|
|
@@ -30,6 +45,7 @@ let DynamicNodeParametersController = class DynamicNodeParametersController {
|
|
|
30
45
|
currentNodeParameters,
|
|
31
46
|
});
|
|
32
47
|
additionalData.dataTableProjectId = projectId;
|
|
48
|
+
additionalData.executionContext = await this.buildExecutionContext(req);
|
|
33
49
|
if (methodName) {
|
|
34
50
|
return await this.dynamicNodeParametersService.getOptionsViaMethodName(methodName, path, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials);
|
|
35
51
|
}
|
|
@@ -47,6 +63,7 @@ let DynamicNodeParametersController = class DynamicNodeParametersController {
|
|
|
47
63
|
currentNodeParameters,
|
|
48
64
|
});
|
|
49
65
|
additionalData.dataTableProjectId = projectId;
|
|
66
|
+
additionalData.executionContext = await this.buildExecutionContext(req);
|
|
50
67
|
return await this.dynamicNodeParametersService.getResourceLocatorResults(methodName, path, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials, filter, paginationToken);
|
|
51
68
|
}
|
|
52
69
|
async getResourceMappingFields(req, _res, payload) {
|
|
@@ -58,6 +75,7 @@ let DynamicNodeParametersController = class DynamicNodeParametersController {
|
|
|
58
75
|
currentNodeParameters,
|
|
59
76
|
});
|
|
60
77
|
additionalData.dataTableProjectId = projectId;
|
|
78
|
+
additionalData.executionContext = await this.buildExecutionContext(req);
|
|
61
79
|
return await this.dynamicNodeParametersService.getResourceMappingFields(methodName, path, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials);
|
|
62
80
|
}
|
|
63
81
|
async getLocalResourceMappingFields(req, _res, payload) {
|
|
@@ -78,6 +96,7 @@ let DynamicNodeParametersController = class DynamicNodeParametersController {
|
|
|
78
96
|
projectId,
|
|
79
97
|
currentNodeParameters,
|
|
80
98
|
});
|
|
99
|
+
additionalData.executionContext = await this.buildExecutionContext(req);
|
|
81
100
|
return await this.dynamicNodeParametersService.getActionResult(handler, path, additionalData, nodeTypeAndVersion, currentNodeParameters, actionPayload, credentials);
|
|
82
101
|
}
|
|
83
102
|
};
|
|
@@ -119,6 +138,6 @@ __decorate([
|
|
|
119
138
|
], DynamicNodeParametersController.prototype, "getActionResult", null);
|
|
120
139
|
exports.DynamicNodeParametersController = DynamicNodeParametersController = __decorate([
|
|
121
140
|
(0, decorators_1.RestController)('/dynamic-node-parameters'),
|
|
122
|
-
__metadata("design:paramtypes", [dynamic_node_parameters_service_1.DynamicNodeParametersService])
|
|
141
|
+
__metadata("design:paramtypes", [dynamic_node_parameters_service_1.DynamicNodeParametersService, auth_service_1.AuthService, n8n_core_1.ExecutionContextService])
|
|
123
142
|
], DynamicNodeParametersController);
|
|
124
143
|
//# sourceMappingURL=dynamic-node-parameters.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-node-parameters.controller.js","sourceRoot":"","sources":["../../src/controllers/dynamic-node-parameters.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAKwB;AAExB,gDAA6D;
|
|
1
|
+
{"version":3,"file":"dynamic-node-parameters.controller.js","sourceRoot":"","sources":["../../src/controllers/dynamic-node-parameters.controller.ts"],"names":[],"mappings":"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"}
|
package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.d.ts
CHANGED
|
@@ -1,7 +1,41 @@
|
|
|
1
1
|
import type { ICredentialContext } from 'n8n-workflow';
|
|
2
2
|
import { ITokenIdentifier } from './identifier-interface';
|
|
3
3
|
import { AuthService } from '../../../../auth/auth.service';
|
|
4
|
+
import { z } from 'zod';
|
|
4
5
|
import { OAuthTokenVerifierProxy } from '../../../../services/oauth-token-verifier-proxy.service';
|
|
6
|
+
export declare const N8NIdentifierMetadataSchema: z.ZodDiscriminatedUnion<"source", [z.ZodObject<{
|
|
7
|
+
source: z.ZodLiteral<"manual-execution">;
|
|
8
|
+
}, "strip", z.ZodTypeAny, {
|
|
9
|
+
source: "manual-execution";
|
|
10
|
+
}, {
|
|
11
|
+
source: "manual-execution";
|
|
12
|
+
}>, z.ZodObject<{
|
|
13
|
+
source: z.ZodEnum<["chat-hub-injected", "cookie-source"]>;
|
|
14
|
+
method: z.ZodString;
|
|
15
|
+
endpoint: z.ZodString;
|
|
16
|
+
browserId: z.ZodOptional<z.ZodString>;
|
|
17
|
+
}, "strip", z.ZodTypeAny, {
|
|
18
|
+
source: "chat-hub-injected" | "cookie-source";
|
|
19
|
+
method: string;
|
|
20
|
+
endpoint: string;
|
|
21
|
+
browserId?: string | undefined;
|
|
22
|
+
}, {
|
|
23
|
+
source: "chat-hub-injected" | "cookie-source";
|
|
24
|
+
method: string;
|
|
25
|
+
endpoint: string;
|
|
26
|
+
browserId?: string | undefined;
|
|
27
|
+
}>, z.ZodObject<{
|
|
28
|
+
source: z.ZodLiteral<"n8n-oauth">;
|
|
29
|
+
resource: z.ZodString;
|
|
30
|
+
}, "strip", z.ZodTypeAny, {
|
|
31
|
+
source: "n8n-oauth";
|
|
32
|
+
resource: string;
|
|
33
|
+
}, {
|
|
34
|
+
source: "n8n-oauth";
|
|
35
|
+
resource: string;
|
|
36
|
+
}>]>;
|
|
37
|
+
export declare const N8N_IDENTITY_SOURCES: readonly string[];
|
|
38
|
+
export declare function carriesN8nIdentity(context: ICredentialContext): boolean;
|
|
5
39
|
export declare class N8NIdentifier implements ITokenIdentifier {
|
|
6
40
|
private readonly authService;
|
|
7
41
|
private readonly oauthTokenVerifierProxy;
|
package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.js
CHANGED
|
@@ -9,30 +9,43 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.N8NIdentifier = void 0;
|
|
12
|
+
exports.N8NIdentifier = exports.N8N_IDENTITY_SOURCES = exports.N8NIdentifierMetadataSchema = void 0;
|
|
13
|
+
exports.carriesN8nIdentity = carriesN8nIdentity;
|
|
13
14
|
const di_1 = require("@n8n/di");
|
|
14
15
|
const auth_service_1 = require("../../../../auth/auth.service");
|
|
15
16
|
const zod_1 = require("zod");
|
|
16
17
|
const decorators_1 = require("@n8n/decorators");
|
|
17
18
|
const oauth_token_verifier_proxy_service_1 = require("../../../../services/oauth-token-verifier-proxy.service");
|
|
19
|
+
const MANUAL_EXECUTION_SOURCE = 'manual-execution';
|
|
20
|
+
const REQUEST_BOUND_SOURCES = ['chat-hub-injected', 'cookie-source'];
|
|
21
|
+
const N8N_OAUTH_SOURCE = 'n8n-oauth';
|
|
18
22
|
const ManualExecutionMetadataSchema = zod_1.z.object({
|
|
19
|
-
source: zod_1.z.literal(
|
|
23
|
+
source: zod_1.z.literal(MANUAL_EXECUTION_SOURCE),
|
|
20
24
|
});
|
|
21
25
|
const RequestBoundMetadataSchema = zod_1.z.object({
|
|
22
|
-
source: zod_1.z.enum(
|
|
26
|
+
source: zod_1.z.enum(REQUEST_BOUND_SOURCES),
|
|
23
27
|
method: zod_1.z.string(),
|
|
24
28
|
endpoint: zod_1.z.string(),
|
|
25
29
|
browserId: zod_1.z.string().optional(),
|
|
26
30
|
});
|
|
27
31
|
const N8nOAuthMetadataSchema = zod_1.z.object({
|
|
28
|
-
source: zod_1.z.literal(
|
|
32
|
+
source: zod_1.z.literal(N8N_OAUTH_SOURCE),
|
|
29
33
|
resource: zod_1.z.string(),
|
|
30
34
|
});
|
|
31
|
-
|
|
35
|
+
exports.N8NIdentifierMetadataSchema = zod_1.z.discriminatedUnion('source', [
|
|
32
36
|
ManualExecutionMetadataSchema,
|
|
33
37
|
RequestBoundMetadataSchema,
|
|
34
38
|
N8nOAuthMetadataSchema,
|
|
35
39
|
]);
|
|
40
|
+
exports.N8N_IDENTITY_SOURCES = [
|
|
41
|
+
MANUAL_EXECUTION_SOURCE,
|
|
42
|
+
...REQUEST_BOUND_SOURCES,
|
|
43
|
+
N8N_OAUTH_SOURCE,
|
|
44
|
+
];
|
|
45
|
+
function carriesN8nIdentity(context) {
|
|
46
|
+
const source = context.metadata?.source;
|
|
47
|
+
return typeof source === 'string' && exports.N8N_IDENTITY_SOURCES.includes(source);
|
|
48
|
+
}
|
|
36
49
|
let N8NIdentifier = class N8NIdentifier {
|
|
37
50
|
constructor(authService, oauthTokenVerifierProxy) {
|
|
38
51
|
this.authService = authService;
|
|
@@ -42,7 +55,7 @@ let N8NIdentifier = class N8NIdentifier {
|
|
|
42
55
|
return;
|
|
43
56
|
}
|
|
44
57
|
async resolve(context, _) {
|
|
45
|
-
const metadataResult = N8NIdentifierMetadataSchema.safeParse(context.metadata);
|
|
58
|
+
const metadataResult = exports.N8NIdentifierMetadataSchema.safeParse(context.metadata);
|
|
46
59
|
if (!metadataResult.success) {
|
|
47
60
|
throw new decorators_1.CredentialResolverError(`Invalid context metadata: ${metadataResult.error.message}`);
|
|
48
61
|
}
|
package/dist/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"n8n-identifier.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"n8n-identifier.js","sourceRoot":"","sources":["../../../../../src/modules/dynamic-credentials.ee/credential-resolvers/identifiers/n8n-identifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.N8nIdentityNotSupportedError = void 0;
|
|
4
|
+
const credential_resolution_error_1 = require("./credential-resolution.error");
|
|
5
|
+
class N8nIdentityNotSupportedError extends credential_resolution_error_1.CredentialResolutionError {
|
|
6
|
+
constructor(credentialName) {
|
|
7
|
+
super(`"${credentialName}" resolves credentials per external user, so it can only be resolved by a request carrying that user's token`);
|
|
8
|
+
this.name = 'N8nIdentityNotSupportedError';
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.N8nIdentityNotSupportedError = N8nIdentityNotSupportedError;
|
|
12
|
+
//# sourceMappingURL=n8n-identity-not-supported.error.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"n8n-identity-not-supported.error.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/errors/n8n-identity-not-supported.error.ts"],"names":[],"mappings":";;;AAAA,+EAA0E;AAQ1E,kCAA0C,SAAQ,uDAAyB;IAC1E,YAAY,cAAsB;QACjC,KAAK,CACJ,IAAI,cAAc,8GAA8G,CAChI,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,8BAA8B,CAAC;IAC5C,CAAC;CACD"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { Request } from 'express';
|
|
2
|
+
import { ExecutionContextService } from 'n8n-core';
|
|
2
3
|
import { ICredentialContext } from 'n8n-workflow';
|
|
3
4
|
import { AuthService } from '../../../auth/auth.service';
|
|
4
5
|
export declare class DynamicCredentialWebService {
|
|
5
6
|
private readonly authService;
|
|
6
|
-
|
|
7
|
+
private readonly executionContextService;
|
|
8
|
+
constructor(authService: AuthService, executionContextService: ExecutionContextService);
|
|
7
9
|
private buildCookieCredentialContext;
|
|
8
10
|
getCredentialContextFromRequest(req: Request): ICredentialContext;
|
|
9
11
|
}
|
|
@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.DynamicCredentialWebService = void 0;
|
|
13
13
|
const api_types_1 = require("@n8n/api-types");
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
|
+
const n8n_core_1 = require("n8n-core");
|
|
15
16
|
const zod_1 = require("zod");
|
|
16
17
|
const auth_service_1 = require("../../../auth/auth.service");
|
|
17
18
|
const unauthenticated_error_1 = require("../../../errors/response-errors/unauthenticated.error");
|
|
@@ -33,24 +34,20 @@ function getBearerToken(req) {
|
|
|
33
34
|
return token;
|
|
34
35
|
}
|
|
35
36
|
let DynamicCredentialWebService = class DynamicCredentialWebService {
|
|
36
|
-
constructor(authService) {
|
|
37
|
+
constructor(authService, executionContextService) {
|
|
37
38
|
this.authService = authService;
|
|
39
|
+
this.executionContextService = executionContextService;
|
|
38
40
|
}
|
|
39
41
|
buildCookieCredentialContext(req) {
|
|
40
42
|
const sessionCookie = this.authService.getCookieToken(req);
|
|
41
43
|
if (sessionCookie === undefined) {
|
|
42
44
|
throw new unauthenticated_error_1.UnauthenticatedError('Session cookie is missing');
|
|
43
45
|
}
|
|
44
|
-
return {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
browserId: this.authService.getBrowserId(req),
|
|
50
|
-
method: this.authService.getMethod(req),
|
|
51
|
-
endpoint: this.authService.getEndpoint(req),
|
|
52
|
-
},
|
|
53
|
-
};
|
|
46
|
+
return this.executionContextService.buildRequestBoundCredentialContext(sessionCookie, {
|
|
47
|
+
method: this.authService.getMethod(req),
|
|
48
|
+
endpoint: this.authService.getEndpoint(req),
|
|
49
|
+
browserId: this.authService.getBrowserId(req),
|
|
50
|
+
});
|
|
54
51
|
}
|
|
55
52
|
getCredentialContextFromRequest(req) {
|
|
56
53
|
const parseResult = AuthSourceQuerySchema.safeParse(req.query);
|
|
@@ -88,6 +85,6 @@ let DynamicCredentialWebService = class DynamicCredentialWebService {
|
|
|
88
85
|
exports.DynamicCredentialWebService = DynamicCredentialWebService;
|
|
89
86
|
exports.DynamicCredentialWebService = DynamicCredentialWebService = __decorate([
|
|
90
87
|
(0, di_1.Service)(),
|
|
91
|
-
__metadata("design:paramtypes", [auth_service_1.AuthService])
|
|
88
|
+
__metadata("design:paramtypes", [auth_service_1.AuthService, n8n_core_1.ExecutionContextService])
|
|
92
89
|
], DynamicCredentialWebService);
|
|
93
90
|
//# sourceMappingURL=dynamic-credential-web.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-credential-web.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAmC;AACnC,gCAAkC;
|
|
1
|
+
{"version":3,"file":"dynamic-credential-web.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/dynamic-credential-web.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const n8n_workflow_1 = require("n8n-workflow");
|
|
|
18
18
|
const dynamic_credentials_proxy_1 = require("../../../credentials/dynamic-credentials-proxy");
|
|
19
19
|
const load_nodes_and_credentials_1 = require("../../../load-nodes-and-credentials");
|
|
20
20
|
const static_auth_service_1 = require("../../../services/static-auth-service");
|
|
21
|
+
const n8n_identifier_1 = require("../credential-resolvers/identifiers/n8n-identifier");
|
|
21
22
|
const credential_resolver_registry_service_1 = require("./credential-resolver-registry.service");
|
|
22
23
|
const resolver_config_expression_service_1 = require("./resolver-config-expression.service");
|
|
23
24
|
const shared_fields_1 = require("./shared-fields");
|
|
@@ -28,6 +29,7 @@ const credential_resolution_error_1 = require("../errors/credential-resolution.e
|
|
|
28
29
|
const credential_resolver_not_configured_error_1 = require("../errors/credential-resolver-not-configured.error");
|
|
29
30
|
const credential_resolver_not_found_error_1 = require("../errors/credential-resolver-not-found.error");
|
|
30
31
|
const missing_execution_context_error_1 = require("../errors/missing-execution-context.error");
|
|
32
|
+
const n8n_identity_not_supported_error_1 = require("../errors/n8n-identity-not-supported.error");
|
|
31
33
|
let DynamicCredentialService = class DynamicCredentialService {
|
|
32
34
|
constructor(dynamicCredentialConfig, resolverRegistry, resolverRepository, loadNodesAndCredentials, cipher, logger, expressionService, dynamicCredentialsProxy) {
|
|
33
35
|
this.dynamicCredentialConfig = dynamicCredentialConfig;
|
|
@@ -62,6 +64,15 @@ let DynamicCredentialService = class DynamicCredentialService {
|
|
|
62
64
|
if (!credentialContext) {
|
|
63
65
|
return this.handleMissingContext(credentialsResolveMetadata);
|
|
64
66
|
}
|
|
67
|
+
if ((0, n8n_identifier_1.carriesN8nIdentity)(credentialContext) && !resolver.resolveOwningUserId) {
|
|
68
|
+
this.logger.debug('Refused to resolve external-subject credential with n8n identity', {
|
|
69
|
+
credentialId: credentialsResolveMetadata.id,
|
|
70
|
+
credentialName: credentialsResolveMetadata.name,
|
|
71
|
+
resolverId,
|
|
72
|
+
resolverType: resolverEntity.type,
|
|
73
|
+
});
|
|
74
|
+
throw new n8n_identity_not_supported_error_1.N8nIdentityNotSupportedError(credentialsResolveMetadata.name);
|
|
75
|
+
}
|
|
65
76
|
try {
|
|
66
77
|
const credentialType = this.loadNodesAndCredentials.getCredential(credentialsResolveMetadata.type);
|
|
67
78
|
const sharedFields = (0, shared_fields_1.extractSharedFields)(credentialType.type);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-credential.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/dynamic-credential.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gDAA+F;AAC/F,gCAAkC;AAElC,uCAAkC;AAOlC,+CAA8D;AAE9D,uFAAkF;AAClF,6EAAuE;AACvE,wEAAmE;AAEnE,iGAA2F;AAC3F,6FAAuF;AACvF,mDAAsD;AAMtD,4CAAwE;AACxE,4GAA8G;AAC9G,8EAAyE;AACzE,uFAAkF;AAClF,iHAA0G;AAC1G,uGAAgG;AAChG,+FAAyF;
|
|
1
|
+
{"version":3,"file":"dynamic-credential.service.js","sourceRoot":"","sources":["../../../../src/modules/dynamic-credentials.ee/services/dynamic-credential.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
|
-
import { SharedWorkflowRepository, User } from '@n8n/db';
|
|
2
|
+
import { CredentialsRepository, SharedWorkflowRepository, User } from '@n8n/db';
|
|
3
3
|
import type { ILoadOptions, INodeListSearchResult, INodePropertyOptions, IWorkflowExecuteAdditionalData, ResourceMapperFields, INodeCredentials, INodeParameters, INodeTypeNameVersion, NodeParameterValueType, IDataObject } from 'n8n-workflow';
|
|
4
4
|
import { CredentialsFinderService } from '../credentials/credentials-finder.service';
|
|
5
5
|
import { NodeTypes } from '../node-types';
|
|
@@ -10,12 +10,14 @@ export declare class DynamicNodeParametersService {
|
|
|
10
10
|
private workflowLoaderService;
|
|
11
11
|
private sharedWorkflowRepository;
|
|
12
12
|
private credentialsFinderService;
|
|
13
|
-
|
|
13
|
+
private credentialsRepository;
|
|
14
|
+
constructor(logger: Logger, nodeTypes: NodeTypes, workflowLoaderService: WorkflowLoaderService, sharedWorkflowRepository: SharedWorkflowRepository, credentialsFinderService: CredentialsFinderService, credentialsRepository: CredentialsRepository);
|
|
14
15
|
refineResourceIds(user: User, payload: {
|
|
15
16
|
projectId?: string;
|
|
16
17
|
workflowId?: string;
|
|
17
18
|
credentials?: INodeCredentials;
|
|
18
19
|
}): Promise<void>;
|
|
20
|
+
private assertMayUseEndUserCredentials;
|
|
19
21
|
getOptionsViaMethodName(methodName: string, path: string, additionalData: IWorkflowExecuteAdditionalData, nodeTypeAndVersion: INodeTypeNameVersion, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]>;
|
|
20
22
|
getOptionsViaLoadOptionsByPath(path: string, additionalData: IWorkflowExecuteAdditionalData, nodeTypeAndVersion: INodeTypeNameVersion, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]>;
|
|
21
23
|
getOptionsViaLoadOptions(loadOptions: ILoadOptions, additionalData: IWorkflowExecuteAdditionalData, nodeTypeAndVersion: INodeTypeNameVersion, currentNodeParameters: INodeParameters, credentials?: INodeCredentials): Promise<INodePropertyOptions[]>;
|
|
@@ -23,12 +23,13 @@ const check_access_1 = require("../permissions.ee/check-access");
|
|
|
23
23
|
const utils_1 = require("../utils");
|
|
24
24
|
const workflow_loader_service_1 = require("./workflow-loader.service");
|
|
25
25
|
let DynamicNodeParametersService = class DynamicNodeParametersService {
|
|
26
|
-
constructor(logger, nodeTypes, workflowLoaderService, sharedWorkflowRepository, credentialsFinderService) {
|
|
26
|
+
constructor(logger, nodeTypes, workflowLoaderService, sharedWorkflowRepository, credentialsFinderService, credentialsRepository) {
|
|
27
27
|
this.logger = logger;
|
|
28
28
|
this.nodeTypes = nodeTypes;
|
|
29
29
|
this.workflowLoaderService = workflowLoaderService;
|
|
30
30
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
31
31
|
this.credentialsFinderService = credentialsFinderService;
|
|
32
|
+
this.credentialsRepository = credentialsRepository;
|
|
32
33
|
}
|
|
33
34
|
async refineResourceIds(user, payload) {
|
|
34
35
|
if (payload.projectId &&
|
|
@@ -61,9 +62,20 @@ let DynamicNodeParametersService = class DynamicNodeParametersService {
|
|
|
61
62
|
if (forbiddenId !== undefined) {
|
|
62
63
|
throw new forbidden_error_1.ForbiddenError();
|
|
63
64
|
}
|
|
65
|
+
await this.assertMayUseEndUserCredentials(user, credentialIds);
|
|
64
66
|
}
|
|
65
67
|
}
|
|
66
68
|
}
|
|
69
|
+
async assertMayUseEndUserCredentials(user, credentialIds) {
|
|
70
|
+
const credentials = await this.credentialsRepository.getManyByIds(credentialIds);
|
|
71
|
+
const endUserIds = credentials.filter((c) => c.isResolvable).map((c) => c.id);
|
|
72
|
+
if (endUserIds.length === 0)
|
|
73
|
+
return;
|
|
74
|
+
const connectableIds = await this.credentialsFinderService.findCredentialIdsWithScopeForUser(endUserIds, user, ['credential:connect']);
|
|
75
|
+
if (endUserIds.some((id) => !connectableIds.has(id))) {
|
|
76
|
+
throw new forbidden_error_1.ForbiddenError('You need permission to connect your own account to this end-user credential before you can load this list');
|
|
77
|
+
}
|
|
78
|
+
}
|
|
67
79
|
async getOptionsViaMethodName(methodName, path, additionalData, nodeTypeAndVersion, currentNodeParameters, credentials) {
|
|
68
80
|
const nodeType = this.getNodeType(nodeTypeAndVersion);
|
|
69
81
|
const method = this.getMethod('loadOptions', methodName, nodeType);
|
|
@@ -92,7 +104,9 @@ let DynamicNodeParametersService = class DynamicNodeParametersService {
|
|
|
92
104
|
const mode = 'internal';
|
|
93
105
|
const runIndex = 0;
|
|
94
106
|
const connectionInputData = [];
|
|
95
|
-
const runExecutionData = (0, n8n_workflow_1.
|
|
107
|
+
const runExecutionData = (0, n8n_workflow_1.createRunExecutionData)({
|
|
108
|
+
executionData: { runtimeData: additionalData.executionContext },
|
|
109
|
+
});
|
|
96
110
|
const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
|
|
97
111
|
const node = workflow.nodes['Temp-Node'];
|
|
98
112
|
const tempNodeType = {
|
|
@@ -232,6 +246,6 @@ let DynamicNodeParametersService = class DynamicNodeParametersService {
|
|
|
232
246
|
exports.DynamicNodeParametersService = DynamicNodeParametersService;
|
|
233
247
|
exports.DynamicNodeParametersService = DynamicNodeParametersService = __decorate([
|
|
234
248
|
(0, di_1.Service)(),
|
|
235
|
-
__metadata("design:paramtypes", [backend_common_1.Logger, node_types_1.NodeTypes, workflow_loader_service_1.WorkflowLoaderService, db_1.SharedWorkflowRepository, credentials_finder_service_1.CredentialsFinderService])
|
|
249
|
+
__metadata("design:paramtypes", [backend_common_1.Logger, node_types_1.NodeTypes, workflow_loader_service_1.WorkflowLoaderService, db_1.SharedWorkflowRepository, credentials_finder_service_1.CredentialsFinderService, db_1.CredentialsRepository])
|
|
236
250
|
], DynamicNodeParametersService);
|
|
237
251
|
//# sourceMappingURL=dynamic-node-parameters.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dynamic-node-parameters.service.js","sourceRoot":"","sources":["../../src/services/dynamic-node-parameters.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dynamic-node-parameters.service.js","sourceRoot":"","sources":["../../src/services/dynamic-node-parameters.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ export declare class TaskBroker {
|
|
|
50
50
|
private runnerAcceptRejects;
|
|
51
51
|
private requesterAcceptRejects;
|
|
52
52
|
private consecutiveAcceptTimeouts;
|
|
53
|
+
private silentRunnersSince;
|
|
53
54
|
private pendingTaskOffers;
|
|
54
55
|
private pendingTaskRequests;
|
|
55
56
|
private mismatchWarned;
|
|
@@ -92,9 +93,11 @@ export declare class TaskBroker {
|
|
|
92
93
|
taskDoneHandler(taskId: Task['id'], data: TaskResultData): Promise<void>;
|
|
93
94
|
taskErrorHandler(taskId: Task['id'], error: unknown): Promise<void>;
|
|
94
95
|
acceptOffer(offer: TaskOffer, request: TaskRequest): Promise<void>;
|
|
96
|
+
private resetAcceptTimeoutsOnOwnTask;
|
|
95
97
|
private flagRunnerIfUnresponsive;
|
|
96
98
|
private flagSilentRunners;
|
|
97
99
|
private reportUnresponsive;
|
|
100
|
+
private monotonicNowMs;
|
|
98
101
|
private isSilent;
|
|
99
102
|
settleTasks(): void;
|
|
100
103
|
private warnOnTaskTypeMismatch;
|