[Improve] maven build args check improvement (#3440)
* [Improve] maven build args check improvement
* [Improve] minor improvement
* [Improve] iter bug fixed
* [Improve] mvn build args improvement
---------
Co-authored-by: benjobs <benjobx@gmail.com>
diff --git a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
index 653405b..fd68e3f 100644
--- a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
+++ b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -43,12 +43,12 @@
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
+import java.util.Iterator;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.util.stream.Collectors;
@Slf4j
@Data
@@ -255,30 +255,19 @@
return dangerArgs;
}
- String[] args = param.split("\\s+");
- List<String> dangerArgs = new ArrayList<>();
- for (String arg : args) {
- if (arg.length() == 1) {
- if (arg.equals("|")) {
- dangerArgs.add("|");
- }
- if (arg.equals("&")) {
- dangerArgs.add("&");
- }
- } else {
- arg = arg.substring(0, 2);
- if (arg.equals("||")) {
- dangerArgs.add("||");
- }
- if (arg.equals("&&")) {
- dangerArgs.add("&&");
+ String result = null;
+ Iterator<String> dangerIter = Arrays.asList(";", "|", "&", ">").iterator();
+ String[] argsList = param.split("\\s+");
+ while (result == null && dangerIter.hasNext()) {
+ String danger = dangerIter.next();
+ for (String arg : argsList) {
+ if (arg.contains(danger)) {
+ result = arg;
+ break;
}
}
}
- if (!dangerArgs.isEmpty()) {
- return dangerArgs.stream().collect(Collectors.joining(","));
- }
- return null;
+ return result;
}
@JsonIgnore
