Skip to content

Commit 73d502d

Browse files
committed
[Fix #1604] Zanini comments
Signed-off-by: Francisco Javier Tirado Sarti <ftirados@ibm.com>
1 parent 55a0169 commit 73d502d

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private WorkflowApplication(Builder builder) {
149149
this.allStrategyCorrelationInfoFactory = builder.allStrategyCorrelationInfoFactory;
150150
this.lifeCycleCloudEventFactory = builder.lifeCycleCloudEventFactory;
151151
this.schedulerExecutorService = builder.schedulerExecutorService;
152-
this.allowedCommands = builder.allowedCommands;
152+
this.allowedCommands = Collections.unmodifiableSet(builder.allowedCommands);
153153
}
154154

155155
public TaskExecutorFactory taskFactory() {

impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunShellExecutor.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import io.serverlessworkflow.impl.WorkflowModel;
2424
import io.serverlessworkflow.impl.WorkflowValueResolver;
2525
import io.serverlessworkflow.impl.scripts.ScriptUtils;
26+
import java.util.ArrayList;
2627
import java.util.List;
2728
import java.util.Map;
2829
import java.util.Optional;
@@ -52,13 +53,13 @@ public CompletableFuture<WorkflowModel> apply(
5253
String command = shellCommand.apply(workflowContext, taskContext, model);
5354
if (!workflowContext.definition().application().allowedCommands().contains(command)) {
5455
return CompletableFuture.failedFuture(
55-
new IllegalAccessException(
56+
new SecurityException(
5657
"Command "
5758
+ command
5859
+ " is not allowed. Please verify the set of allowed commands passed to the application"));
5960
}
6061

61-
List<String> commandAndArgs = new java.util.ArrayList<>();
62+
List<String> commandAndArgs = new ArrayList<>();
6263
commandAndArgs.add(command);
6364
shellArguments.forEach(f -> commandAndArgs.add(f.apply(workflowContext, taskContext, model)));
6465

impl/test/src/test/java/io/serverlessworkflow/impl/test/RunShellExecutorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void testEchoInvalid() throws IOException {
7171
.instance(new Input(new User("John Doe")))
7272
.start()
7373
.join())
74-
.hasCauseInstanceOf(IllegalAccessException.class);
74+
.hasCauseInstanceOf(SecurityException.class);
7575
}
7676

7777
@Test

impl/test/src/test/resources/workflows-samples/run-shell/echo-none.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ do:
99
shell:
1010
command: echo
1111
arguments:
12-
- Javierito rulezzzz!!!!
12+
- Open Workflow
1313
return: none

0 commit comments

Comments
 (0)