Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
removed spring-security
Browse files Browse the repository at this point in the history
  • Loading branch information
aravindanr committed Oct 17, 2022
1 parent 48cf962 commit 3c36de0
Show file tree
Hide file tree
Showing 11 changed files with 70 additions and 94 deletions.
2 changes: 1 addition & 1 deletion common/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 0 additions & 3 deletions core/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@
},
"org.springframework.retry:spring-retry": {
"locked": "1.3.3"
},
"org.springframework.security:spring-security-core": {
"locked": "5.7.3"
}
},
"runtimeClasspath": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand All @@ -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);

Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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())) {
Expand Down Expand Up @@ -1188,8 +1179,6 @@ List<TaskModel> dedupAndAddTasks(WorkflowModel workflow, List<TaskModel> 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);
Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
}
Expand Down
24 changes: 12 additions & 12 deletions grpc-client/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand Down
28 changes: 14 additions & 14 deletions grpc-server/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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": [
Expand Down
26 changes: 13 additions & 13 deletions grpc/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -129,7 +129,7 @@
},
"protobufToolsLocator_grpc": {
"io.grpc:protoc-gen-grpc-java": {
"locked": "1.49.2"
"locked": "1.50.0"
}
},
"protobufToolsLocator_protoc": {
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 3c36de0

Please sign in to comment.