fix:task executor check

actiontech · Jul 28, 2023 · b3a7279 · b3a7279
1 parent 3af45c7
commit b3a7279
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/sqle/api/controller/v1/workflow.go b/sqle/api/controller/v1/workflow.go
@@ -2,6 +2,7 @@ package v1
 
 import (
 	"database/sql"
+	e "errors"
 	"fmt"
 	"net/http"
 	"strconv"
@@ -520,6 +521,31 @@ func GetNeedExecTaskIds(s *model.Storage, workflow *model.Workflow, user *model.
 	return needExecTaskIds, nil
 }
 
+func PrepareForTaskExecution(c echo.Context, projectName string, workflow *model.Workflow, user *model.User, TaskId int) error {
+	if workflow.Record.Status != model.WorkflowStatusWaitForExecution {
+		return errors.New(errors.DataInvalid, e.New("workflow need to be approved first"))
+	}
+
+	err := CheckCurrentUserCanOperateWorkflow(c, &model.Project{Name: projectName}, workflow, []uint{model.OP_WORKFLOW_EXECUTE})
+	if err != nil {
+		return err
+	}
+
+	for _, record := range workflow.Record.InstanceRecords {
+		if record.TaskId != uint(TaskId) {
+			continue
+		}
+
+		for _, u := range record.ExecutorUserList {
+			if u.ID == user.ID {
+				return nil
+			}
+		}
+	}
+
+	return e.New("you are not allow to execute the task")
+}
+
 func PrepareForWorkflowExecution(c echo.Context, projectName string, workflow *model.Workflow, user *model.User) error {
 	err := CheckCurrentUserCanOperateWorkflow(c, &model.Project{Name: projectName}, workflow, []uint{})
 	if err != nil {

diff --git a/sqle/api/controller/v2/workflow.go b/sqle/api/controller/v2/workflow.go
@@ -476,7 +476,7 @@ func ExecuteOneTaskOnWorkflowV2(c echo.Context) error {
 	if err != nil {
 		return controller.JSONBaseErrorReq(c, err)
 	}
-	err = v1.PrepareForWorkflowExecution(c, projectName, workflow, user)
+	err = v1.PrepareForTaskExecution(c, projectName, workflow, user, taskId)
 	if err != nil {
 		return controller.JSONBaseErrorReq(c, err)
 	}

diff --git a/sqle/model/workflow.go b/sqle/model/workflow.go
@@ -732,7 +732,7 @@ func (s *Storage) getWorkflowStepsByRecordIds(ids []uint) ([]*WorkflowStep, erro
 
 func (s *Storage) getWorkflowInstanceRecordsByRecordId(id uint) ([]*WorkflowInstanceRecord, error) {
 	instanceRecords := []*WorkflowInstanceRecord{}
-	err := s.db.Preload("Instance").Preload("Task").Where("workflow_record_id = ?", id).
+	err := s.db.Preload("Instance").Preload("Task").Preload("ExecutorUserList").Where("workflow_record_id = ?", id).
 		Find(&instanceRecords).Error
 	if err != nil {
 		return nil, errors.New(errors.ConnectStorageError, err)