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

Commit 3c36de0

Browse files
aravindanraravindanr
committed
removed spring-security
1 parent 48cf962 commit 3c36de0

File tree

11 files changed

+70
-94
lines changed

11 files changed

+70
-94
lines changed

‎common/dependencies.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
"locked": "2.17.1"
119119
},
120120
"org.springdoc:springdoc-openapi-ui": {
121-
"locked": "1.6.11"
121+
"locked": "1.6.12"
122122
},
123123
"org.springframework.boot:spring-boot-starter": {
124124
"locked": "2.7.3"

‎core/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ dependencies {
1717
compileOnly 'org.springframework.boot:spring-boot-starter'
1818
compileOnly 'org.springframework.boot:spring-boot-starter-validation'
1919
compileOnly 'org.springframework.retry:spring-retry'
20-
compileOnly 'org.springframework.security:spring-security-core'
2120

2221
implementation "com.fasterxml.jackson.core:jackson-annotations"
2322
implementation "com.fasterxml.jackson.core:jackson-databind"

‎core/dependencies.lock‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@
7373
},
7474
"org.springframework.retry:spring-retry": {
7575
"locked": "1.3.3"
76-
},
77-
"org.springframework.security:spring-security-core": {
78-
"locked": "5.7.3"
7976
}
8077
},
8178
"runtimeClasspath": {

‎core/src/main/java/com/netflix/conductor/core/execution/WorkflowExecutor.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.slf4j.LoggerFactory;
2323
import org.springframework.context.ApplicationEventPublisher;
2424
import org.springframework.context.event.EventListener;
25-
import org.springframework.security.access.prepost.PreAuthorize;
2625
import org.springframework.stereotype.Component;
2726

2827
import com.netflix.conductor.annotations.Trace;
@@ -149,8 +148,6 @@ public void resetCallbacksForWorkflow(String workflowId) {
149148
});
150149
}
151150

