n8n 2.43.4 → 2.44.1

package/dist/modules/type-availability-policies/database/repositories/restricted-workflow.repository.js

@@ -0,0 +1,49 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RestrictedWorkflowRepository = void 0;
+const db_1 = require("@n8n/db");
+const di_1 = require("@n8n/di");
+const typeorm_1 = require("@n8n/typeorm");
+const restricted_node_type_match_1 = require("./restricted-node-type-match");
+const runningVersionRows = (dependencyAlias, workflowAlias) => `((${workflowAlias}.activeVersionId IS NULL AND ${dependencyAlias}.publishedVersionId IS NULL) OR ${dependencyAlias}.publishedVersionId = ${workflowAlias}.activeVersionId)`;
+let RestrictedWorkflowRepository = class RestrictedWorkflowRepository extends typeorm_1.Repository {
+    constructor(dataSource) {
+        super(db_1.WorkflowDependency, dataSource.manager);
+    }
+    async findRunningNodeTypes() {
+        const rows = await this.createQueryBuilder('dependency')
+            .innerJoin(db_1.WorkflowEntity, 'workflow', 'workflow.id = dependency.workflowId')
+            .select('dependency.dependencyKey', 'nodeType')
+            .distinct(true)
+            .where('dependency.dependencyType = :dependencyType', { dependencyType: 'nodeType' })
+            .andWhere(runningVersionRows('dependency', 'workflow'))
+            .getRawMany();
+        return rows.map(({ nodeType }) => nodeType);
+    }
+    restrictedWorkflowIdsQuery(restricted) {
+        const { condition, parameters } = (0, restricted_node_type_match_1.restrictedNodeTypeMatch)(restricted, this.manager.connection.options.type === 'postgres');
+        const subQuery = this.createQueryBuilder('restrictedDep')
+            .select('restrictedDep.workflowId')
+            .innerJoin(db_1.WorkflowEntity, 'restrictedWorkflow', 'restrictedWorkflow.id = restrictedDep.workflowId')
+            .innerJoin(db_1.SharedWorkflow, 'restrictedOwner', "restrictedOwner.workflowId = restrictedDep.workflowId AND restrictedOwner.role = 'workflow:owner'")
+            .where('restrictedDep.dependencyType = :restrictedDepType', { restrictedDepType: 'nodeType' })
+            .andWhere(runningVersionRows('restrictedDep', 'restrictedWorkflow'))
+            .andWhere(condition, parameters);
+        return { query: subQuery.getQuery(), parameters: subQuery.getParameters() };
+    }
+};
+exports.RestrictedWorkflowRepository = RestrictedWorkflowRepository;
+exports.RestrictedWorkflowRepository = RestrictedWorkflowRepository = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
+], RestrictedWorkflowRepository);
+//# sourceMappingURL=restricted-workflow.repository.js.map

package/dist/modules/type-availability-policies/database/repositories/restricted-workflow.repository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restricted-workflow.repository.js","sourceRoot":"","sources":["../../../../../src/modules/type-availability-policies/database/repositories/restricted-workflow.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAoG;AACpG,gCAAkC;AAClC,0CAAsD;AAEtD,6EAAiG;AAEjG,MAAM,kBAAkB,GAAG,CAAC,eAAuB,EAAE,aAAqB,EAAE,EAAE,CAC7E,KAAK,aAAa,gCAAgC,eAAe,mCAAmC,eAAe,yBAAyB,aAAa,mBAAmB,CAAC;AAGvK,IAAM,4BAA4B,GAAlC,MAAM,4BAA6B,SAAQ,oBAA8B;IAC/E,YAAY,UAAsB;QACjC,KAAK,CAAC,uBAAkB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,oBAAoB;QACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC;aACtD,SAAS,CAAC,mBAAc,EAAE,UAAU,EAAE,qCAAqC,CAAC;aAC5E,MAAM,CAAC,0BAA0B,EAAE,UAAU,CAAC;aAC9C,QAAQ,CAAC,IAAI,CAAC;aACd,KAAK,CAAC,6CAA6C,EAAE,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC;aACpF,QAAQ,CAAC,kBAAkB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;aACtD,UAAU,EAAwB,CAAC;QAErC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;IAC7C,CAAC;IAED,0BAA0B,CAAC,UAA+B;QACzD,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAA,oDAAuB,EACxD,UAAU,EACV,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,CACnD,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC;aACvD,MAAM,CAAC,0BAA0B,CAAC;aAClC,SAAS,CACT,mBAAc,EACd,oBAAoB,EACpB,kDAAkD,CAClD;aACA,SAAS,CACT,mBAAc,EACd,iBAAiB,EACjB,mGAAmG,CACnG;aACA,KAAK,CAAC,mDAAmD,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,CAAC;aAC7F,QAAQ,CAAC,kBAAkB,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;aACnE,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QAElC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC;IAC7E,CAAC;CACD,CAAA;;uCAxCY,4BAA4B;IADxC,IAAA,YAAO,GAAE;qCAEe,oBAAU;GADtB,4BAA4B,CAwCxC"}

