From 3c36de065318cc137da08867518711a7eac878a6 Mon Sep 17 00:00:00 2001 From: Aravindan Ramkumar <1028385+aravindanr@users.noreply.github.com> Date: Mon, 17 Oct 2022 11:17:08 -0700 Subject: [PATCH] removed spring-security --- common/dependencies.lock | 2 +- core/build.gradle | 1 - core/dependencies.lock | 3 -- .../core/execution/WorkflowExecutor.java | 15 ------- .../operation/StartWorkflowOperation.java | 5 --- grpc-client/dependencies.lock | 24 +++++------ grpc-server/dependencies.lock | 28 ++++++------- grpc/dependencies.lock | 26 ++++++------ rest/dependencies.lock | 8 ++-- server/dependencies.lock | 42 +++++++++---------- test-harness/dependencies.lock | 10 ++--- 11 files changed, 70 insertions(+), 94 deletions(-) diff --git a/common/dependencies.lock b/common/dependencies.lock index 48c10c9b8c..4a6010273b 100644 --- a/common/dependencies.lock +++ b/common/dependencies.lock @@ -118,7 +118,7 @@ "locked": "2.17.1" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.3" diff --git a/core/build.gradle b/core/build.gradle index 23dde0dd4f..d76aa71402 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -17,7 +17,6 @@ dependencies { compileOnly 'org.springframework.boot:spring-boot-starter' compileOnly 'org.springframework.boot:spring-boot-starter-validation' compileOnly 'org.springframework.retry:spring-retry' - compileOnly 'org.springframework.security:spring-security-core' implementation "com.fasterxml.jackson.core:jackson-annotations" implementation "com.fasterxml.jackson.core:jackson-databind" diff --git a/core/dependencies.lock b/core/dependencies.lock index b6cd84cf5f..0775deea6e 100644 --- a/core/dependencies.lock +++ b/core/dependencies.lock @@ -73,9 +73,6 @@ }, "org.springframework.retry:spring-retry": { "locked": "1.3.3" - }, - "org.springframework.security:spring-security-core": { - "locked": "5.7.3" } }, "runtimeClasspath": { 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 2c71bcdccc..240c890308 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 @@ -22,7 +22,6 @@ import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Component; import com.netflix.conductor.annotations.Trace; @@ -149,8 +148,6 @@ public void resetCallbacksForWorkflow(String workflowId) { }); } - @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( @@ -173,8 +170,6 @@ 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, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)") public void restart(String workflowId, boolean useLatestDefinitions) { final WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true); @@ -260,8 +255,6 @@ public void restart(String workflowId, boolean useLatestDefinitions) { * * @param workflowId the id of the workflow to be retried */ - @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()) { @@ -564,8 +557,6 @@ WorkflowModel completeWorkflow(WorkflowModel workflow) { return workflow; } - @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())) { @@ -1188,8 +1179,6 @@ List dedupAndAddTasks(WorkflowModel workflow, List tasks) /** * @throws ConflictException if the workflow is in terminal state. */ - @PreAuthorize( - "hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)") public void pauseWorkflow(String workflowId) { try { executionLockService.acquireLock(workflowId, 60000); @@ -1225,8 +1214,6 @@ 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, 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)) { @@ -1255,8 +1242,6 @@ public void resumeWorkflow(String workflowId) { * @param skipTaskRequest the {@link SkipTaskRequest} object * @throws IllegalStateException */ - @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 d12b1e9e96..e9281de641 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 @@ -20,7 +20,6 @@ import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.event.EventListener; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Component; import com.netflix.conductor.common.metadata.workflow.WorkflowDef; @@ -65,15 +64,11 @@ public StartWorkflowOperation( } @Override - @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, T(com.netflix.conductor.common.metadata.acl.Permission).OWNER)") public void handleWorkflowCreationEvent(WorkflowCreationEvent workflowCreationEvent) { startWorkflow(workflowCreationEvent.getStartWorkflowInput()); } diff --git a/grpc-client/dependencies.lock b/grpc-client/dependencies.lock index 3264ee3b06..5453cc59df 100644 --- a/grpc-client/dependencies.lock +++ b/grpc-client/dependencies.lock @@ -18,13 +18,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -93,19 +93,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ @@ -183,13 +183,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "junit:junit": { "locked": "4.13.2" @@ -270,19 +270,19 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "firstLevelTransitive": [ diff --git a/grpc-server/dependencies.lock b/grpc-server/dependencies.lock index 30e78712ad..8d42ddbaad 100644 --- a/grpc-server/dependencies.lock +++ b/grpc-server/dependencies.lock @@ -15,10 +15,10 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { - "locked": "1.49.2" + "locked": "1.50.0" }, "org.apache.commons:commons-lang3": { "locked": "3.12.0" @@ -127,22 +127,22 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -239,13 +239,13 @@ "project": true }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-testing": { - "locked": "1.49.2" + "locked": "1.50.0" }, "junit:junit": { "locked": "4.13.2" @@ -366,25 +366,25 @@ "locked": "2.7" }, "io.grpc:grpc-netty": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-testing": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ diff --git a/grpc/dependencies.lock b/grpc/dependencies.lock index 42550d112c..603384c2d9 100644 --- a/grpc/dependencies.lock +++ b/grpc/dependencies.lock @@ -12,10 +12,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -71,10 +71,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -129,7 +129,7 @@ }, "protobufToolsLocator_grpc": { "io.grpc:protoc-gen-grpc-java": { - "locked": "1.49.2" + "locked": "1.50.0" } }, "protobufToolsLocator_protoc": { @@ -172,10 +172,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -236,10 +236,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -307,10 +307,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" @@ -410,10 +410,10 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "javax.annotation:javax.annotation-api": { "locked": "1.3.2" diff --git a/rest/dependencies.lock b/rest/dependencies.lock index 7ef6869743..f65a879b44 100644 --- a/rest/dependencies.lock +++ b/rest/dependencies.lock @@ -30,7 +30,7 @@ "locked": "2.17.1" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter-web": { "locked": "2.7.3" @@ -191,7 +191,7 @@ "locked": "2.17.1" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter-web": { "locked": "2.7.3" @@ -229,7 +229,7 @@ "locked": "5.8.2" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "2.7.3" @@ -402,7 +402,7 @@ "locked": "5.8.2" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter-log4j2": { "locked": "2.7.3" diff --git a/server/dependencies.lock b/server/dependencies.lock index 0cdb9504a4..17c37cb408 100644 --- a/server/dependencies.lock +++ b/server/dependencies.lock @@ -57,7 +57,7 @@ "locked": "2.17.1" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.3" @@ -270,25 +270,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -485,7 +485,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.3" @@ -708,25 +708,25 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -923,7 +923,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.3" @@ -998,13 +998,13 @@ "project": true }, "io.grpc:grpc-protobuf": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-testing": { - "locked": "1.49.2" + "locked": "1.50.0" }, "junit:junit": { "locked": "4.13.2" @@ -1028,7 +1028,7 @@ "locked": "5.8.2" }, "org.springdoc:springdoc-openapi-ui": { - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.3" @@ -1244,28 +1244,28 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-testing": { - "locked": "1.49.2" + "locked": "1.50.0" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -1468,7 +1468,7 @@ "firstLevelTransitive": [ "com.netflix.conductor:conductor-rest" ], - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "locked": "2.7.3" diff --git a/test-harness/dependencies.lock b/test-harness/dependencies.lock index 48fa3d9257..827739d890 100644 --- a/test-harness/dependencies.lock +++ b/test-harness/dependencies.lock @@ -427,27 +427,27 @@ "com.netflix.conductor:conductor-grpc-client", "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-protobuf": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-services": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc-server" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.grpc:grpc-stub": { "firstLevelTransitive": [ "com.netflix.conductor:conductor-grpc", "com.netflix.conductor:conductor-grpc-client" ], - "locked": "1.49.2" + "locked": "1.50.0" }, "io.reactivex:rxjava": { "firstLevelTransitive": [ @@ -693,7 +693,7 @@ "com.netflix.conductor:conductor-rest", "com.netflix.conductor:conductor-server" ], - "locked": "1.6.11" + "locked": "1.6.12" }, "org.springframework.boot:spring-boot-starter": { "firstLevelTransitive": [