152-
@PreAuthorize(
153-
"hasPermission(#request, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
154151
public String rerun(RerunWorkflowRequest request) {
155152
Utils.checkNotNull(request.getReRunFromWorkflowId(), "reRunFromWorkflowId is missing");
156153
if (!rerunWF(
@@ -173,8 +170,6 @@ public String rerun(RerunWorkflowRequest request) {
173170
* @throws NotFoundException Workflow definition is not found or Workflow is deemed
174171
* non-restartable as per workflow definition.
175172
*/
176-
@PreAuthorize(
177-
"hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
178173
public void restart(String workflowId, boolean useLatestDefinitions) {
179174
final WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
180175

@@ -260,8 +255,6 @@ public void restart(String workflowId, boolean useLatestDefinitions) {
260255
*
261256
* @param workflowId the id of the workflow to be retried
262257
*/
263-
@PreAuthorize(
264-
"hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
265258
public void retry(String workflowId, boolean resumeSubworkflowTasks) {
266259
WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
267260
if (!workflow.getStatus().isTerminal()) {
@@ -564,8 +557,6 @@ WorkflowModel completeWorkflow(WorkflowModel workflow) {
564557
return workflow;
565558
}
566559

567-
@PreAuthorize(
568-
"hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
569560
public void terminateWorkflow(String workflowId, String reason) {
570561
WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, true);
571562
if (WorkflowModel.Status.COMPLETED.equals(workflow.getStatus())) {
@@ -1188,8 +1179,6 @@ List<TaskModel> dedupAndAddTasks(WorkflowModel workflow, List<TaskModel> tasks)
11881179
/**
11891180
* @throws ConflictException if the workflow is in terminal state.
11901181
*/
1191-
@PreAuthorize(
1192-
"hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
11931182
public void pauseWorkflow(String workflowId) {
11941183
try {
11951184
executionLockService.acquireLock(workflowId, 60000);
@@ -1225,8 +1214,6 @@ public void pauseWorkflow(String workflowId) {
12251214
* @param workflowId the workflow to be resumed
12261215
* @throws IllegalStateException if the workflow is not in PAUSED state
12271216
*/
1228-
@PreAuthorize(
1229-
"hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
12301217
public void resumeWorkflow(String workflowId) {
12311218
WorkflowModel workflow = executionDAOFacade.getWorkflowModel(workflowId, false);
12321219
if (!workflow.getStatus().equals(WorkflowModel.Status.PAUSED)) {
@@ -1255,8 +1242,6 @@ public void resumeWorkflow(String workflowId) {
12551242
* @param skipTaskRequest the {@link SkipTaskRequest} object
12561243
* @throws IllegalStateException
12571244
*/
1258-
@PreAuthorize(
1259-
"hasPermission(#workflowId, T(com.netflix.conductor.common.metadata.acl.Permission).OPERATOR)")
12601245
public void skipTaskFromWorkflow(
12611246
String workflowId, String taskReferenceName, SkipTaskRequest skipTaskRequest) {
12621247

‎core/src/main/java/com/netflix/conductor/core/operation/StartWorkflowOperation.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.slf4j.LoggerFactory;
2121
import org.springframework.context.ApplicationEventPublisher;
2222
import org.springframework.context.event.EventListener;
23-
import org.springframework.security.access.prepost.PreAuthorize;
2423
import org.springframework.stereotype.Component;
2524

2625
import com.netflix.conductor.common.metadata.workflow.WorkflowDef;
@@ -65,15 +64,11 @@ public StartWorkflowOperation(
6564
}
6665

6766
@Override
68-
@PreAuthorize(
69-
"hasPermission(#input, T(com.netflix.conductor.common.metadata.acl.Permission).OWNER)")
7067
public String execute(StartWorkflowInput input) {
7168
return startWorkflow(input);
7269
}
7370

7471
@EventListener(WorkflowCreationEvent.class)
75-
@PreAuthorize(
76-
"hasPermission(#workflowCreationEvent.startWorkflowInput, T(com.netflix.conductor.common.metadata.acl.Permission).OWNER)")
7772
public void handleWorkflowCreationEvent(WorkflowCreationEvent workflowCreationEvent) {
7873
startWorkflow(workflowCreationEvent.getStartWorkflowInput());
7974
}

‎grpc-client/dependencies.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"project": true
1919
},
2020
"io.grpc:grpc-netty": {
21-
"locked": "1.49.2"
21+
"locked": "1.50.0"
2222
},
2323
"io.grpc:grpc-protobuf": {
24-
"locked": "1.49.2"
24+
"locked": "1.50.0"
2525
},
2626
"io.grpc:grpc-stub": {
27-
"locked": "1.49.2"
27+
"locked": "1.50.0"
2828
},
2929
"org.apache.commons:commons-lang3": {
3030
"locked": "3.12.0"
@@ -93,19 +93,19 @@
9393
"project": true
9494
},
9595
"io.grpc:grpc-netty": {
96-
"locked": "1.49.2"
96+
"locked": "1.50.0"
9797
},
9898
"io.grpc:grpc-protobuf": {
9999
"firstLevelTransitive": [
100100
"com.netflix.conductor:conductor-grpc"
101101
],
102-
"locked": "1.49.2"
102+
"locked": "1.50.0"
103103
},
104104
"io.grpc:grpc-stub": {
105105
"firstLevelTransitive": [
106106
"com.netflix.conductor:conductor-grpc"
107107
],
108-
"locked": "1.49.2"
108+
"locked": "1.50.0"
109109
},
110110
"javax.annotation:javax.annotation-api": {
111111
"firstLevelTransitive": [
@@ -183,13 +183,13 @@
183183
"project": true
184184
},
185185
"io.grpc:grpc-netty": {
186-
"locked": "1.49.2"
186+
"locked": "1.50.0"
187187
},
188188
"io.grpc:grpc-protobuf": {
189-
"locked": "1.49.2"
189+
"locked": "1.50.0"
190190
},
191191
"io.grpc:grpc-stub": {
192-
"locked": "1.49.2"
192+
"locked": "1.50.0"
193193
},
194194
"junit:junit": {
195195
"locked": "4.13.2"
@@ -270,19 +270,19 @@
270270
"project": true
271271
},
272272
"io.grpc:grpc-netty": {
273-
"locked": "1.49.2"
273+
"locked": "1.50.0"
274274
},
275275
"io.grpc:grpc-protobuf": {
276276
"firstLevelTransitive": [
277277
"com.netflix.conductor:conductor-grpc"
278278
],
279-
"locked": "1.49.2"
279+
"locked": "1.50.0"
280280
},
281281
"io.grpc:grpc-stub": {
282282
"firstLevelTransitive": [
283283
"com.netflix.conductor:conductor-grpc"
284284
],
285-
"locked": "1.49.2"
285+
"locked": "1.50.0"
286286
},
287287
"javax.annotation:javax.annotation-api": {
288288
"firstLevelTransitive": [

‎grpc-server/dependencies.lock‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
"project": true
1616
},
1717
"io.grpc:grpc-netty": {
18-
"locked": "1.49.2"
18+
"locked": "1.50.0"
1919
},
2020
"io.grpc:grpc-services": {
21-
"locked": "1.49.2"
21+
"locked": "1.50.0"
2222
},
2323
"org.apache.commons:commons-lang3": {
2424
"locked": "3.12.0"
@@ -127,22 +127,22 @@
127127
"locked": "2.7"
128128
},
129129
"io.grpc:grpc-netty": {
130-
"locked": "1.49.2"
130+
"locked": "1.50.0"
131131
},
132132
"io.grpc:grpc-protobuf": {
133133
"firstLevelTransitive": [
134134
"com.netflix.conductor:conductor-grpc"
135135
],
136-
"locked": "1.49.2"
136+
"locked": "1.50.0"
137137
},
138138
"io.grpc:grpc-services": {
139-
"locked": "1.49.2"
139+
"locked": "1.50.0"
140140
},
141141
"io.grpc:grpc-stub": {
142142
"firstLevelTransitive": [
143143
"com.netflix.conductor:conductor-grpc"
144144
],
145-
"locked": "1.49.2"
145+
"locked": "1.50.0"
146146
},
147147
"io.reactivex:rxjava": {
148148
"firstLevelTransitive": [
@@ -239,13 +239,13 @@
239239
"project": true
240240
},
241241
"io.grpc:grpc-netty": {
242-
"locked": "1.49.2"
242+
"locked": "1.50.0"
243243
},
244244
"io.grpc:grpc-services": {
245-
"locked": "1.49.2"
245+
"locked": "1.50.0"
246246
},
247247
"io.grpc:grpc-testing": {
248-
"locked": "1.49.2"
248+
"locked": "1.50.0"
249249
},
250250
"junit:junit": {
251251
"locked": "4.13.2"
@@ -366,25 +366,25 @@
366366
"locked": "2.7"
367367
},
368368
"io.grpc:grpc-netty": {
369-
"locked": "1.49.2"
369+
"locked": "1.50.0"
370370
},
371371
"io.grpc:grpc-protobuf": {
372372
"firstLevelTransitive": [
373373
"com.netflix.conductor:conductor-grpc"
374374
],
375-
"locked": "1.49.2"
375+
"locked": "1.50.0"
376376
},
377377
"io.grpc:grpc-services": {
378-
"locked": "1.49.2"
378+
"locked": "1.50.0"
379379
},
380380
"io.grpc:grpc-stub": {
381381
"firstLevelTransitive": [
382382
"com.netflix.conductor:conductor-grpc"
383383
],
384-
"locked": "1.49.2"
384+
"locked": "1.50.0"
385385
},
386386
"io.grpc:grpc-testing": {
387-
"locked": "1.49.2"
387+
"locked": "1.50.0"
388388
},
389389
"io.reactivex:rxjava": {
390390
"firstLevelTransitive": [

‎grpc/dependencies.lock‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"project": true
1313
},
1414
"io.grpc:grpc-protobuf": {
15-
"locked": "1.49.2"
15+
"locked": "1.50.0"
1616
},
1717
"io.grpc:grpc-stub": {
18-
"locked": "1.49.2"
18+
"locked": "1.50.0"
1919
},
2020
"javax.annotation:javax.annotation-api": {
2121
"locked": "1.3.2"
@@ -71,10 +71,10 @@
7171
"project": true
7272
},
7373
"io.grpc:grpc-protobuf": {
74-
"locked": "1.49.2"
74+
"locked": "1.50.0"
7575
},
7676
"io.grpc:grpc-stub": {
77-
"locked": "1.49.2"
77+
"locked": "1.50.0"
7878
},
7979
"javax.annotation:javax.annotation-api": {
8080
"locked": "1.3.2"
@@ -129,7 +129,7 @@
129129
},
130130
"protobufToolsLocator_grpc": {
131131
"io.grpc:protoc-gen-grpc-java": {
132-
"locked": "1.49.2"
132+
"locked": "1.50.0"
133133
}
134134
},
135135
"protobufToolsLocator_protoc": {
@@ -172,10 +172,10 @@
172172
"project": true
173173
},
174174
"io.grpc:grpc-protobuf": {
175-
"locked": "1.49.2"
175+
"locked": "1.50.0"
176176
},
177177
"io.grpc:grpc-stub": {
178-
"locked": "1.49.2"
178+
"locked": "1.50.0"
179179
},
180180
"javax.annotation:javax.annotation-api": {
181181
"locked": "1.3.2"
@@ -236,10 +236,10 @@
236236
"project": true
237237
},
238238
"io.grpc:grpc-protobuf": {
239-
"locked": "1.49.2"
239+
"locked": "1.50.0"
240240
},
241241
"io.grpc:grpc-stub": {
242-
"locked": "1.49.2"
242+
"locked": "1.50.0"
243243
},
244244
"javax.annotation:javax.annotation-api": {
245245
"locked": "1.3.2"
@@ -307,10 +307,10 @@
307307
"project": true
308308
},
309309
"io.grpc:grpc-protobuf": {
310-
"locked": "1.49.2"
310+
"locked": "1.50.0"
311311
},
312312
"io.grpc:grpc-stub": {
313-
"locked": "1.49.2"
313+
"locked": "1.50.0"
314314
},
315315
"javax.annotation:javax.annotation-api": {
316316
"locked": "1.3.2"
@@ -410,10 +410,10 @@
410410
"project": true
411411
},
412412
"io.grpc:grpc-protobuf": {
413-
"locked": "1.49.2"
413+
"locked": "1.50.0"
414414
},
415415
"io.grpc:grpc-stub": {
416-
"locked": "1.49.2"
416+
"locked": "1.50.0"
417417
},
418418
"javax.annotation:javax.annotation-api": {
419419
"locked": "1.3.2"

0 commit comments

Comments
 (0)