package/dist/modules/type-availability-policies/database/repositories/type-availability-policy-attachment.repository.d.ts

@@ -10,6 +10,7 @@ type AttachmentSlot = {
 export declare class TypeAvailabilityPolicyAttachmentRepository extends BaseRepository<TypeAvailabilityPolicyAttachment> {
     constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
     listAttachmentsForScope(scopeId: string, ctx: OperationContext): Promise<PolicyAttachment[]>;
+    listAttachmentsForScopes(scopeIds: string[], ctx: OperationContext): Promise<Map<string, PolicyAttachment[]>>;
     replaceAttachmentsForScope(scopeId: string, attachments: readonly AttachmentSlot[], ctx: OperationContext): Promise<void>;
     private assertAttachableToScope;
     listScopeIdsAttachedToPolicy(policyId: string, ctx: OperationContext): Promise<string[]>;

package/dist/modules/type-availability-policies/database/repositories/type-availability-policy-attachment.repository.js

@@ -22,27 +22,31 @@ let TypeAvailabilityPolicyAttachmentRepository = class TypeAvailabilityPolicyAtt
         super(type_availability_policy_attachment_entity_1.TypeAvailabilityPolicyAttachment, dataSource.manager, transactionRunner);
     }
     async listAttachmentsForScope(scopeId, ctx) {
+        const byScope = await this.listAttachmentsForScopes([scopeId], ctx);
+        return byScope.get(scopeId) ?? [];
+    }
+    async listAttachmentsForScopes(scopeIds, ctx) {
         const manager = this.managerFor(ctx);
-        const attachments = await manager.findBy(type_availability_policy_attachment_entity_1.TypeAvailabilityPolicyAttachment, { scopeId });
-        if (attachments.length === 0)
-            return [];
-        const policies = await manager.findBy(type_availability_policy_entity_1.TypeAvailabilityPolicy, {
-            id: (0, typeorm_1.In)(attachments.map((a) => a.policyId)),
-        });
-        const rulesByPolicyId = new Map(policies.map((p) => [p.id, p.rules]));
-        return attachments.flatMap((attachment) => {
-            const rules = rulesByPolicyId.get(attachment.policyId);
+        const attachments = [];
+        for (const ids of (0, db_1.chunkIds)(scopeIds)) {
+            attachments.push(...(await manager.findBy(type_availability_policy_attachment_entity_1.TypeAvailabilityPolicyAttachment, { scopeId: (0, typeorm_1.In)(ids) })));
+        }
+        const rulesByPolicyId = new Map();
+        for (const ids of (0, db_1.chunkIds)([...new Set(attachments.map((a) => a.policyId))])) {
+            for (const policy of await manager.findBy(type_availability_policy_entity_1.TypeAvailabilityPolicy, { id: (0, typeorm_1.In)(ids) })) {
+                rulesByPolicyId.set(policy.id, policy.rules);
+            }
+        }
+        const byScope = new Map();
+        for (const { scopeId, policyId, priority, isFloor } of attachments) {
+            const rules = rulesByPolicyId.get(policyId);
             if (!rules)
-                return [];
-            return [
-                {
-                    policyId: attachment.policyId,
-                    rules,
-                    priority: attachment.priority,
-                    isFloor: attachment.isFloor,
-                },
-            ];
-        });
+                continue;
+            const list = byScope.get(scopeId) ?? [];
+            list.push({ policyId, rules, priority, isFloor });
+            byScope.set(scopeId, list);
+        }
+        return byScope;
     }
     async replaceAttachmentsForScope(scopeId, attachments, ctx) {
         await this.runInTransaction(ctx, async (tx) => {

package/dist/modules/type-availability-policies/database/repositories/type-availability-policy-attachment.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-availability-policy-attachment.repository.js","sourceRoot":"","sources":["../../../../../src/modules/type-availability-policies/database/repositories/type-availability-policy-attachment.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-availability-policy-attachment.repository.js","sourceRoot":"","sources":["../../../../../src/modules/type-availability-policies/database/repositories/type-availability-policy-attachment.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/type-availability-policies/database/repositories/type-availability-policy-scope.repository.d.ts

@@ -8,6 +8,9 @@ type NewPolicyScope = {
     defaultAction: PolicyAction;
     updatedBy: string;
 };
+export type ProjectPolicyScope = TypeAvailabilityPolicyScope & {
+    projectId: string;
+};
 export declare class TypeAvailabilityPolicyScopeRepository extends BaseRepository<TypeAvailabilityPolicyScope> {
     constructor(dataSource: DataSource, transactionRunner: TransactionRunner);
     private forUpdateLock;
@@ -16,6 +19,7 @@ export declare class TypeAvailabilityPolicyScopeRepository extends BaseRepositor
     findScopeByIdAndKind(id: string, kind: string, ctx: OperationContext, forUpdate?: boolean): Promise<TypeAvailabilityPolicyScope | null>;
     lockScopesByIds(ids: string[], ctx: OperationContext): Promise<string[]>;
     findScopeKeysByIds(ids: string[], ctx: OperationContext): Promise<PolicyScopeKey[]>;
+    findProjectScopes(kind: string, ctx: OperationContext): Promise<ProjectPolicyScope[]>;
     containsProjectScope(ids: string[], ctx: OperationContext): Promise<boolean>;
     createScopeIfAbsent(input: NewPolicyScope, ctx: OperationContext): Promise<{
         scope: TypeAvailabilityPolicyScope;

package/dist/modules/type-availability-policies/database/repositories/type-availability-policy-scope.repository.js

@@ -15,6 +15,7 @@ const di_1 = require("@n8n/di");
 const typeorm_1 = require("@n8n/typeorm");
 const n8n_workflow_1 = require("n8n-workflow");
 const type_availability_policy_scope_entity_1 = require("../entities/type-availability-policy-scope.entity");
+const isProjectScope = (scope) => scope.projectId !== null;
 let TypeAvailabilityPolicyScopeRepository = class TypeAvailabilityPolicyScopeRepository extends db_1.BaseRepository {
     constructor(dataSource, transactionRunner) {
         super(type_availability_policy_scope_entity_1.TypeAvailabilityPolicyScope, dataSource.manager, transactionRunner);
@@ -73,6 +74,13 @@ let TypeAvailabilityPolicyScopeRepository = class TypeAvailabilityPolicyScopeRep
         }
         return keys;
     }
+    async findProjectScopes(kind, ctx) {
+        const scopes = await this.managerFor(ctx).findBy(type_availability_policy_scope_entity_1.TypeAvailabilityPolicyScope, {
+            kind,
+            projectId: (0, typeorm_1.Not)((0, typeorm_1.IsNull)()),
+        });
+        return scopes.filter(isProjectScope);
+    }
     async containsProjectScope(ids, ctx) {
         const manager = this.managerFor(ctx);
         for (const batch of (0, db_1.chunkIds)(ids)) {

package/dist/modules/type-availability-policies/database/repositories/type-availability-policy-scope.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-availability-policy-scope.repository.js","sourceRoot":"","sources":["../../../../../src/modules/type-availability-policies/database/repositories/type-availability-policy-scope.repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"type-availability-policy-scope.repository.js","sourceRoot":"","sources":["../../../../../src/modules/type-availability-policies/database/repositories/type-availability-policy-scope.repository.ts"],"names":[],"mappings":"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"}

package/dist/modules/type-availability-policies/package-resolver.d.ts

@@ -2,5 +2,6 @@ import type { LoadNodesAndCredentials } from '../../load-nodes-and-credentials';
 import type { NodeTypes } from '../../node-types';
 import { type PackageResolver, type PolicedType } from './policy-evaluator';
 export declare function packageResolverFor(kind: string, loadNodesAndCredentials: LoadNodesAndCredentials): PackageResolver;
-export declare function policedTypeFor(kind: string, nodeTypes: NodeTypes): (name: string) => PolicedType;
+export declare function policedTypeFor(kind: string, nodeTypes: NodeTypes, loadNodesAndCredentials: LoadNodesAndCredentials): (name: string) => PolicedType;
+export declare function isCredentialTypeKnown(loadNodesAndCredentials: LoadNodesAndCredentials, typeName: string): boolean;
 export declare function isPackageInstalled(loadNodesAndCredentials: LoadNodesAndCredentials, packageName: string): boolean;

package/dist/modules/type-availability-policies/package-resolver.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.packageResolverFor = packageResolverFor;
 exports.policedTypeFor = policedTypeFor;
+exports.isCredentialTypeKnown = isCredentialTypeKnown;
 exports.isPackageInstalled = isPackageInstalled;
 const constants_1 = require("./constants");
 const policy_evaluator_1 = require("./policy-evaluator");
@@ -21,10 +22,33 @@ function packageResolverFor(kind, loadNodesAndCredentials) {
         ? credentialTypePackageResolver(loadNodesAndCredentials)
         : policy_evaluator_1.nodeTypePackageResolver;
 }
-function policedTypeFor(kind, nodeTypes) {
-    return kind === constants_1.NODE_TYPES_KIND
-        ? (name) => ({ name, baseName: nodeTypes.resolveBaseName(name).baseName })
-        : (name) => ({ name, baseName: name });
+function credentialTypeAncestors(loadNodesAndCredentials, typeName) {
+    const { knownCredentials } = loadNodesAndCredentials;
+    const parentsOf = (name) => Object.hasOwn(knownCredentials, name) ? (knownCredentials[name].extends ?? []) : [];
+    const seen = new Set([typeName]);
+    const queue = [...parentsOf(typeName)];
+    for (let index = 0; index < queue.length; index++) {
+        const parent = queue[index];
+        if (seen.has(parent))
+            continue;
+        seen.add(parent);
+        queue.push(...parentsOf(parent));
+    }
+    seen.delete(typeName);
+    return [...seen];
+}
+function policedTypeFor(kind, nodeTypes, loadNodesAndCredentials) {
+    if (kind === constants_1.NODE_TYPES_KIND) {
+        return (name) => ({ name, baseName: nodeTypes.resolveBaseName(name).baseName });
+    }
+    return (name) => ({
+        name,
+        baseName: name,
+        ancestors: credentialTypeAncestors(loadNodesAndCredentials, name),
+    });
+}
+function isCredentialTypeKnown(loadNodesAndCredentials, typeName) {
+    return Object.hasOwn(loadNodesAndCredentials.knownCredentials, typeName);
 }
 function isPackageInstalled(loadNodesAndCredentials, packageName) {
     return Object.hasOwn(loadNodesAndCredentials.loaders, packageName);

package/dist/modules/type-availability-policies/package-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-resolver.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/package-resolver.ts"],"names":[],"mappings":";;;;;AAGA,2CAAqE;AACrE,yDAI4B;AAgB5B,SAAS,6BAA6B,CACrC,uBAAgD;IAEhD,OAAO,CAAC,QAAQ,EAAE,EAAE;QACnB,IAAI,WAAW,GAAkB,IAAI,CAAC;QAEtC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;YACrE,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACvD,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YAClC,CAAC;QACF,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC,CAAC;AACH,CAAC;AAMD,4BACC,IAAY,EACZ,uBAAgD;IAEhD,OAAO,IAAI,KAAK,iCAAqB;QACpC,CAAC,CAAC,6BAA6B,CAAC,uBAAuB,CAAC;QACxD,CAAC,CAAC,0CAAuB,CAAC;AAC5B,CAAC;AAED,wBAA+B,IAAY,EAAE,SAAoB;IAChE,OAAO,IAAI,KAAK,2BAAe;QAC9B,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC1E,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;AACzC,CAAC;AAUD,4BACC,uBAAgD,EAChD,WAAmB;IAEnB,OAAO,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"package-resolver.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/package-resolver.ts"],"names":[],"mappings":";;;;;;AAGA,2CAAqE;AACrE,yDAI4B;AAgB5B,SAAS,6BAA6B,CACrC,uBAAgD;IAEhD,OAAO,CAAC,QAAQ,EAAE,EAAE;QACnB,IAAI,WAAW,GAAkB,IAAI,CAAC;QAEtC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;YACrE,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;gBACvD,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YAClC,CAAC;QACF,CAAC;QAED,OAAO,WAAW,CAAC;IACpB,CAAC,CAAC;AACH,CAAC;AAMD,4BACC,IAAY,EACZ,uBAAgD;IAEhD,OAAO,IAAI,KAAK,iCAAqB;QACpC,CAAC,CAAC,6BAA6B,CAAC,uBAAuB,CAAC;QACxD,CAAC,CAAC,0CAAuB,CAAC;AAC5B,CAAC;AAMD,SAAS,uBAAuB,CAC/B,uBAAgD,EAChD,QAAgB;IAEhB,MAAM,EAAE,gBAAgB,EAAE,GAAG,uBAAuB,CAAC;IACrD,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAClC,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAErF,MAAM,IAAI,GAAG,IAAI,GAAG,CAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzC,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEvC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;YAAE,SAAS;QAC/B,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACtB,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;AAClB,CAAC;AAED,wBACC,IAAY,EACZ,SAAoB,EACpB,uBAAgD;IAEhD,IAAI,IAAI,KAAK,2BAAe,EAAE,CAAC;QAC9B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjF,CAAC;IAED,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACjB,IAAI;QACJ,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,uBAAuB,CAAC,uBAAuB,EAAE,IAAI,CAAC;KACjE,CAAC,CAAC;AACJ,CAAC;AAGD,+BACC,uBAAgD,EAChD,QAAgB;IAEhB,OAAO,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAC1E,CAAC;AAUD,4BACC,uBAAgD,EAChD,WAAmB;IAEnB,OAAO,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;AACpE,CAAC"}

package/dist/modules/type-availability-policies/policy-evaluator.d.ts

@@ -15,6 +15,7 @@ export declare const nodeTypePackageResolver: PackageResolver;
 export type PolicedType = {
     readonly name: string;
     readonly baseName: string;
+    readonly ancestors?: readonly string[];
 };
 export declare function orderedAttachments(attachments: readonly PolicyAttachment[]): PolicyAttachment[];
 export declare function evaluateType(attachments: readonly PolicyAttachment[], defaultAction: PolicyAction, type: PolicedType, resolvePackage?: PackageResolver): PolicyVerdict;

package/dist/modules/type-availability-policies/policy-evaluator.js

@@ -14,6 +14,8 @@ function selectorMatches(selector, type, resolvePackage) {
             return selector.value === type.name || selector.value === type.baseName;
         case 'package':
             return resolvePackage(type.name) === selector.value;
+        case 'extends':
+            return selector.value === type.name || (type.ancestors ?? []).includes(selector.value);
     }
 }
 function orderedAttachments(attachments) {

package/dist/modules/type-availability-policies/policy-evaluator.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy-evaluator.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/policy-evaluator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"policy-evaluator.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/policy-evaluator.ts"],"names":[],"mappings":"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"}

package/dist/modules/type-availability-policies/policy-shadow-lint.js

@@ -15,18 +15,40 @@ function resolvePackageOrUndefined(firstByPackage, resolvePackage, typeName) {
 }
 function lintRulesForShadowing(rules, resolvePackage = policy_evaluator_1.nodeTypePackageResolver, policedType = (name) => ({ name, baseName: name })) {
     const warnings = [];
-    const firstByName = new Map();
-    const firstByPackage = new Map();
+    const firstByKind = {
+        name: new Map(),
+        package: new Map(),
+        extends: new Map(),
+    };
+    const firstFamilyOccurrence = (type) => [type.name, ...(type.ancestors ?? [])]
+        .map((name) => firstByKind.extends.get(name))
+        .reduce(earlierOccurrence, undefined);
     for (let index = 0; index < rules.length; index++) {
         const rule = rules[index];
         const { selector } = rule;
-        const shadowedBy = selector.kind === 'package'
-            ? firstByPackage.get(selector.value)
-            : earlierOccurrence(earlierOccurrence(firstByName.get(selector.value), firstByName.get(policedType(selector.value).baseName)), resolvePackageOrUndefined(firstByPackage, resolvePackage, selector.value));
+        let shadowedBy;
+        switch (selector.kind) {
+            case 'package':
+                shadowedBy = firstByKind.package.get(selector.value);
+                break;
+            case 'extends':
+                shadowedBy = firstFamilyOccurrence(policedType(selector.value));
+                break;
+            case 'name': {
+                const type = policedType(selector.value);
+                shadowedBy = [
+                    firstByKind.name.get(selector.value),
+                    firstByKind.name.get(type.baseName),
+                    resolvePackageOrUndefined(firstByKind.package, resolvePackage, selector.value),
+                    firstFamilyOccurrence(type),
+                ].reduce(earlierOccurrence, undefined);
+                break;
+            }
+        }
         if (shadowedBy) {
             warnings.push({ ruleId: rule.id, shadowedByRuleId: shadowedBy.rule.id });
         }
-        const firstOccurrenceByValue = selector.kind === 'package' ? firstByPackage : firstByName;
+        const firstOccurrenceByValue = firstByKind[selector.kind];
         if (!firstOccurrenceByValue.has(selector.value)) {
             firstOccurrenceByValue.set(selector.value, { rule, index });
         }

package/dist/modules/type-availability-policies/policy-shadow-lint.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy-shadow-lint.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/policy-shadow-lint.ts"],"names":[],"mappings":";;;AAAA,yDAI4B;AAmB5B,SAAS,iBAAiB,CACzB,CAA8B,EAC9B,CAA8B;IAE9B,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACnC,CAAC;AAOD,SAAS,yBAAyB,CACjC,cAAoD,EACpD,cAA+B,EAC/B,QAAgB;IAEhB,MAAM,WAAW,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC7C,OAAO,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3E,CAAC;AAwBD,+BACC,KAA4B,EAC5B,cAAc,GAAoB,0CAAuB,EACzD,WAAW,GAAkC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAEjF,MAAM,QAAQ,GAAoB,EAAE,CAAC;IAErC,MAAM,WAAW,GAAG,IAAI,GAAG,EAA2B,CAAC;IACvD,MAAM,cAAc,GAAG,IAAI,GAAG,EAA2B,CAAC;IAE1D,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;QACnD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;QAE1B,MAAM,UAAU,GACf,QAAQ,CAAC,IAAI,KAAK,SAAS;YAC1B,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;YACpC,CAAC,CAAC,iBAAiB,CACjB,iBAAiB,CAChB,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAC/B,WAAW,CAAC,GAAG,CAAC,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CACrD,EACD,yBAAyB,CAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,CAAC,KAAK,CAAC,CACzE,CAAC;QAEL,IAAI,UAAU,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,gBAAgB,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,sBAAsB,GAAG,QAAQ,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,WAAW,CAAC;QAC1F,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC"}
+{"version":3,"file":"policy-shadow-lint.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/policy-shadow-lint.ts"],"names":[],"mappings":"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"}

package/dist/modules/type-availability-policies/restricted-node-types.provider.d.ts

@@ -0,0 +1,15 @@
+import { LicenseState } from '@n8n/backend-common';
+import type { WorkflowIdsQuery } from '@n8n/db';
+import { PolicyEnforcementService } from '../../policy/policy-enforcement.service';
+import type { RestrictedNodeTypesProvider } from '../../workflows/restricted-node-types-provider-proxy.service';
+import { RestrictedWorkflowRepository } from './database/repositories/restricted-workflow.repository';
+import { TypeAvailabilityPolicyService } from './type-availability-policy.service';
+export declare class NodeTypePolicyRestrictedTypesProvider implements RestrictedNodeTypesProvider {
+    private readonly service;
+    private readonly licenseState;
+    private readonly restrictedWorkflowRepository;
+    private readonly policyEnforcementService;
+    readonly findRestrictedWorkflowIds: () => Promise<WorkflowIdsQuery | null>;
+    constructor(service: TypeAvailabilityPolicyService, licenseState: LicenseState, restrictedWorkflowRepository: RestrictedWorkflowRepository, policyEnforcementService: PolicyEnforcementService);
+    private findRestrictedNodeTypes;
+}

package/dist/modules/type-availability-policies/restricted-node-types.provider.js

@@ -0,0 +1,64 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeTypePolicyRestrictedTypesProvider = void 0;
+const backend_common_1 = require("@n8n/backend-common");
+const constants_1 = require("@n8n/constants");
+const di_1 = require("@n8n/di");
+const single_flight_1 = require("@n8n/utils/promise/single-flight");
+const policy_enforcement_service_1 = require("../../policy/policy-enforcement.service");
+const constants_2 = require("./constants");
+const restricted_workflow_repository_1 = require("./database/repositories/restricted-workflow.repository");
+const type_availability_policy_service_1 = require("./type-availability-policy.service");
+const deniedNames = (verdicts) => verdicts.filter((verdict) => verdict.action === 'deny').map((verdict) => verdict.name);
+let NodeTypePolicyRestrictedTypesProvider = class NodeTypePolicyRestrictedTypesProvider {
+    constructor(service, licenseState, restrictedWorkflowRepository, policyEnforcementService) {
+        this.service = service;
+        this.licenseState = licenseState;
+        this.restrictedWorkflowRepository = restrictedWorkflowRepository;
+        this.policyEnforcementService = policyEnforcementService;
+        this.findRestrictedWorkflowIds = (0, single_flight_1.singleFlight)(async () => {
+            const restricted = await this.findRestrictedNodeTypes();
+            return restricted && this.restrictedWorkflowRepository.restrictedWorkflowIdsQuery(restricted);
+        });
+    }
+    async findRestrictedNodeTypes() {
+        if (!this.licenseState.isLicensed(constants_1.LICENSE_FEATURES.TYPE_AVAILABILITY_POLICIES) ||
+            !this.policyEnforcementService.hasChecksFor('workflowStart')) {
+            return null;
+        }
+        const inUse = await this.restrictedWorkflowRepository.findRunningNodeTypes();
+        if (inUse.length === 0)
+            return null;
+        const { withoutProjectPolicy, byProject } = await this.service.evaluateComposedTypesForAllProjects(constants_2.NODE_TYPES_KIND, inUse);
+        const shared = deniedNames(withoutProjectPolicy);
+        const sharedKey = shared.join('\n');
+        const groups = new Map();
+        for (const { projectId, verdicts } of byProject) {
+            const denied = deniedNames(verdicts);
+            const key = denied.join('\n');
+            if (key === sharedKey)
+                continue;
+            const group = groups.get(key) ?? { projectIds: [], nodeTypes: denied };
+            group.projectIds.push(projectId);
+            groups.set(key, group);
+        }
+        if (shared.length === 0 && groups.size === 0)
+            return null;
+        return { shared, byProjects: [...groups.values()], nodeTypesInUse: inUse };
+    }
+};
+exports.NodeTypePolicyRestrictedTypesProvider = NodeTypePolicyRestrictedTypesProvider;
+exports.NodeTypePolicyRestrictedTypesProvider = NodeTypePolicyRestrictedTypesProvider = __decorate([
+    (0, di_1.Service)(),
+    __metadata("design:paramtypes", [type_availability_policy_service_1.TypeAvailabilityPolicyService, backend_common_1.LicenseState, restricted_workflow_repository_1.RestrictedWorkflowRepository, policy_enforcement_service_1.PolicyEnforcementService])
+], NodeTypePolicyRestrictedTypesProvider);
+//# sourceMappingURL=restricted-node-types.provider.js.map

package/dist/modules/type-availability-policies/restricted-node-types.provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"restricted-node-types.provider.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/restricted-node-types.provider.ts"],"names":[],"mappings":"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"}

package/dist/modules/type-availability-policies/type-availability-policies.module.js

@@ -9,6 +9,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeAvailabilityPoliciesModule = void 0;
 const constants_1 = require("@n8n/constants");
 const decorators_1 = require("@n8n/decorators");
+const di_1 = require("@n8n/di");
+const restricted_node_types_provider_proxy_service_1 = require("../../workflows/restricted-node-types-provider-proxy.service");
 let TypeAvailabilityPoliciesModule = class TypeAvailabilityPoliciesModule {
     async init() {
         await import('./type-availability-policy-instance.controller.js');
@@ -19,6 +21,8 @@ let TypeAvailabilityPoliciesModule = class TypeAvailabilityPoliciesModule {
         await import('./available-credential-types.controller.js');
         await import('./node-type-policy.check.js');
         await import('./credential-type-policy.check.js');
+        const { NodeTypePolicyRestrictedTypesProvider } = await import('./restricted-node-types.provider.js');
+        di_1.Container.get(restricted_node_types_provider_proxy_service_1.RestrictedNodeTypesProviderProxy).registerProvider(di_1.Container.get(NodeTypePolicyRestrictedTypesProvider));
     }
     async entities() {
         const { TypeAvailabilityPolicy } = await import('./database/entities/type-availability-policy.entity.js');

package/dist/modules/type-availability-policies/type-availability-policies.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-availability-policies.module.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/type-availability-policies.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAAkD;AAElD,gDAAgD;AAYzC,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAC1C,KAAK,CAAC,IAAI;QAET,MAAM,MAAM,CAAC,mDAAmD,CAAC,CAAC;QAClE,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;QACjE,MAAM,MAAM,CAAC,iDAAiD,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,gDAAgD,CAAC,CAAC;QAC/D,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QAChD,MAAM,MAAM,CAAC,4CAA4C,CAAC,CAAC;QAG3D,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC5C,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAC9C,wDAAwD,CACxD,CAAC;QACF,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CACnD,8DAA8D,CAC9D,CAAC;QACF,MAAM,EAAE,gCAAgC,EAAE,GAAG,MAAM,MAAM,CACxD,mEAAmE,CACnE,CAAC;QAEF,OAAO,CAAC,sBAAsB,EAAE,2BAA2B,EAAE,gCAAgC,CAAC,CAAC;IAChG,CAAC;CACD,CAAA;;yCA5BY,8BAA8B;IAJ1C,IAAA,0BAAa,EAAC;QACd,IAAI,EAAE,4BAA4B;QAClC,WAAW,EAAE,4BAAgB,CAAC,0BAA0B;KACxD,CAAC;GACW,8BAA8B,CA4B1C"}
+{"version":3,"file":"type-availability-policies.module.js","sourceRoot":"","sources":["../../../src/modules/type-availability-policies/type-availability-policies.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,8CAAkD;AAElD,gDAAgD;AAChD,gCAAoC;AAEpC,2HAA4G;AAYrG,IAAM,8BAA8B,GAApC,MAAM,8BAA8B;IAC1C,KAAK,CAAC,IAAI;QAET,MAAM,MAAM,CAAC,mDAAmD,CAAC,CAAC;QAClE,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;QACjE,MAAM,MAAM,CAAC,iDAAiD,CAAC,CAAC;QAChE,MAAM,MAAM,CAAC,gDAAgD,CAAC,CAAC;QAC/D,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QAChD,MAAM,MAAM,CAAC,4CAA4C,CAAC,CAAC;QAG3D,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QAC5C,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QAElD,MAAM,EAAE,qCAAqC,EAAE,GAAG,MAAM,MAAM,CAC7D,qCAAqC,CACrC,CAAC;QACF,cAAS,CAAC,GAAG,CAAC,+EAAgC,CAAC,CAAC,gBAAgB,CAC/D,cAAS,CAAC,GAAG,CAAC,qCAAqC,CAAC,CACpD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ;QACb,MAAM,EAAE,sBAAsB,EAAE,GAAG,MAAM,MAAM,CAC9C,wDAAwD,CACxD,CAAC;QACF,MAAM,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CACnD,8DAA8D,CAC9D,CAAC;QACF,MAAM,EAAE,gCAAgC,EAAE,GAAG,MAAM,MAAM,CACxD,mEAAmE,CACnE,CAAC;QAEF,OAAO,CAAC,sBAAsB,EAAE,2BAA2B,EAAE,gCAAgC,CAAC,CAAC;IAChG,CAAC;CACD,CAAA;;yCAnCY,8BAA8B;IAJ1C,IAAA,0BAAa,EAAC;QACd,IAAI,EAAE,4BAA4B;QAClC,WAAW,EAAE,4BAAgB,CAAC,0BAA0B;KACxD,CAAC;GACW,8BAA8B,CAmC1C"}

package/dist/modules/type-availability-policies/type-availability-policy.service.d.ts

@@ -84,6 +84,14 @@ export declare class TypeAvailabilityPolicyService {
     evaluateComposedType(kind: string, projectId: string, typeName: string): Promise<ComposedVerdict>;
     evaluateComposedTypes(kind: string, projectId: string, typeNames: readonly string[]): Promise<ComposedTypeVerdict[]>;
     evaluateComposedTypesFor(kind: string, projectId: string | null, typeNames: readonly string[]): Promise<ComposedTypeEvaluation>;
+    evaluateComposedTypesForAllProjects(kind: string, typeNames: readonly string[]): Promise<{
+        withoutProjectPolicy: ComposedTypeVerdict[];
+        byProject: Array<{
+            projectId: string;
+            verdicts: ComposedTypeVerdict[];
+        }>;
+    }>;
+    private verdictComposer;
     private readComposedScopes;
     private readEffectivePolicyCached;
     private readScope;