n8n 2.12.1 → 2.13.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/abstract-server.d.ts +2 -0
- package/dist/abstract-server.js +5 -1
- package/dist/abstract-server.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/import/entities.d.ts +3 -0
- package/dist/commands/import/entities.js +9 -1
- package/dist/commands/import/entities.js.map +1 -1
- package/dist/commands/start.js +3 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +1 -0
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +7 -5
- package/dist/commands/worker.js.map +1 -1
- package/dist/constants.d.ts +0 -1
- package/dist/constants.js +1 -2
- package/dist/constants.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +2 -3
- package/dist/controllers/project.controller.js +8 -3
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/credentials/credentials.service.js +14 -8
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/eventbus/event-message-classes/event-message-audit.d.ts +1 -0
- package/dist/eventbus/event-message-classes/event-message-audit.js.map +1 -1
- package/dist/eventbus/event-message-classes/index.d.ts +2 -2
- package/dist/eventbus/event-message-classes/index.js +1 -0
- package/dist/eventbus/event-message-classes/index.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +9 -0
- package/dist/events/relays/log-streaming.event-relay.d.ts +1 -0
- package/dist/events/relays/log-streaming.event-relay.js +21 -0
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/restore-binary-data-id.js +8 -2
- package/dist/execution-lifecycle/restore-binary-data-id.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +3 -1
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/metrics/prometheus-metrics.service.d.ts +2 -0
- package/dist/metrics/prometheus-metrics.service.js +29 -0
- package/dist/metrics/prometheus-metrics.service.js.map +1 -1
- package/dist/metrics/types.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.d.ts +3 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js +31 -7
- package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-event-relay.service.js +1 -1
- package/dist/modules/chat-hub/chat-hub-event-relay.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-execution.service.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub-execution.service.js +14 -10
- package/dist/modules/chat-hub/chat-hub-execution.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-extractor.d.ts +2 -2
- package/dist/modules/chat-hub/chat-hub-session.entity.d.ts +3 -1
- package/dist/modules/chat-hub/chat-hub-session.entity.js +4 -0
- package/dist/modules/chat-hub/chat-hub-session.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +2 -2
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +37 -18
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.controller.d.ts +4 -1
- package/dist/modules/chat-hub/chat-hub.controller.js +81 -1
- package/dist/modules/chat-hub/chat-hub.controller.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.module.d.ts +1 -0
- package/dist/modules/chat-hub/chat-hub.module.js +1 -0
- package/dist/modules/chat-hub/chat-hub.module.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.d.ts +5 -1
- package/dist/modules/chat-hub/chat-hub.service.js +235 -29
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-session.repository.d.ts +1 -1
- package/dist/modules/chat-hub/chat-session.repository.js +4 -1
- package/dist/modules/chat-hub/chat-session.repository.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +3 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-settings.controller.ee.d.ts +16 -0
- package/dist/modules/external-secrets.ee/external-secrets-settings.controller.ee.js +74 -0
- package/dist/modules/external-secrets.ee/external-secrets-settings.controller.ee.js.map +1 -0
- package/dist/modules/external-secrets.ee/external-secrets-settings.service.ee.d.ts +9 -0
- package/dist/modules/external-secrets.ee/external-secrets-settings.service.ee.js +52 -0
- package/dist/modules/external-secrets.ee/external-secrets-settings.service.ee.js.map +1 -0
- package/dist/modules/external-secrets.ee/external-secrets.config.js +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.config.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.module.d.ts +1 -0
- package/dist/modules/external-secrets.ee/external-secrets.module.js +6 -0
- package/dist/modules/external-secrets.ee/external-secrets.module.js.map +1 -1
- package/dist/modules/external-secrets.ee/redaction.service.ee.js +3 -4
- package/dist/modules/external-secrets.ee/redaction.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/retry-manager.service.d.ts +1 -1
- package/dist/modules/external-secrets.ee/retry-manager.service.js +8 -2
- package/dist/modules/external-secrets.ee/retry-manager.service.js.map +1 -1
- package/dist/modules/external-secrets.ee/secret-provider-access-check.service.ee.d.ts +16 -2
- package/dist/modules/external-secrets.ee/secret-provider-access-check.service.ee.js +55 -2
- package/dist/modules/external-secrets.ee/secret-provider-access-check.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js +2 -2
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.d.ts +13 -5
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js +68 -37
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.d.ts +6 -5
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js +37 -24
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js +9 -0
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js +9 -0
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/validate-workflow-code.tool.js +12 -1
- package/dist/modules/mcp/tools/workflow-builder/validate-workflow-code.tool.js.map +1 -1
- package/dist/modules/redaction/executions/execution-redaction.service.js +9 -0
- package/dist/modules/redaction/executions/execution-redaction.service.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-helper.ee.js +4 -1
- package/dist/modules/source-control.ee/source-control-helper.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-status.service.ee.d.ts +3 -1
- package/dist/modules/source-control.ee/source-control-status.service.ee.js +86 -5
- package/dist/modules/source-control.ee/source-control-status.service.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control.controller.ee.d.ts +4 -0
- package/dist/modules/source-control.ee/source-control.service.ee.d.ts +2 -0
- package/dist/modules/source-control.ee/types/exportable-folders.d.ts +1 -0
- package/dist/modules/sso-saml/saml.service.ee.d.ts +1 -0
- package/dist/modules/sso-saml/saml.service.ee.js +3 -0
- package/dist/modules/sso-saml/saml.service.ee.js.map +1 -1
- package/dist/modules/workflow-index/workflow-index.service.d.ts +5 -3
- package/dist/modules/workflow-index/workflow-index.service.js +40 -14
- package/dist/modules/workflow-index/workflow-index.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +3 -0
- package/dist/scaling/worker-server.d.ts +2 -0
- package/dist/scaling/worker-server.js +6 -1
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/server.js +1 -0
- package/dist/server.js.map +1 -1
- package/dist/services/import.service.d.ts +1 -1
- package/dist/services/import.service.js +9 -5
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +3 -2
- package/dist/services/project.service.ee.js +13 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/role-cache.service.d.ts +1 -1
- package/dist/services/role-cache.service.js.map +1 -1
- package/dist/services/role.service.d.ts +3 -3
- package/dist/services/ssrf/ssrf-blocked-ip.error.js +6 -1
- package/dist/services/ssrf/ssrf-blocked-ip.error.js.map +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.controller.d.ts +5 -3
- package/dist/task-runners/task-broker/auth/task-broker-auth.controller.js +17 -12
- package/dist/task-runners/task-broker/auth/task-broker-auth.controller.js.map +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.schema.d.ts +1 -0
- package/dist/task-runners/task-broker/auth/task-broker-auth.schema.js +5 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.schema.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker-server.d.ts +5 -1
- package/dist/task-runners/task-broker/task-broker-server.js +71 -28
- package/dist/task-runners/task-broker/task-broker-server.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker-ws-server.d.ts +2 -2
- package/dist/task-runners/task-broker/task-broker-ws-server.js +4 -4
- package/dist/workflows/workflow-execution.service.d.ts +1 -1
- package/dist/workflows/workflow-execution.service.js +2 -1
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +3 -2
- package/dist/workflows/workflow.service.js +12 -1
- package/dist/workflows/workflow.service.js.map +1 -1
- package/package.json +24 -24
|
@@ -98,6 +98,9 @@ let ProjectService = class ProjectService {
|
|
|
98
98
|
get dataTableService() {
|
|
99
99
|
return Promise.resolve().then(() => __importStar(require('../modules/data-table/data-table.service'))).then(({ DataTableService }) => di_1.Container.get(DataTableService));
|
|
100
100
|
}
|
|
101
|
+
get secretsProvidersConnectionsService() {
|
|
102
|
+
return Promise.resolve().then(() => __importStar(require('../modules/external-secrets.ee/secrets-providers-connections.service.ee'))).then(({ SecretsProvidersConnectionsService }) => di_1.Container.get(SecretsProvidersConnectionsService));
|
|
103
|
+
}
|
|
101
104
|
async deleteProject(user, projectId, { migrateToProject } = {}) {
|
|
102
105
|
const workflowService = await this.workflowService;
|
|
103
106
|
const credentialsService = await this.credentialsService;
|
|
@@ -156,6 +159,10 @@ let ProjectService = class ProjectService {
|
|
|
156
159
|
await dataTableService.deleteDataTableByProjectId(project.id);
|
|
157
160
|
}
|
|
158
161
|
}
|
|
162
|
+
if (this.moduleRegistry.isActive('external-secrets')) {
|
|
163
|
+
const secretsProvidersConnectionsService = await this.secretsProvidersConnectionsService;
|
|
164
|
+
await secretsProvidersConnectionsService.cleanupConnectionsForProjectDeletion(project.id);
|
|
165
|
+
}
|
|
159
166
|
await this.projectRepository.remove(project);
|
|
160
167
|
}
|
|
161
168
|
async findProjectsWorkflowIsIn(workflowId) {
|
|
@@ -167,6 +174,12 @@ let ProjectService = class ProjectService {
|
|
|
167
174
|
}
|
|
168
175
|
return await this.projectRepository.getAccessibleProjects(user.id);
|
|
169
176
|
}
|
|
177
|
+
async getAccessibleProjectsAndCount(user, options) {
|
|
178
|
+
if ((0, permissions_1.hasGlobalScope)(user, 'project:read')) {
|
|
179
|
+
return await this.projectRepository.findAllProjectsAndCount(options);
|
|
180
|
+
}
|
|
181
|
+
return await this.projectRepository.getAccessibleProjectsAndCount(user.id, options);
|
|
182
|
+
}
|
|
170
183
|
async getPersonalProjectOwners(projectIds) {
|
|
171
184
|
return await this.projectRelationRepository.getPersonalProjectOwners(projectIds);
|
|
172
185
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.service.ee.js","sourceRoot":"","sources":["../../src/services/project.service.ee.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"project.service.ee.js","sourceRoot":"","sources":["../../src/services/project.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare class RoleCacheService {
|
|
|
9
9
|
private static readonly CACHE_TTL;
|
|
10
10
|
constructor(cacheService: CacheService, logger: Logger);
|
|
11
11
|
private buildRoleScopeMap;
|
|
12
|
-
getRolesWithAllScopes(namespace: 'global' | 'project' | 'credential' | 'workflow', requiredScopes: Scope[], em?: EntityManager): Promise<string[]>;
|
|
12
|
+
getRolesWithAllScopes(namespace: 'global' | 'project' | 'credential' | 'workflow' | 'secretsProviderConnection', requiredScopes: Scope[], em?: EntityManager): Promise<string[]>;
|
|
13
13
|
invalidateCache(): Promise<void>;
|
|
14
14
|
refreshCache(): Promise<void>;
|
|
15
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role-cache.service.js","sourceRoot":"","sources":["../../src/services/role-cache.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,8CAAsC;AACtC,gCAAyC;AAEzC,gCAA6C;AAC7C,kDAAoE;AAEpE,yDAAqD;
|
|
1
|
+
{"version":3,"file":"role-cache.service.js","sourceRoot":"","sources":["../../src/services/role-cache.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ export declare class RoleService {
|
|
|
22
22
|
description: string | null;
|
|
23
23
|
slug: string;
|
|
24
24
|
systemRole: boolean;
|
|
25
|
-
roleType: "credential" | "project" | "workflow" | "global";
|
|
25
|
+
roleType: "credential" | "project" | "workflow" | "global" | "secretsProviderConnection";
|
|
26
26
|
licensed: boolean;
|
|
27
27
|
scopes: string[];
|
|
28
28
|
createdAt?: Date | undefined;
|
|
@@ -36,7 +36,7 @@ export declare class RoleService {
|
|
|
36
36
|
description: string | null;
|
|
37
37
|
slug: string;
|
|
38
38
|
systemRole: boolean;
|
|
39
|
-
roleType: "credential" | "project" | "workflow" | "global";
|
|
39
|
+
roleType: "credential" | "project" | "workflow" | "global" | "secretsProviderConnection";
|
|
40
40
|
licensed: boolean;
|
|
41
41
|
scopes: string[];
|
|
42
42
|
createdAt?: Date | undefined;
|
|
@@ -49,7 +49,7 @@ export declare class RoleService {
|
|
|
49
49
|
description: string | null;
|
|
50
50
|
slug: string;
|
|
51
51
|
systemRole: boolean;
|
|
52
|
-
roleType: "credential" | "project" | "workflow" | "global";
|
|
52
|
+
roleType: "credential" | "project" | "workflow" | "global" | "secretsProviderConnection";
|
|
53
53
|
licensed: boolean;
|
|
54
54
|
scopes: string[];
|
|
55
55
|
createdAt?: Date | undefined;
|
|
@@ -4,7 +4,12 @@ exports.SsrfBlockedIpError = void 0;
|
|
|
4
4
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
5
|
class SsrfBlockedIpError extends n8n_workflow_1.UserError {
|
|
6
6
|
constructor(ip, hostname) {
|
|
7
|
-
|
|
7
|
+
const target = hostname ? `'${hostname}' (${ip})` : ip;
|
|
8
|
+
super('The request was blocked because it resolves to a restricted IP address', {
|
|
9
|
+
description: `The target ${target} is not allowed. ` +
|
|
10
|
+
'This is a security measure to prevent Server-Side Request Forgery (SSRF). ' +
|
|
11
|
+
'If you need to access internal resources, ask your n8n administrator to allowlist ' +
|
|
12
|
+
'the hostname or IP range in the environment configuration.',
|
|
8
13
|
extra: { ip, hostname },
|
|
9
14
|
});
|
|
10
15
|
this.name = 'SsrfBlockedIpError';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ssrf-blocked-ip.error.js","sourceRoot":"","sources":["../../../src/services/ssrf/ssrf-blocked-ip.error.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAKzC,MAAa,kBAAmB,SAAQ,wBAAS;IAIhD,YAAY,EAAU,EAAE,QAAiB;QACxC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"ssrf-blocked-ip.error.js","sourceRoot":"","sources":["../../../src/services/ssrf/ssrf-blocked-ip.error.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAKzC,MAAa,kBAAmB,SAAQ,wBAAS;IAIhD,YAAY,EAAU,EAAE,QAAiB;QACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACvD,KAAK,CAAC,wEAAwE,EAAE;YAC/E,WAAW,EACV,cAAc,MAAM,mBAAmB;gBACvC,4EAA4E;gBAC5E,oFAAoF;gBACpF,4DAA4D;YAC7D,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE;SACvB,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;CACD;AAnBD,gDAmBC"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import type { NextFunction, Response } from 'express';
|
|
2
1
|
import type { AuthlessRequest } from '../../../requests';
|
|
3
|
-
import type { TaskBrokerServerInitRequest } from '../../../task-runners/task-broker/task-broker-types';
|
|
4
2
|
import { TaskBrokerAuthService } from './task-broker-auth.service';
|
|
5
3
|
export declare class TaskBrokerAuthController {
|
|
6
4
|
private readonly authService;
|
|
@@ -8,5 +6,9 @@ export declare class TaskBrokerAuthController {
|
|
|
8
6
|
createGrantToken(req: AuthlessRequest): Promise<{
|
|
9
7
|
token: string;
|
|
10
8
|
}>;
|
|
11
|
-
|
|
9
|
+
validateUpgradeRequest(authHeader: string | undefined): Promise<{
|
|
10
|
+
isValid: boolean;
|
|
11
|
+
statusCode: number;
|
|
12
|
+
reason?: string;
|
|
13
|
+
}>;
|
|
12
14
|
}
|
|
@@ -18,7 +18,6 @@ const forbidden_error_1 = require("../../../errors/response-errors/forbidden.err
|
|
|
18
18
|
let TaskBrokerAuthController = class TaskBrokerAuthController {
|
|
19
19
|
constructor(authService) {
|
|
20
20
|
this.authService = authService;
|
|
21
|
-
this.authMiddleware = this.authMiddleware.bind(this);
|
|
22
21
|
}
|
|
23
22
|
async createGrantToken(req) {
|
|
24
23
|
const result = await task_broker_auth_schema_1.taskBrokerAuthRequestBodySchema.safeParseAsync(req.body);
|
|
@@ -34,19 +33,25 @@ let TaskBrokerAuthController = class TaskBrokerAuthController {
|
|
|
34
33
|
token: grantToken,
|
|
35
34
|
};
|
|
36
35
|
}
|
|
37
|
-
async
|
|
38
|
-
const
|
|
39
|
-
if (
|
|
40
|
-
|
|
41
|
-
|
|
36
|
+
async validateUpgradeRequest(authHeader) {
|
|
37
|
+
const result = task_broker_auth_schema_1.bearerTokenSchema.safeParse(authHeader);
|
|
38
|
+
if (!result.success) {
|
|
39
|
+
return {
|
|
40
|
+
isValid: false,
|
|
41
|
+
statusCode: 401,
|
|
42
|
+
reason: 'missing or invalid Authorization header',
|
|
43
|
+
};
|
|
42
44
|
}
|
|
43
|
-
const grantToken =
|
|
44
|
-
const
|
|
45
|
-
if (!
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
const grantToken = result.data;
|
|
46
|
+
const isValid = await this.authService.tryConsumeGrantToken(grantToken);
|
|
47
|
+
if (!isValid) {
|
|
48
|
+
return {
|
|
49
|
+
isValid: false,
|
|
50
|
+
statusCode: 403,
|
|
51
|
+
reason: 'invalid or expired grant token',
|
|
52
|
+
};
|
|
48
53
|
}
|
|
49
|
-
|
|
54
|
+
return { isValid: true, statusCode: 200 };
|
|
50
55
|
}
|
|
51
56
|
};
|
|
52
57
|
exports.TaskBrokerAuthController = TaskBrokerAuthController;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-auth.controller.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;
|
|
1
|
+
{"version":3,"file":"task-broker-auth.controller.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAIlC,uEAA+F;AAC/F,yEAAmE;AACnE,yFAAoF;AACpF,qFAAiF;AAM1E,IAAM,wBAAwB,GAA9B,MAAM,wBAAwB;IACpC,YAA6B,WAAkC;QAAlC,gBAAW,GAAX,WAAW,CAAuB;IAAG,CAAC;IAMnE,KAAK,CAAC,gBAAgB,CAAC,GAAoB;QAC1C,MAAM,MAAM,GAAG,MAAM,yDAA+B,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC9E,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,mCAAe,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,gCAAc,EAAE,CAAC;QAC5B,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;QAC7D,OAAO;YACN,KAAK,EAAE,UAAU;SACjB,CAAC;IACH,CAAC;IAMD,KAAK,CAAC,sBAAsB,CAC3B,UAA8B;QAE9B,MAAM,MAAM,GAAG,2CAAiB,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACrB,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,yCAAyC;aACjD,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;QACxE,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,OAAO;gBACN,OAAO,EAAE,KAAK;gBACd,UAAU,EAAE,GAAG;gBACf,MAAM,EAAE,gCAAgC;aACxC,CAAC;QACH,CAAC;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;IAC3C,CAAC;CACD,CAAA;AApDY,4DAAwB;mCAAxB,wBAAwB;IADpC,IAAA,YAAO,GAAE;qCAEiC,gDAAqB;GADnD,wBAAwB,CAoDpC"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.taskBrokerAuthRequestBodySchema = void 0;
|
|
3
|
+
exports.bearerTokenSchema = exports.taskBrokerAuthRequestBodySchema = void 0;
|
|
4
4
|
const zod_1 = require("zod");
|
|
5
5
|
exports.taskBrokerAuthRequestBodySchema = zod_1.z.object({
|
|
6
6
|
token: zod_1.z.string().min(1),
|
|
7
7
|
});
|
|
8
|
+
exports.bearerTokenSchema = zod_1.z
|
|
9
|
+
.string()
|
|
10
|
+
.regex(/^Bearer .+$/i)
|
|
11
|
+
.transform((header) => header.slice('Bearer '.length));
|
|
8
12
|
//# sourceMappingURL=task-broker-auth.schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-auth.schema.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,+BAA+B,GAAG,OAAC,CAAC,MAAM,CAAC;IACvD,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACxB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"task-broker-auth.schema.js","sourceRoot":"","sources":["../../../../src/task-runners/task-broker/auth/task-broker-auth.schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AAEX,QAAA,+BAA+B,GAAG,OAAC,CAAC,MAAM,CAAC;IACvD,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACxB,CAAC,CAAC;AAEU,QAAA,iBAAiB,GAAG,OAAC;KAChC,MAAM,EAAE;KACR,KAAK,CAAC,cAAc,CAAC;KACrB,SAAS,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
2
|
import { GlobalConfig } from '@n8n/config';
|
|
3
3
|
import express from 'express';
|
|
4
|
+
import { ErrorReporter } from 'n8n-core';
|
|
4
5
|
import { TaskBrokerAuthController } from '../../task-runners/task-broker/auth/task-broker-auth.controller';
|
|
5
6
|
import { TaskBrokerWsServer } from '../../task-runners/task-broker/task-broker-ws-server';
|
|
6
7
|
export declare class TaskBrokerServer {
|
|
@@ -8,12 +9,14 @@ export declare class TaskBrokerServer {
|
|
|
8
9
|
private readonly globalConfig;
|
|
9
10
|
private readonly authController;
|
|
10
11
|
private readonly taskBrokerWsServer;
|
|
12
|
+
private readonly errorReporter;
|
|
11
13
|
private server;
|
|
12
14
|
private wsServer;
|
|
13
15
|
readonly app: express.Application;
|
|
16
|
+
private readonly upgradeRateLimiter;
|
|
14
17
|
get port(): number;
|
|
15
18
|
private get upgradeEndpoint();
|
|
16
|
-
constructor(logger: Logger, globalConfig: GlobalConfig, authController: TaskBrokerAuthController, taskBrokerWsServer: TaskBrokerWsServer);
|
|
19
|
+
constructor(logger: Logger, globalConfig: GlobalConfig, authController: TaskBrokerAuthController, taskBrokerWsServer: TaskBrokerWsServer, errorReporter: ErrorReporter);
|
|
17
20
|
start(): Promise<void>;
|
|
18
21
|
stop(): Promise<void>;
|
|
19
22
|
private setupHttpServer;
|
|
@@ -22,5 +25,6 @@ export declare class TaskBrokerServer {
|
|
|
22
25
|
private setupCommonMiddlewares;
|
|
23
26
|
private configureRoutes;
|
|
24
27
|
private handleUpgradeRequest;
|
|
28
|
+
private failUpgradeRequest;
|
|
25
29
|
private getEndpointBasePath;
|
|
26
30
|
}
|
|
@@ -48,10 +48,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
48
48
|
exports.TaskBrokerServer = void 0;
|
|
49
49
|
const backend_common_1 = require("@n8n/backend-common");
|
|
50
50
|
const config_1 = require("@n8n/config");
|
|
51
|
+
const constants_1 = require("@n8n/constants");
|
|
51
52
|
const di_1 = require("@n8n/di");
|
|
52
53
|
const compression_1 = __importDefault(require("compression"));
|
|
53
54
|
const express_1 = __importDefault(require("express"));
|
|
54
55
|
const express_rate_limit_1 = require("express-rate-limit");
|
|
56
|
+
const n8n_core_1 = require("n8n-core");
|
|
55
57
|
const a = __importStar(require("node:assert/strict"));
|
|
56
58
|
const node_crypto_1 = require("node:crypto");
|
|
57
59
|
const node_http_1 = require("node:http");
|
|
@@ -61,6 +63,21 @@ const middlewares_1 = require("../../middlewares");
|
|
|
61
63
|
const response_helper_1 = require("../../response-helper");
|
|
62
64
|
const task_broker_auth_controller_1 = require("../../task-runners/task-broker/auth/task-broker-auth.controller");
|
|
63
65
|
const task_broker_ws_server_1 = require("../../task-runners/task-broker/task-broker-ws-server");
|
|
66
|
+
class SlidingWindowRateLimiter {
|
|
67
|
+
constructor(windowMs, limit) {
|
|
68
|
+
this.windowMs = windowMs;
|
|
69
|
+
this.limit = limit;
|
|
70
|
+
this.timestamps = [];
|
|
71
|
+
}
|
|
72
|
+
isRateLimited() {
|
|
73
|
+
const now = Date.now();
|
|
74
|
+
this.timestamps = this.timestamps.filter((t) => now - t < this.windowMs);
|
|
75
|
+
if (this.timestamps.length >= this.limit)
|
|
76
|
+
return true;
|
|
77
|
+
this.timestamps.push(now);
|
|
78
|
+
return false;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
64
81
|
let TaskBrokerServer = class TaskBrokerServer {
|
|
65
82
|
get port() {
|
|
66
83
|
return this.server?.address()?.port;
|
|
@@ -68,34 +85,56 @@ let TaskBrokerServer = class TaskBrokerServer {
|
|
|
68
85
|
get upgradeEndpoint() {
|
|
69
86
|
return `${this.getEndpointBasePath()}/_ws`;
|
|
70
87
|
}
|
|
71
|
-
constructor(logger, globalConfig, authController, taskBrokerWsServer) {
|
|
88
|
+
constructor(logger, globalConfig, authController, taskBrokerWsServer, errorReporter) {
|
|
72
89
|
this.logger = logger;
|
|
73
90
|
this.globalConfig = globalConfig;
|
|
74
91
|
this.authController = authController;
|
|
75
92
|
this.taskBrokerWsServer = taskBrokerWsServer;
|
|
76
|
-
this.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
93
|
+
this.errorReporter = errorReporter;
|
|
94
|
+
this.upgradeRateLimiter = new SlidingWindowRateLimiter(1 * constants_1.Time.seconds.toMilliseconds, 5);
|
|
95
|
+
this.handleUpgradeRequest = async (request, socket, head) => {
|
|
96
|
+
try {
|
|
97
|
+
const parsedUrl = (0, node_url_1.parse)(request.url, true);
|
|
98
|
+
if (parsedUrl.pathname !== this.upgradeEndpoint) {
|
|
99
|
+
this.failUpgradeRequest(socket, 404);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
if (this.upgradeRateLimiter.isRateLimited()) {
|
|
103
|
+
this.failUpgradeRequest(socket, 429);
|
|
104
|
+
return;
|
|
105
|
+
}
|
|
106
|
+
if (!this.wsServer) {
|
|
107
|
+
this.failUpgradeRequest(socket, 503);
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
const runnerId = typeof parsedUrl.query.id === 'string' ? parsedUrl.query.id : undefined;
|
|
111
|
+
if (!runnerId) {
|
|
112
|
+
this.logger.warn('Task runner connection attempt failed: missing runner ID in query parameters');
|
|
113
|
+
this.failUpgradeRequest(socket, 400);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
const result = await this.authController.validateUpgradeRequest(request.headers.authorization);
|
|
117
|
+
if (!result.isValid) {
|
|
118
|
+
this.logger.warn(`Task runner connection attempt failed: ${result.reason}`, { runnerId });
|
|
119
|
+
this.failUpgradeRequest(socket, result.statusCode);
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
if (!this.wsServer) {
|
|
123
|
+
this.failUpgradeRequest(socket, 503);
|
|
124
|
+
return;
|
|
125
|
+
}
|
|
126
|
+
const wsServer = this.wsServer;
|
|
127
|
+
wsServer.handleUpgrade(request, socket, head, (ws) => {
|
|
128
|
+
request.ws = ws;
|
|
129
|
+
this.taskBrokerWsServer.add(runnerId, ws);
|
|
130
|
+
});
|
|
81
131
|
}
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
132
|
+
catch (error) {
|
|
133
|
+
this.errorReporter.error(error, {
|
|
134
|
+
extra: { requestUrl: request.url },
|
|
135
|
+
});
|
|
136
|
+
this.failUpgradeRequest(socket, 500);
|
|
86
137
|
}
|
|
87
|
-
this.wsServer.handleUpgrade(request, socket, head, (ws) => {
|
|
88
|
-
request.ws = ws;
|
|
89
|
-
const response = new node_http_1.ServerResponse(request);
|
|
90
|
-
response.writeHead = (statusCode) => {
|
|
91
|
-
if (statusCode > 200) {
|
|
92
|
-
this.logger.error(`Task runner connection attempt failed with status code ${statusCode}`);
|
|
93
|
-
ws.close();
|
|
94
|
-
}
|
|
95
|
-
return response;
|
|
96
|
-
};
|
|
97
|
-
this.app.handle(request, response);
|
|
98
|
-
});
|
|
99
138
|
};
|
|
100
139
|
this.app = (0, express_1.default)();
|
|
101
140
|
this.app.disable('x-powered-by');
|
|
@@ -166,18 +205,21 @@ let TaskBrokerServer = class TaskBrokerServer {
|
|
|
166
205
|
this.app.use(middlewares_1.bodyParser);
|
|
167
206
|
}
|
|
168
207
|
configureRoutes() {
|
|
169
|
-
const
|
|
208
|
+
const authEndpoint = `${this.getEndpointBasePath()}/auth`;
|
|
209
|
+
this.app.post(authEndpoint, (0, express_rate_limit_1.rateLimit)({
|
|
170
210
|
windowMs: 1000,
|
|
171
211
|
limit: 5,
|
|
172
212
|
message: { message: 'Too many requests' },
|
|
173
|
-
});
|
|
174
|
-
this.app.use(this.upgradeEndpoint, createRateLimiter(), this.authController.authMiddleware, (req, res) => this.taskBrokerWsServer.handleRequest(req, res));
|
|
175
|
-
const authEndpoint = `${this.getEndpointBasePath()}/auth`;
|
|
176
|
-
this.app.post(authEndpoint, createRateLimiter(), (0, response_helper_1.send)(async (req) => await this.authController.createGrantToken(req)));
|
|
213
|
+
}), (0, response_helper_1.send)(async (req) => await this.authController.createGrantToken(req)));
|
|
177
214
|
this.app.get('/healthz', (_, res) => {
|
|
178
215
|
res.send({ status: 'ok' });
|
|
179
216
|
});
|
|
180
217
|
}
|
|
218
|
+
failUpgradeRequest(socket, statusCode) {
|
|
219
|
+
const statusMessage = node_http_1.STATUS_CODES[statusCode] ?? 'Error';
|
|
220
|
+
socket.write(`HTTP/1.1 ${statusCode} ${statusMessage}\r\n\r\n`);
|
|
221
|
+
socket.destroy();
|
|
222
|
+
}
|
|
181
223
|
getEndpointBasePath() {
|
|
182
224
|
let path = this.globalConfig.taskRunners.path;
|
|
183
225
|
if (!path.startsWith('/')) {
|
|
@@ -195,6 +237,7 @@ exports.TaskBrokerServer = TaskBrokerServer = __decorate([
|
|
|
195
237
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
196
238
|
config_1.GlobalConfig,
|
|
197
239
|
task_broker_auth_controller_1.TaskBrokerAuthController,
|
|
198
|
-
task_broker_ws_server_1.TaskBrokerWsServer
|
|
240
|
+
task_broker_ws_server_1.TaskBrokerWsServer,
|
|
241
|
+
n8n_core_1.ErrorReporter])
|
|
199
242
|
], TaskBrokerServer);
|
|
200
243
|
//# sourceMappingURL=task-broker-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-broker-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAqD;AACrD,wCAA2C;AAC3C,gCAAkC;AAClC,8DAAsC;AACtC,sDAA8B;AAC9B,2DAAmE;AACnE,sDAAwC;AACxC,6CAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"task-broker-server.js","sourceRoot":"","sources":["../../../src/task-runners/task-broker/task-broker-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,12 +12,12 @@ export declare class TaskBrokerWsServer {
|
|
|
12
12
|
private readonly logger;
|
|
13
13
|
private readonly taskBroker;
|
|
14
14
|
private disconnectAnalyzer;
|
|
15
|
-
private readonly
|
|
15
|
+
private readonly taskRunnersConfig;
|
|
16
16
|
private readonly runnerLifecycleEvents;
|
|
17
17
|
private readonly globalConfig;
|
|
18
18
|
runnerConnections: Map<TaskRunner['id'], WebSocket>;
|
|
19
19
|
private heartbeatTimer;
|
|
20
|
-
constructor(logger: Logger, taskBroker: TaskBroker, disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer,
|
|
20
|
+
constructor(logger: Logger, taskBroker: TaskBroker, disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer, taskRunnersConfig: TaskRunnersConfig, runnerLifecycleEvents: TaskRunnerLifecycleEvents, globalConfig: GlobalConfig);
|
|
21
21
|
start(): void;
|
|
22
22
|
private startHeartbeatChecks;
|
|
23
23
|
stop(): Promise<void>;
|
|
@@ -23,11 +23,11 @@ function heartbeat() {
|
|
|
23
23
|
this.isAlive = true;
|
|
24
24
|
}
|
|
25
25
|
let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
26
|
-
constructor(logger, taskBroker, disconnectAnalyzer,
|
|
26
|
+
constructor(logger, taskBroker, disconnectAnalyzer, taskRunnersConfig, runnerLifecycleEvents, globalConfig) {
|
|
27
27
|
this.logger = logger;
|
|
28
28
|
this.taskBroker = taskBroker;
|
|
29
29
|
this.disconnectAnalyzer = disconnectAnalyzer;
|
|
30
|
-
this.
|
|
30
|
+
this.taskRunnersConfig = taskRunnersConfig;
|
|
31
31
|
this.runnerLifecycleEvents = runnerLifecycleEvents;
|
|
32
32
|
this.globalConfig = globalConfig;
|
|
33
33
|
this.runnerConnections = new Map();
|
|
@@ -36,7 +36,7 @@ let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
|
36
36
|
this.startHeartbeatChecks();
|
|
37
37
|
}
|
|
38
38
|
startHeartbeatChecks() {
|
|
39
|
-
const { heartbeatInterval } = this.
|
|
39
|
+
const { heartbeatInterval } = this.taskRunnersConfig;
|
|
40
40
|
if (heartbeatInterval <= 0) {
|
|
41
41
|
throw new n8n_workflow_1.UserError('Heartbeat interval must be greater than 0');
|
|
42
42
|
}
|
|
@@ -120,7 +120,7 @@ let TaskBrokerWsServer = class TaskBrokerWsServer {
|
|
|
120
120
|
const disconnectError = await this.disconnectAnalyzer.toDisconnectError({
|
|
121
121
|
runnerId: id,
|
|
122
122
|
reason,
|
|
123
|
-
heartbeatInterval: this.
|
|
123
|
+
heartbeatInterval: this.taskRunnersConfig.heartbeatInterval,
|
|
124
124
|
});
|
|
125
125
|
this.taskBroker.deregisterRunner(id, disconnectError);
|
|
126
126
|
this.logger.debug(`Deregistered runner "${id}"`);
|
|
@@ -34,7 +34,7 @@ export declare class WorkflowExecutionService {
|
|
|
34
34
|
} | {
|
|
35
35
|
waitingForWebhook: boolean;
|
|
36
36
|
}>;
|
|
37
|
-
executeChatWorkflow(user: User, workflowData: IWorkflowBase, executionData: IRunExecutionData, httpResponse?: Response, streamingEnabled?: boolean, executionMode?: WorkflowExecuteMode): Promise<{
|
|
37
|
+
executeChatWorkflow(user: User, workflowData: IWorkflowBase, executionData: IRunExecutionData, httpResponse?: Response, streamingEnabled?: boolean, executionMode?: WorkflowExecuteMode, pushRef?: string): Promise<{
|
|
38
38
|
executionId: string;
|
|
39
39
|
}>;
|
|
40
40
|
executeErrorWorkflow(workflowId: string, workflowErrorData: IWorkflowErrorData, runningProject: Project): Promise<void>;
|
|
@@ -211,7 +211,7 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
211
211
|
extra: { payload },
|
|
212
212
|
});
|
|
213
213
|
}
|
|
214
|
-
async executeChatWorkflow(user, workflowData, executionData, httpResponse, streamingEnabled, executionMode = 'chat') {
|
|
214
|
+
async executeChatWorkflow(user, workflowData, executionData, httpResponse, streamingEnabled, executionMode = 'chat', pushRef) {
|
|
215
215
|
const data = {
|
|
216
216
|
userId: user.id,
|
|
217
217
|
executionMode,
|
|
@@ -219,6 +219,7 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
219
219
|
executionData,
|
|
220
220
|
streamingEnabled,
|
|
221
221
|
httpResponse,
|
|
222
|
+
pushRef,
|
|
222
223
|
};
|
|
223
224
|
const executionId = await this.workflowRunner.run(data, undefined, true);
|
|
224
225
|
this.eventService.emit('workflow-executed', {
|