DSL Integration

nettacker/core/lib/http.py

@@ -15,6 +15,8 @@
     reverse_and_regex_condition,
     get_http_header_key,
     get_http_header_value,
+    version_matches_dsl,
+    extract_version_from_content,
 )
 
 asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
@@ -90,6 +92,67 @@ def response_conditions_matched(sub_step, response):
                 )
             else:
                 condition_results["responsetime"] = []
+        # DSL version matching support
+        if condition == "version_match":
+            version_config = conditions[condition]
+            # Extract version from response using patterns
+            version_patterns = version_config.get("patterns", [])
+            source = version_config.get("source", "content")
+            dsl_expression = version_config.get("expression", "")
+
+            # Get the content to search from
+            search_content = ""
+            if source == "content":
+                search_content = response.get("content", "")
+            elif source == "headers":
+                header_name = version_config.get("header", "server")
+                search_content = response.get("headers", {}).get(header_name.lower(), "")
+
+            # Extract version
+            detected_version = extract_version_from_content(search_content, version_patterns)
+
+            # Match against DSL expression
+            if detected_version and dsl_expression:
+                match_result = version_matches_dsl(detected_version, dsl_expression)
+                if match_result:
+                    condition_results["version_match"] = [detected_version]
+                else:
+                    condition_results["version_match"] = []
+            else:
+                condition_results["version_match"] = []
+
+        # version_dsl condition (supports multiple expressions with OR logic)
+        if condition == "version_dsl":
+            version_config = conditions[condition]
+            # Extract version from response using patterns
+            version_patterns = version_config.get("patterns", [])
+            dsl_expressions = version_config.get("expressions", [])
+            reverse = version_config.get("reverse", False)
+
+            # Get the content to search from (default to content)
+            search_content = response.get("content", "")
+
+            # Extract version
+            detected_version = extract_version_from_content(search_content, version_patterns)
+
+            # Match against DSL expressions (OR logic - matches if ANY expression matches)
+            match_result = False
+            if detected_version and dsl_expressions:
+                for dsl_expression in dsl_expressions:
+                    if version_matches_dsl(detected_version, dsl_expression):
+                        match_result = True
+                        break
+
+                # Apply reverse logic
+                if reverse:
+                    match_result = not match_result
+
+                if match_result:
+                    condition_results["version_dsl"] = [detected_version]
+                else:
+                    condition_results["version_dsl"] = []
+            else:
+                condition_results["version_dsl"] = []
     if condition_type.lower() == "or":
         # if one of the values are matched, it will be a string or float object in the array
         # we count False in the array and if it's not all []; then we know one of the conditions

nettacker/core/utils/common.py

@@ -13,6 +13,7 @@
 from itertools import product
 
 from nettacker import logger
+from nettacker.core.utils.dsl_matcher import dsl_matcher
 
 log = logger.get_logger()
 
@@ -450,3 +451,43 @@ def generate_compare_filepath(scan_id):
         date_time=now(format="%Y_%m_%d_%H_%M_%S"),
         scan_id=scan_id,
     )
+
+
+def version_matches_dsl(detected_version, dsl_expression):
+    """
+    Check if a detected version matches a DSL expression.
+
+    Supports various version comparison operators:
+    - Range operators: >=, <=, >, <, ==, !=
+    - Semantic operators: ~ (tilde), ^ (caret)
+    - Logical operators: ||, &&, or, and
+    - Range syntax: "1.0 to 2.0", "1.0 - 2.0"
+    - Wildcards: *, ?
+
+    Args:
+        detected_version: Version string detected from target
+        dsl_expression: DSL expression to match against
+
+    Returns:
+        bool: True if version matches the expression
+
+    Examples:
+        version_matches_dsl("2.4.51", ">=2.4.0, <2.4.54")  # True
+        version_matches_dsl("1.2.3", "~1.2.0")  # True (patch-level match)
+        version_matches_dsl("8.18.0", ">=8.0 && <9.0")  # True
+    """
+    return dsl_matcher.parse_dsl_expression(dsl_expression, detected_version)
+
+
+def extract_version_from_content(content, patterns):
+    """
+    Extract version from content using regex patterns.
+
+    Args:
+        content: String content to search
+        patterns: List of regex patterns to try
+
+    Returns:
+        str: Extracted version or None
+    """
+    return dsl_matcher.extract_version_from_response(content, patterns)