Merge branch 'dev-1.21.0' into dev-1.21.0-hadoop3

Author: zqburde

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/node/BranchNodeRunner.scala

@@ -134,13 +134,18 @@ class BranchNodeRunner(flow: Workflow) extends NodeRunner with Logging {
       }
     }
     rules.iterator.map { rule =>
-      val matched = BranchExpressionUtils.evaluateCondition(rule.condition, context)
-      val selectedTargetName = if (matched) rule.targetName else rule.onFailureTarget
-      logInfo(s"Branch node ${node.getName} rule evaluated: ${rule.condition}, matched=$matched, selectedTarget=${selectedTargetName.getOrElse("")}")
-      selectedTargetName.flatMap { targetName =>
-        val target = matchEdge(targetName)
-        logInfo(s"Branch node ${node.getName} target lookup: ${targetName}, found=${target.isDefined}")
-        target
+      if (!BranchExpressionUtils.isStrictConditionSyntaxValid(rule.condition)) {
+        logInfo(s"Branch node ${node.getName} skip invalid rule condition: ${rule.condition}")
+        None
+      } else {
+        val matched = BranchExpressionUtils.evaluateCondition(rule.condition, context)
+        val selectedTargetName = if (matched) rule.targetName else rule.onFailureTarget
+        logInfo(s"Branch node ${node.getName} rule evaluated: ${rule.condition}, matched=$matched, selectedTarget=${selectedTargetName.getOrElse("")}")
+        selectedTargetName.flatMap { targetName =>
+          val target = matchEdge(targetName)
+          logInfo(s"Branch node ${node.getName} target lookup: ${targetName}, found=${target.isDefined}")
+          target
+        }
       }
     }.find(_.isDefined).flatten
   }

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/utils/BranchExpressionUtils.scala

@@ -146,20 +146,11 @@ object BranchExpressionUtils extends Logging {
 
   def evaluateCondition(condition: String, context: Map[String, String]): Boolean = {
     val normalized = Option(condition).map(_.trim).getOrElse("")
-    if (normalized.isEmpty) {
+    if (!isStrictConditionSyntaxValid(normalized)) {
       false
     } else {
-      if (normalized.startsWith("${") && normalized.endsWith("}")) {
-        warn(s"Invalid branch condition syntax, wrapper `$${...}` is not allowed: $condition")
-        return false
-      }
       val expr = normalized
-      if (isUnsupportedDefaultKeyword(expr)) return false
       val operators = Seq("==", "!=", ">=", "<=", ">", "<")
-      if (!operators.exists(expr.contains)) {
-        warn(s"Invalid branch condition syntax, explicit comparison is required: $condition")
-        return false
-      }
       operators.collectFirst {
         case operator if expr.contains(operator) =>
           val parts = expr.split(java.util.regex.Pattern.quote(operator), 2).map(_.trim)
@@ -181,6 +172,21 @@ object BranchExpressionUtils extends Logging {
     }
   }
 
+  private val StrictConditionPattern = "^[A-Za-z0-9_.-]+\s*(==|!=|>=|<=|>|<)\s*([A-Za-z0-9_.-]+|\"[^\"]*\"|'[^']*')$".r
+
+  def isStrictConditionSyntaxValid(condition: String): Boolean = {
+    val normalized = Option(condition).map(_.trim).getOrElse("")
+    if (normalized.isEmpty || isUnsupportedDefaultKeyword(normalized)) {
+      false
+    } else {
+      val valid = StrictConditionPattern.pattern.matcher(normalized).matches()
+      if (!valid) {
+        warn(s"Invalid branch condition syntax, explicit comparison expression is required: $condition")
+      }
+      valid
+    }
+  }
+
   private def stripExpressionWrapper(expression: String): String = {
     if (expression.startsWith("${") && expression.endsWith("}")) {
       expression.substring(2, expression.length - 1).trim

dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/DSSFlowServiceImpl.java

@@ -173,6 +173,7 @@ public class DSSFlowServiceImpl implements DSSFlowService {
     private static final String nodeUIViewIdKey = "viewId";
 
     private static final Pattern pattern = Pattern.compile("^[a-zA-Z][a-zA-Z0-9_-]*$");
+    private static final Pattern STRICT_BRANCH_CONDITION_PATTERN = Pattern.compile("^[A-Za-z0-9_.-]+\\s*(==|!=|>=|<=|>|<)\\s*([A-Za-z0-9_.-]+|\\"[^\\"]*\\"|'[^']*')$");
     private static final String BRANCH_NODE_TYPE = "workflow.branch";
 
     protected Sender getOrchestratorSender() {
@@ -650,10 +651,7 @@ private boolean isStrictBranchCondition(String condition) {
             return false;
         }
         String expr = condition.trim();
-        if (expr.startsWith("${") && expr.endsWith("}")) {
-            return false;
-        }
-        return expr.contains("==") || expr.contains("!=") || expr.contains(">=") || expr.contains("<=") || expr.contains(">") || expr.contains("<");
+        return STRICT_BRANCH_CONDITION_PATTERN.matcher(expr).matches();
     }
 
     private boolean isUnsupportedDefaultKeyword(String condition) {