From fd2816d6dab37907adca8a17b2ad5f49e1787e5d Mon Sep 17 00:00:00 2001
From: Aravindan Ramkumar <1028385+aravindanr@users.noreply.github.com>
Date: Thu, 13 Oct 2022 12:59:28 -0700
Subject: [PATCH] used enum instead of String

---
 .../core/execution/WorkflowExecutor.java      | 21 ++++++++++++-------
 .../operation/StartWorkflowOperation.java     |  6 ++++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
index 5a6b791103..3460a69a14 100644
--- a/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
+++ b/core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java
@@ -154,7 +154,8 @@ public void resetCallbacksForWorkflow(String workflowId) {
                         });
     }
 
-    @PreAuthorize("hasPermission(#request, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#request, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public String rerun(RerunWorkflowRequest request) {
         Utils.checkNotNull(request.getReRunFromWorkflowId(), "reRunFromWorkflowId is missing");
         if (!rerunWF(
@@ -177,7 +178,8 @@ public String rerun(RerunWorkflowRequest request) {
      * @throws NotFoundException Workflow definition is not found or Workflow is deemed
      *     non-restartable as per workflow definition.
      */
-    @PreAuthorize("hasPermission(#workflowId, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public void restart(String workflowId, boolean useLatestDefinitions) {
         final WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
 
@@ -263,7 +265,8 @@ public void restart(String workflowId, boolean useLatestDefinitions) {
      *
      * @param workflowId the id of the workflow to be retried
      */
-    @PreAuthorize("hasPermission(#workflowId, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public void retry(String workflowId, boolean resumeSubworkflowTasks) {
         WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
         if (!workflow.getStatus().isTerminal()) {
@@ -565,7 +568,8 @@ WorkflowModel completeWorkflow(WorkflowModel workflow) {
         return workflow;
     }
 
-    @PreAuthorize("hasPermission(#workflowId, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public void terminateWorkflow(String workflowId, String reason) {
         WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
         if (WorkflowModel.Status.COMPLETED.equals(workflow.getStatus())) {
@@ -1187,7 +1191,8 @@ List<TaskModel> dedupAndAddTasks(WorkflowModel workflow, List<TaskModel> tasks)
     /**
      * @throws ConflictException if the workflow is in terminal state.
      */
-    @PreAuthorize("hasPermission(#workflowId, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public void pauseWorkflow(String workflowId) {
         try {
             executionLockService.acquireLock(workflowId, 60000);
@@ -1223,7 +1228,8 @@ public void pauseWorkflow(String workflowId) {
      * @param workflowId the workflow to be resumed
      * @throws IllegalStateException if the workflow is not in PAUSED state
      */
-    @PreAuthorize("hasPermission(#workflowId, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public void resumeWorkflow(String workflowId) {
         WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, false);
         if (!workflow.getStatus().equals(WorkflowModel.Status.PAUSED)) {
@@ -1252,7 +1258,8 @@ public void resumeWorkflow(String workflowId) {
      * @param skipTaskRequest the {@link SkipTaskRequest} object
      * @throws IllegalStateException
      */
-    @PreAuthorize("hasPermission(#workflowId, 'OPERATOR')")
+    @PreAuthorize(
+            "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
     public void skipTaskFromWorkflow(
             String workflowId, String taskReferenceName, SkipTaskRequest skipTaskRequest) {
 
diff --git a/core/src/main/java/com/netflix/conductor/core/operation/StartWorkflowOperation.java b/core/src/main/java/com/netflix/conductor/core/operation/StartWorkflowOperation.java
index 6b03c434ea..d12b1e9e96 100644
--- a/core/src/main/java/com/netflix/conductor/core/operation/StartWorkflowOperation.java
+++ b/core/src/main/java/com/netflix/conductor/core/operation/StartWorkflowOperation.java
@@ -65,13 +65,15 @@ public StartWorkflowOperation(
     }
 
     @Override
-    @PreAuthorize("hasPermission(#input, 'OWNER')")
+    @PreAuthorize(
+            "hasPermission(#input, T(com.netflix.conductor.common.metadata.acl.Permission).OWNER)")
     public String execute(StartWorkflowInput input) {
         return startWorkflow(input);
     }
 
     @EventListener(WorkflowCreationEvent.class)
-    @PreAuthorize("hasPermission(#workflowCreationEvent.startWorkflowInput, 'OWNER')")
+    @PreAuthorize(
+            "hasPermission(#workflowCreationEvent.startWorkflowInput, T(com.netflix.conductor.common.metadata.acl.Permission).OWNER)")
     public void handleWorkflowCreationEvent(WorkflowCreationEvent workflowCreationEvent) {
         startWorkflow(workflowCreationEvent.getStartWorkflowInput());
     }