n8n 1.112.5 → 1.113.1
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/active-executions.d.ts +3 -1
- package/dist/active-executions.js +6 -2
- package/dist/active-executions.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/chat/chat-execution-manager.js +7 -1
- package/dist/chat/chat-execution-manager.js.map +1 -1
- package/dist/commands/export/entities.d.ts +14 -0
- package/dist/commands/export/entities.js +46 -0
- package/dist/commands/export/entities.js.map +1 -0
- package/dist/commands/import/entities.d.ts +14 -0
- package/dist/commands/import/entities.js +47 -0
- package/dist/commands/import/entities.js.map +1 -0
- package/dist/controllers/me.controller.d.ts +1 -0
- package/dist/controllers/me.controller.js +50 -21
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/role.controller.d.ts +3 -3
- package/dist/controllers/role.controller.js +9 -6
- package/dist/controllers/role.controller.js.map +1 -1
- package/dist/credentials/credentials-finder.service.d.ts +3 -1
- package/dist/credentials/credentials-finder.service.js +23 -10
- package/dist/credentials/credentials-finder.service.js.map +1 -1
- package/dist/credentials/credentials.service.ee.d.ts +3 -1
- package/dist/credentials/credentials.service.ee.js +7 -3
- package/dist/credentials/credentials.service.ee.js.map +1 -1
- package/dist/credentials/credentials.service.js +2 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/deprecation/deprecation.service.js +5 -0
- package/dist/deprecation/deprecation.service.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-resource-helper.d.ts +4 -0
- package/dist/environments.ee/source-control/source-control-resource-helper.js +21 -0
- package/dist/environments.ee/source-control/source-control-resource-helper.js.map +1 -0
- package/dist/environments.ee/source-control/source-control-status.service.ee.d.ts +79 -0
- package/dist/environments.ee/source-control/source-control-status.service.ee.js +439 -0
- package/dist/environments.ee/source-control/source-control-status.service.ee.js.map +1 -0
- package/dist/environments.ee/source-control/source-control.service.ee.d.ts +22 -40
- package/dist/environments.ee/source-control/source-control.service.ee.js +23 -428
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +13 -4
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +3 -0
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +7 -3
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/executions/execution.service.d.ts +5 -2
- package/dist/executions/execution.service.js +46 -24
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/executions.controller.d.ts +5 -0
- package/dist/executions/executions.controller.js +16 -4
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/modules/data-table/data-store-aggregate.controller.d.ts +1 -4
- package/dist/modules/data-table/data-store-aggregate.controller.js +3 -3
- package/dist/modules/data-table/data-store-aggregate.controller.js.map +1 -1
- package/dist/modules/data-table/data-store-proxy.service.d.ts +4 -0
- package/dist/modules/data-table/data-store-proxy.service.js +11 -1
- package/dist/modules/data-table/data-store-proxy.service.js.map +1 -1
- package/dist/modules/data-table/data-store-rows.repository.js +12 -2
- package/dist/modules/data-table/data-store-rows.repository.js.map +1 -1
- package/dist/modules/data-table/data-store-size-validator.service.d.ts +5 -5
- package/dist/modules/data-table/data-store-size-validator.service.js +16 -15
- package/dist/modules/data-table/data-store-size-validator.service.js.map +1 -1
- package/dist/modules/data-table/data-store.controller.js +1 -1
- package/dist/modules/data-table/data-store.controller.js.map +1 -1
- package/dist/modules/data-table/data-store.repository.d.ts +6 -2
- package/dist/modules/data-table/data-store.repository.js +117 -31
- package/dist/modules/data-table/data-store.repository.js.map +1 -1
- package/dist/modules/data-table/data-store.service.d.ts +8 -6
- package/dist/modules/data-table/data-store.service.js +51 -20
- package/dist/modules/data-table/data-store.service.js.map +1 -1
- package/dist/modules/data-table/utils/sql-utils.d.ts +2 -0
- package/dist/modules/data-table/utils/sql-utils.js +7 -2
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.d.ts +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +22 -9
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +6 -3
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js +21 -8
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js.map +1 -1
- package/dist/modules/insights/insights.controller.d.ts +1 -1
- package/dist/modules/insights/insights.controller.js +6 -2
- package/dist/modules/insights/insights.controller.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +6 -3
- package/dist/modules/insights/insights.service.js +6 -3
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/permissions.ee/check-access.js +6 -3
- package/dist/permissions.ee/check-access.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +1 -1
- package/dist/scaling/constants.d.ts +2 -2
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +1 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -1
- package/dist/services/export.service.d.ts +9 -0
- package/dist/services/export.service.js +107 -0
- package/dist/services/export.service.js.map +1 -0
- package/dist/services/frontend.service.js +1 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +4 -2
- package/dist/services/project.service.ee.js +19 -4
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/role-cache.service.d.ts +14 -0
- package/dist/services/role-cache.service.js +79 -0
- package/dist/services/role-cache.service.js.map +1 -0
- package/dist/services/role.service.d.ts +16 -4
- package/dist/services/role.service.js +30 -7
- package/dist/services/role.service.js.map +1 -1
- package/dist/sso.ee/saml/saml.service.ee.d.ts +8 -3
- package/dist/sso.ee/saml/saml.service.ee.js +49 -5
- package/dist/sso.ee/saml/saml.service.ee.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.d.ts +5 -0
- package/dist/task-runners/task-managers/task-requester.js +42 -0
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/dist/task-runners/task-runner-module.d.ts +3 -1
- package/dist/task-runners/task-runner-module.js +8 -2
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/utils/get-item-count-by-connection-type.d.ts +2 -0
- package/dist/utils/get-item-count-by-connection-type.js +20 -0
- package/dist/utils/get-item-count-by-connection-type.js.map +1 -0
- package/dist/webhooks/webhook-request-handler.js +4 -26
- package/dist/webhooks/webhook-request-handler.js.map +1 -1
- package/dist/workflows/workflow-finder.service.d.ts +3 -1
- package/dist/workflows/workflow-finder.service.js +13 -6
- package/dist/workflows/workflow-finder.service.js.map +1 -1
- package/dist/workflows/workflow-sharing.service.js +6 -2
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/dist/workflows/workflows.controller.js +1 -1
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +27 -27
|
@@ -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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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Logger } from '@n8n/backend-common';
|
|
2
|
+
import { type Scope } from '@n8n/permissions';
|
|
3
|
+
import { CacheService } from './cache/cache.service';
|
|
4
|
+
export declare class RoleCacheService {
|
|
5
|
+
private readonly cacheService;
|
|
6
|
+
private readonly logger;
|
|
7
|
+
private static readonly CACHE_KEY;
|
|
8
|
+
private static readonly CACHE_TTL;
|
|
9
|
+
constructor(cacheService: CacheService, logger: Logger);
|
|
10
|
+
private buildRoleScopeMap;
|
|
11
|
+
getRolesWithAllScopes(namespace: 'global' | 'project' | 'credential' | 'workflow', requiredScopes: Scope[]): Promise<string[]>;
|
|
12
|
+
invalidateCache(): Promise<void>;
|
|
13
|
+
refreshCache(): Promise<void>;
|
|
14
|
+
}
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
var RoleCacheService_1;
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
exports.RoleCacheService = void 0;
|
|
14
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
15
|
+
const constants_1 = require("@n8n/constants");
|
|
16
|
+
const db_1 = require("@n8n/db");
|
|
17
|
+
const di_1 = require("@n8n/di");
|
|
18
|
+
const permissions_1 = require("@n8n/permissions");
|
|
19
|
+
const cache_service_1 = require("./cache/cache.service");
|
|
20
|
+
let RoleCacheService = RoleCacheService_1 = class RoleCacheService {
|
|
21
|
+
constructor(cacheService, logger) {
|
|
22
|
+
this.cacheService = cacheService;
|
|
23
|
+
this.logger = logger;
|
|
24
|
+
}
|
|
25
|
+
async buildRoleScopeMap() {
|
|
26
|
+
try {
|
|
27
|
+
const roleRepository = di_1.Container.get(db_1.RoleRepository);
|
|
28
|
+
const roles = await roleRepository.findAll();
|
|
29
|
+
const roleScopeMap = {};
|
|
30
|
+
for (const role of roles) {
|
|
31
|
+
roleScopeMap[role.roleType] ??= {};
|
|
32
|
+
roleScopeMap[role.roleType][role.slug] = {
|
|
33
|
+
scopes: role.scopes.map((s) => s.slug),
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
return roleScopeMap;
|
|
37
|
+
}
|
|
38
|
+
catch (error) {
|
|
39
|
+
this.logger.error('Failed to build role scope from database', { error });
|
|
40
|
+
throw error;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
async getRolesWithAllScopes(namespace, requiredScopes) {
|
|
44
|
+
if (requiredScopes.length === 0)
|
|
45
|
+
return [];
|
|
46
|
+
const roleScopeMap = await this.cacheService.get(RoleCacheService_1.CACHE_KEY, {
|
|
47
|
+
refreshFn: async () => await this.buildRoleScopeMap(),
|
|
48
|
+
fallbackValue: undefined,
|
|
49
|
+
});
|
|
50
|
+
if (roleScopeMap === undefined) {
|
|
51
|
+
this.logger.error('Role scope map is undefined, falling back to static roles');
|
|
52
|
+
return (0, permissions_1.staticRolesWithScope)(namespace, requiredScopes);
|
|
53
|
+
}
|
|
54
|
+
const matchingRoles = [];
|
|
55
|
+
for (const [roleSlug, roleInfo] of Object.entries(roleScopeMap[namespace] ?? {})) {
|
|
56
|
+
const hasAllScopes = requiredScopes.every((scope) => roleInfo.scopes.includes(scope));
|
|
57
|
+
if (hasAllScopes) {
|
|
58
|
+
matchingRoles.push(roleSlug);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return matchingRoles;
|
|
62
|
+
}
|
|
63
|
+
async invalidateCache() {
|
|
64
|
+
await this.cacheService.delete(RoleCacheService_1.CACHE_KEY);
|
|
65
|
+
}
|
|
66
|
+
async refreshCache() {
|
|
67
|
+
const roleScopeMap = await this.buildRoleScopeMap();
|
|
68
|
+
await this.cacheService.set(RoleCacheService_1.CACHE_KEY, roleScopeMap, RoleCacheService_1.CACHE_TTL);
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
exports.RoleCacheService = RoleCacheService;
|
|
72
|
+
RoleCacheService.CACHE_KEY = 'roles:scope-map';
|
|
73
|
+
RoleCacheService.CACHE_TTL = 5 * constants_1.Time.minutes.toMilliseconds;
|
|
74
|
+
exports.RoleCacheService = RoleCacheService = RoleCacheService_1 = __decorate([
|
|
75
|
+
(0, di_1.Service)(),
|
|
76
|
+
__metadata("design:paramtypes", [cache_service_1.CacheService,
|
|
77
|
+
backend_common_1.Logger])
|
|
78
|
+
], RoleCacheService);
|
|
79
|
+
//# sourceMappingURL=role-cache.service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"role-cache.service.js","sourceRoot":"","sources":["../../src/services/role-cache.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,17 @@
|
|
|
1
1
|
import { CreateRoleDto, UpdateRoleDto } from '@n8n/api-types';
|
|
2
2
|
import { LicenseState } from '@n8n/backend-common';
|
|
3
3
|
import { CredentialsEntity, SharedCredentials, SharedWorkflow, User, ListQueryDb, ScopesField, ProjectRelation, RoleRepository, ScopeRepository } from '@n8n/db';
|
|
4
|
-
import type { Scope, Role as RoleDTO, AssignableProjectRole } from '@n8n/permissions';
|
|
4
|
+
import type { Scope, Role as RoleDTO, AssignableProjectRole, RoleNamespace } from '@n8n/permissions';
|
|
5
|
+
import { RoleCacheService } from './role-cache.service';
|
|
5
6
|
export declare class RoleService {
|
|
6
7
|
private readonly license;
|
|
7
8
|
private readonly roleRepository;
|
|
8
9
|
private readonly scopeRepository;
|
|
9
|
-
|
|
10
|
+
private readonly roleCacheService;
|
|
11
|
+
constructor(license: LicenseState, roleRepository: RoleRepository, scopeRepository: ScopeRepository, roleCacheService: RoleCacheService);
|
|
10
12
|
private dbRoleToRoleDTO;
|
|
11
|
-
getAllRoles(): Promise<RoleDTO[]>;
|
|
12
|
-
getRole(slug: string): Promise<RoleDTO>;
|
|
13
|
+
getAllRoles(withCount?: boolean): Promise<RoleDTO[]>;
|
|
14
|
+
getRole(slug: string, withCount?: boolean): Promise<RoleDTO>;
|
|
13
15
|
removeCustomRole(slug: string): Promise<{
|
|
14
16
|
displayName: string;
|
|
15
17
|
description: string | null;
|
|
@@ -18,6 +20,9 @@ export declare class RoleService {
|
|
|
18
20
|
roleType: "credential" | "project" | "workflow" | "global";
|
|
19
21
|
licensed: boolean;
|
|
20
22
|
scopes: string[];
|
|
23
|
+
createdAt?: Date | undefined;
|
|
24
|
+
updatedAt?: Date | undefined;
|
|
25
|
+
usedByUsers?: number | undefined;
|
|
21
26
|
}>;
|
|
22
27
|
private resolveScopes;
|
|
23
28
|
updateCustomRole(slug: string, newData: UpdateRoleDto): Promise<{
|
|
@@ -28,6 +33,9 @@ export declare class RoleService {
|
|
|
28
33
|
roleType: "credential" | "project" | "workflow" | "global";
|
|
29
34
|
licensed: boolean;
|
|
30
35
|
scopes: string[];
|
|
36
|
+
createdAt?: Date | undefined;
|
|
37
|
+
updatedAt?: Date | undefined;
|
|
38
|
+
usedByUsers?: number | undefined;
|
|
31
39
|
}>;
|
|
32
40
|
createCustomRole(newRole: CreateRoleDto): Promise<{
|
|
33
41
|
displayName: string;
|
|
@@ -37,11 +45,15 @@ export declare class RoleService {
|
|
|
37
45
|
roleType: "credential" | "project" | "workflow" | "global";
|
|
38
46
|
licensed: boolean;
|
|
39
47
|
scopes: string[];
|
|
48
|
+
createdAt?: Date | undefined;
|
|
49
|
+
updatedAt?: Date | undefined;
|
|
50
|
+
usedByUsers?: number | undefined;
|
|
40
51
|
}>;
|
|
41
52
|
checkRolesExist(roleSlugs: string[], roleType: 'global' | 'project' | 'workflow' | 'credential'): Promise<void>;
|
|
42
53
|
addScopes(rawWorkflow: ListQueryDb.Workflow.WithSharing | ListQueryDb.Workflow.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQueryDb.Workflow.WithScopes;
|
|
43
54
|
addScopes(rawCredential: CredentialsEntity, user: User, userProjectRelations: ProjectRelation[]): CredentialsEntity & ScopesField;
|
|
44
55
|
addScopes(rawCredential: ListQueryDb.Credentials.WithSharing | ListQueryDb.Credentials.WithOwnedByAndSharedWith, user: User, userProjectRelations: ProjectRelation[]): ListQueryDb.Credentials.WithScopes;
|
|
45
56
|
combineResourceScopes(type: 'workflow' | 'credential', user: User, shared: SharedCredentials[] | SharedWorkflow[], userProjectRelations: ProjectRelation[]): Scope[];
|
|
57
|
+
rolesWithScope(namespace: RoleNamespace, scopes: Scope | Scope[]): Promise<string[]>;
|
|
46
58
|
isRoleLicensed(role: AssignableProjectRole): boolean;
|
|
47
59
|
}
|
|
@@ -17,27 +17,40 @@ const permissions_1 = require("@n8n/permissions");
|
|
|
17
17
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
18
18
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
19
19
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
20
|
+
const role_cache_service_1 = require("./role-cache.service");
|
|
20
21
|
let RoleService = class RoleService {
|
|
21
|
-
constructor(license, roleRepository, scopeRepository) {
|
|
22
|
+
constructor(license, roleRepository, scopeRepository, roleCacheService) {
|
|
22
23
|
this.license = license;
|
|
23
24
|
this.roleRepository = roleRepository;
|
|
24
25
|
this.scopeRepository = scopeRepository;
|
|
26
|
+
this.roleCacheService = roleCacheService;
|
|
25
27
|
}
|
|
26
|
-
dbRoleToRoleDTO(role) {
|
|
28
|
+
dbRoleToRoleDTO(role, usedByUsers) {
|
|
27
29
|
return {
|
|
28
30
|
...role,
|
|
29
31
|
scopes: role.scopes.map((s) => s.slug),
|
|
30
32
|
licensed: this.isRoleLicensed(role.slug),
|
|
33
|
+
usedByUsers,
|
|
31
34
|
};
|
|
32
35
|
}
|
|
33
|
-
async getAllRoles() {
|
|
36
|
+
async getAllRoles(withCount = false) {
|
|
34
37
|
const roles = await this.roleRepository.findAll();
|
|
35
|
-
|
|
38
|
+
if (!withCount) {
|
|
39
|
+
return roles.map((r) => this.dbRoleToRoleDTO(r));
|
|
40
|
+
}
|
|
41
|
+
const roleCounts = await this.roleRepository.findAllRoleCounts();
|
|
42
|
+
return roles.map((role) => {
|
|
43
|
+
const usedByUsers = roleCounts[role.slug] ?? 0;
|
|
44
|
+
return this.dbRoleToRoleDTO(role, usedByUsers);
|
|
45
|
+
});
|
|
36
46
|
}
|
|
37
|
-
async getRole(slug) {
|
|
47
|
+
async getRole(slug, withCount = false) {
|
|
38
48
|
const role = await this.roleRepository.findBySlug(slug);
|
|
39
49
|
if (role) {
|
|
40
|
-
|
|
50
|
+
const usedByUsers = withCount
|
|
51
|
+
? await this.roleRepository.countUsersWithRole(role)
|
|
52
|
+
: undefined;
|
|
53
|
+
return this.dbRoleToRoleDTO(role, usedByUsers);
|
|
41
54
|
}
|
|
42
55
|
throw new not_found_error_1.NotFoundError('Role not found');
|
|
43
56
|
}
|
|
@@ -50,6 +63,7 @@ let RoleService = class RoleService {
|
|
|
50
63
|
throw new bad_request_error_1.BadRequestError('Cannot delete system roles');
|
|
51
64
|
}
|
|
52
65
|
await this.roleRepository.removeBySlug(slug);
|
|
66
|
+
await this.roleCacheService.invalidateCache();
|
|
53
67
|
return this.dbRoleToRoleDTO(role);
|
|
54
68
|
}
|
|
55
69
|
async resolveScopes(scopeSlugs) {
|
|
@@ -74,6 +88,7 @@ let RoleService = class RoleService {
|
|
|
74
88
|
description,
|
|
75
89
|
scopes: await this.resolveScopes(scopeSlugs),
|
|
76
90
|
});
|
|
91
|
+
await this.roleCacheService.invalidateCache();
|
|
77
92
|
return this.dbRoleToRoleDTO(updatedRole);
|
|
78
93
|
}
|
|
79
94
|
catch (error) {
|
|
@@ -100,6 +115,7 @@ let RoleService = class RoleService {
|
|
|
100
115
|
role.roleType = newRole.roleType;
|
|
101
116
|
role.slug = `${newRole.roleType}:${newRole.displayName.toLowerCase().replace(/[^a-z0-9]+/g, '-')}-${Math.random().toString(36).substring(2, 8)}`;
|
|
102
117
|
const createdRole = await this.roleRepository.save(role);
|
|
118
|
+
await this.roleCacheService.invalidateCache();
|
|
103
119
|
return this.dbRoleToRoleDTO(createdRole);
|
|
104
120
|
}
|
|
105
121
|
async checkRolesExist(roleSlugs, roleType) {
|
|
@@ -143,6 +159,12 @@ let RoleService = class RoleService {
|
|
|
143
159
|
}
|
|
144
160
|
return [...scopesSet].sort();
|
|
145
161
|
}
|
|
162
|
+
async rolesWithScope(namespace, scopes) {
|
|
163
|
+
if (!Array.isArray(scopes)) {
|
|
164
|
+
scopes = [scopes];
|
|
165
|
+
}
|
|
166
|
+
return await this.roleCacheService.getRolesWithAllScopes(namespace, scopes);
|
|
167
|
+
}
|
|
146
168
|
isRoleLicensed(role) {
|
|
147
169
|
if (!(0, permissions_1.isBuiltInRole)(role)) {
|
|
148
170
|
return this.license.isCustomRolesLicensed();
|
|
@@ -166,6 +188,7 @@ exports.RoleService = RoleService = __decorate([
|
|
|
166
188
|
(0, di_1.Service)(),
|
|
167
189
|
__metadata("design:paramtypes", [backend_common_1.LicenseState,
|
|
168
190
|
db_1.RoleRepository,
|
|
169
|
-
db_1.ScopeRepository
|
|
191
|
+
db_1.ScopeRepository,
|
|
192
|
+
role_cache_service_1.RoleCacheService])
|
|
170
193
|
], RoleService);
|
|
171
194
|
//# sourceMappingURL=role.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAAmD;AACnD,gCAaiB;AACjB,gCAAkC;
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Logger } from '@n8n/backend-common';
|
|
|
3
3
|
import type { User } from '@n8n/db';
|
|
4
4
|
import { SettingsRepository, UserRepository } from '@n8n/db';
|
|
5
5
|
import type express from 'express';
|
|
6
|
+
import { InstanceSettings } from 'n8n-core';
|
|
6
7
|
import { type IdentityProviderInstance, type ServiceProviderInstance } from 'samlify';
|
|
7
8
|
import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
|
|
8
9
|
import { UrlService } from '../../services/url.service';
|
|
@@ -14,11 +15,12 @@ export declare class SamlService {
|
|
|
14
15
|
private readonly validator;
|
|
15
16
|
private readonly userRepository;
|
|
16
17
|
private readonly settingsRepository;
|
|
18
|
+
private readonly instanceSettings;
|
|
17
19
|
private identityProviderInstance;
|
|
18
20
|
private samlify;
|
|
19
21
|
private _samlPreferences;
|
|
20
22
|
get samlPreferences(): SamlPreferences;
|
|
21
|
-
constructor(logger: Logger, urlService: UrlService, validator: SamlValidator, userRepository: UserRepository, settingsRepository: SettingsRepository);
|
|
23
|
+
constructor(logger: Logger, urlService: UrlService, validator: SamlValidator, userRepository: UserRepository, settingsRepository: SettingsRepository, instanceSettings: InstanceSettings);
|
|
22
24
|
init(): Promise<void>;
|
|
23
25
|
loadSamlify(): Promise<void>;
|
|
24
26
|
getIdentityProviderInstance(forceRecreate?: boolean): IdentityProviderInstance;
|
|
@@ -34,9 +36,12 @@ export declare class SamlService {
|
|
|
34
36
|
attributes: SamlUserAttributes;
|
|
35
37
|
onboardingRequired: boolean;
|
|
36
38
|
}>;
|
|
37
|
-
|
|
39
|
+
private broadcastReloadSAMLConfigurationCommand;
|
|
40
|
+
private isReloading;
|
|
41
|
+
reload(): Promise<void>;
|
|
42
|
+
setSamlPreferences(prefs: Partial<SamlPreferences>, tryFallback?: boolean, broadcastReload?: boolean): Promise<SamlPreferences | undefined>;
|
|
38
43
|
loadPreferencesWithoutValidation(prefs: Partial<SamlPreferences>): Promise<void>;
|
|
39
|
-
loadFromDbAndApplySamlPreferences(apply?: boolean): Promise<SamlPreferences | undefined>;
|
|
44
|
+
loadFromDbAndApplySamlPreferences(apply?: boolean, broadcastReload?: boolean): Promise<SamlPreferences | undefined>;
|
|
40
45
|
saveSamlPreferencesToDb(): Promise<SamlPreferences | undefined>;
|
|
41
46
|
fetchMetadataFromUrl(): Promise<string | undefined>;
|
|
42
47
|
getAttributesFromLoginResponse(req: express.Request, binding: SamlLoginBinding): Promise<SamlUserAttributes>;
|
|
@@ -47,10 +47,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
48
|
exports.SamlService = void 0;
|
|
49
49
|
const backend_common_1 = require("@n8n/backend-common");
|
|
50
|
+
const config_1 = require("@n8n/config");
|
|
50
51
|
const db_1 = require("@n8n/db");
|
|
52
|
+
const decorators_1 = require("@n8n/decorators");
|
|
51
53
|
const di_1 = require("@n8n/di");
|
|
52
54
|
const axios_1 = __importDefault(require("axios"));
|
|
53
55
|
const https_1 = __importDefault(require("https"));
|
|
56
|
+
const n8n_core_1 = require("n8n-core");
|
|
54
57
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
55
58
|
const auth_error_1 = require("../../errors/response-errors/auth.error");
|
|
56
59
|
const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
|
|
@@ -70,12 +73,13 @@ let SamlService = class SamlService {
|
|
|
70
73
|
loginLabel: (0, saml_helpers_1.getSamlLoginLabel)(),
|
|
71
74
|
};
|
|
72
75
|
}
|
|
73
|
-
constructor(logger, urlService, validator, userRepository, settingsRepository) {
|
|
76
|
+
constructor(logger, urlService, validator, userRepository, settingsRepository, instanceSettings) {
|
|
74
77
|
this.logger = logger;
|
|
75
78
|
this.urlService = urlService;
|
|
76
79
|
this.validator = validator;
|
|
77
80
|
this.userRepository = userRepository;
|
|
78
81
|
this.settingsRepository = settingsRepository;
|
|
82
|
+
this.instanceSettings = instanceSettings;
|
|
79
83
|
this._samlPreferences = {
|
|
80
84
|
mapping: {
|
|
81
85
|
email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
|
|
@@ -102,6 +106,7 @@ let SamlService = class SamlService {
|
|
|
102
106
|
},
|
|
103
107
|
},
|
|
104
108
|
};
|
|
109
|
+
this.isReloading = false;
|
|
105
110
|
}
|
|
106
111
|
async init() {
|
|
107
112
|
try {
|
|
@@ -231,7 +236,36 @@ let SamlService = class SamlService {
|
|
|
231
236
|
onboardingRequired: false,
|
|
232
237
|
};
|
|
233
238
|
}
|
|
234
|
-
async
|
|
239
|
+
async broadcastReloadSAMLConfigurationCommand() {
|
|
240
|
+
if (this.instanceSettings.isMultiMain) {
|
|
241
|
+
const { Publisher } = await Promise.resolve().then(() => __importStar(require('../../scaling/pubsub/publisher.service')));
|
|
242
|
+
await di_1.Container.get(Publisher).publishCommand({ command: 'reload-saml-config' });
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
async reload() {
|
|
246
|
+
if (this.isReloading) {
|
|
247
|
+
this.logger.warn('SAML configuration reload already in progress');
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
this.isReloading = true;
|
|
251
|
+
try {
|
|
252
|
+
this.logger.debug('SAML configuration changed, starting to load it from the database');
|
|
253
|
+
await this.loadFromDbAndApplySamlPreferences(true, false);
|
|
254
|
+
await (0, sso_helpers_1.reloadAuthenticationMethod)();
|
|
255
|
+
const samlLoginEnabled = (0, saml_helpers_1.isSamlLoginEnabled)();
|
|
256
|
+
this.logger.debug(`SAML login is now ${samlLoginEnabled ? 'enabled' : 'disabled'}.`);
|
|
257
|
+
di_1.Container.get(config_1.GlobalConfig).sso.saml.loginEnabled = samlLoginEnabled;
|
|
258
|
+
}
|
|
259
|
+
catch (error) {
|
|
260
|
+
this.logger.error('SAML configuration changed, failed to reload SAML configuration', {
|
|
261
|
+
error,
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
finally {
|
|
265
|
+
this.isReloading = false;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
async setSamlPreferences(prefs, tryFallback = false, broadcastReload = true) {
|
|
235
269
|
await this.loadSamlify();
|
|
236
270
|
const previousMetadataUrl = this._samlPreferences.metadataUrl;
|
|
237
271
|
await this.loadPreferencesWithoutValidation(prefs);
|
|
@@ -272,6 +306,9 @@ let SamlService = class SamlService {
|
|
|
272
306
|
}
|
|
273
307
|
this.getIdentityProviderInstance(true);
|
|
274
308
|
const result = await this.saveSamlPreferencesToDb();
|
|
309
|
+
if (broadcastReload) {
|
|
310
|
+
await this.broadcastReloadSAMLConfigurationCommand();
|
|
311
|
+
}
|
|
275
312
|
return result;
|
|
276
313
|
}
|
|
277
314
|
async loadPreferencesWithoutValidation(prefs) {
|
|
@@ -298,7 +335,7 @@ let SamlService = class SamlService {
|
|
|
298
335
|
await (0, saml_helpers_1.setSamlLoginEnabled)(prefs.loginEnabled ?? (0, saml_helpers_1.isSamlLoginEnabled)());
|
|
299
336
|
(0, saml_helpers_1.setSamlLoginLabel)(prefs.loginLabel ?? (0, saml_helpers_1.getSamlLoginLabel)());
|
|
300
337
|
}
|
|
301
|
-
async loadFromDbAndApplySamlPreferences(apply = true) {
|
|
338
|
+
async loadFromDbAndApplySamlPreferences(apply = true, broadcastReload = true) {
|
|
302
339
|
const samlPreferences = await this.settingsRepository.findOne({
|
|
303
340
|
where: { key: constants_1.SAML_PREFERENCES_DB_KEY },
|
|
304
341
|
});
|
|
@@ -306,7 +343,7 @@ let SamlService = class SamlService {
|
|
|
306
343
|
const prefs = (0, n8n_workflow_1.jsonParse)(samlPreferences.value);
|
|
307
344
|
if (prefs) {
|
|
308
345
|
if (apply) {
|
|
309
|
-
await this.setSamlPreferences(prefs, true);
|
|
346
|
+
await this.setSamlPreferences(prefs, true, broadcastReload);
|
|
310
347
|
}
|
|
311
348
|
else {
|
|
312
349
|
await this.loadPreferencesWithoutValidation(prefs);
|
|
@@ -388,12 +425,19 @@ let SamlService = class SamlService {
|
|
|
388
425
|
}
|
|
389
426
|
};
|
|
390
427
|
exports.SamlService = SamlService;
|
|
428
|
+
__decorate([
|
|
429
|
+
(0, decorators_1.OnPubSubEvent)('reload-saml-config'),
|
|
430
|
+
__metadata("design:type", Function),
|
|
431
|
+
__metadata("design:paramtypes", []),
|
|
432
|
+
__metadata("design:returntype", Promise)
|
|
433
|
+
], SamlService.prototype, "reload", null);
|
|
391
434
|
exports.SamlService = SamlService = __decorate([
|
|
392
435
|
(0, di_1.Service)(),
|
|
393
436
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
394
437
|
url_service_1.UrlService,
|
|
395
438
|
saml_validator_1.SamlValidator,
|
|
396
439
|
db_1.UserRepository,
|
|
397
|
-
db_1.SettingsRepository
|
|
440
|
+
db_1.SettingsRepository,
|
|
441
|
+
n8n_core_1.InstanceSettings])
|
|
398
442
|
], SamlService);
|
|
399
443
|
//# sourceMappingURL=saml.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saml.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/saml/saml.service.ee.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"saml.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/saml/saml.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,13 @@ export declare abstract class TaskRequester {
|
|
|
30
30
|
}>;
|
|
31
31
|
tasks: Map<string, Task>;
|
|
32
32
|
private readonly dataResponseBuilder;
|
|
33
|
+
private readonly executionIdsToTaskIds;
|
|
33
34
|
constructor(nodeTypes: NodeTypes, eventService: EventService);
|
|
34
35
|
startTask<TData, TError>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<Result<TData, TError>>;
|
|
36
|
+
cancelTasks(executionId: string): void;
|
|
37
|
+
private getTaskIds;
|
|
38
|
+
private cancelTask;
|
|
39
|
+
private clearExecutionsMap;
|
|
35
40
|
sendMessage(_message: RequesterMessage.ToBroker.All): void;
|
|
36
41
|
onMessage(message: BrokerMessage.ToRequester.All): void;
|
|
37
42
|
taskReady(requestId: string, taskId: string): void;
|
|
@@ -27,6 +27,7 @@ let TaskRequester = class TaskRequester {
|
|
|
27
27
|
this.taskAcceptRejects = new Map();
|
|
28
28
|
this.tasks = new Map();
|
|
29
29
|
this.dataResponseBuilder = new data_request_response_builder_1.DataRequestResponseBuilder();
|
|
30
|
+
this.executionIdsToTaskIds = new Map();
|
|
30
31
|
}
|
|
31
32
|
async startTask(additionalData, taskType, settings, executeFunctions, inputData, node, workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, envProviderState, executeData, defaultReturnRunIndex = -1, selfData = {}, contextNodeName = activeNodeName) {
|
|
32
33
|
const data = {
|
|
@@ -72,6 +73,11 @@ let TaskRequester = class TaskRequester {
|
|
|
72
73
|
settings,
|
|
73
74
|
};
|
|
74
75
|
this.tasks.set(task.taskId, task);
|
|
76
|
+
if (additionalData.executionId) {
|
|
77
|
+
const taskIds = this.executionIdsToTaskIds.get(additionalData.executionId) ?? new Set();
|
|
78
|
+
taskIds.add(taskId);
|
|
79
|
+
this.executionIdsToTaskIds.set(additionalData.executionId, taskIds);
|
|
80
|
+
}
|
|
75
81
|
this.eventService.emit('runner-task-requested', {
|
|
76
82
|
taskId: task.taskId,
|
|
77
83
|
nodeId: task.data.node.id,
|
|
@@ -115,6 +121,42 @@ let TaskRequester = class TaskRequester {
|
|
|
115
121
|
}
|
|
116
122
|
finally {
|
|
117
123
|
this.tasks.delete(taskId);
|
|
124
|
+
this.clearExecutionsMap(taskId);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
cancelTasks(executionId) {
|
|
128
|
+
for (const taskId of this.getTaskIds(executionId)) {
|
|
129
|
+
this.cancelTask(taskId);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
getTaskIds(executionId) {
|
|
133
|
+
return this.executionIdsToTaskIds.get(executionId) ?? new Set();
|
|
134
|
+
}
|
|
135
|
+
cancelTask(taskId, reason = 'Task cancelled by user') {
|
|
136
|
+
const task = this.tasks.get(taskId);
|
|
137
|
+
if (!task)
|
|
138
|
+
return;
|
|
139
|
+
this.tasks.delete(taskId);
|
|
140
|
+
this.sendMessage({
|
|
141
|
+
type: 'requester:taskcancel',
|
|
142
|
+
taskId,
|
|
143
|
+
reason,
|
|
144
|
+
});
|
|
145
|
+
const acceptReject = this.taskAcceptRejects.get(taskId);
|
|
146
|
+
if (acceptReject) {
|
|
147
|
+
acceptReject.reject(new Error(`Task cancelled: ${reason}`));
|
|
148
|
+
this.taskAcceptRejects.delete(taskId);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
clearExecutionsMap(taskId) {
|
|
152
|
+
for (const [executionId, taskIds] of this.executionIdsToTaskIds.entries()) {
|
|
153
|
+
if (taskIds.has(taskId)) {
|
|
154
|
+
taskIds.delete(taskId);
|
|
155
|
+
if (taskIds.size === 0) {
|
|
156
|
+
this.executionIdsToTaskIds.delete(executionId);
|
|
157
|
+
}
|
|
158
|
+
break;
|
|
159
|
+
}
|
|
118
160
|
}
|
|
119
161
|
}
|
|
120
162
|
sendMessage(_message) { }
|