mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(core): Split out subworkflow policy check from permission checker (no-changelog) (#10168)

Browse Source
This commit is contained in:
Iván Ovejero
2024-07-24 12:51:01 +02:00
committed by GitHub
parent 7848c19f54
commit f1a3791abc
7 changed files with 284 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/cli/src/workflows/workflowExecution.service.ts
View File

@@ -32,9 +32,9 @@ import { WorkflowRunner } from '@/WorkflowRunner';
import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
import { TestWebhooks } from '@/TestWebhooks';
import { Logger } from '@/Logger';
import { PermissionChecker } from '@/UserManagement/PermissionChecker';
import type { Project } from '@/databases/entities/Project';
import { GlobalConfig } from '@n8n/config';
import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
@Service()
export class WorkflowExecutionService {
@@ -44,9 +44,9 @@ export class WorkflowExecutionService {
private readonly workflowRepository: WorkflowRepository,
private readonly nodeTypes: NodeTypes,
private readonly testWebhooks: TestWebhooks,
private readonly permissionChecker: PermissionChecker,
private readonly workflowRunner: WorkflowRunner,
private readonly globalConfig: GlobalConfig,
private readonly subworkflowPolicyChecker: SubworkflowPolicyChecker,
) {}
async runWorkflow(
@@ -188,7 +188,7 @@ export class WorkflowExecutionService {
const failedNode = workflowErrorData.execution?.lastNodeExecuted
? workflowInstance.getNode(workflowErrorData.execution?.lastNodeExecuted)
: undefined;
await this.permissionChecker.checkSubworkflowExecutePolicy(
await this.subworkflowPolicyChecker.check(
workflowInstance,
workflowErrorData.workflow.id!,
failedNode ?? undefined,