regscale-cli 6.26.0.0__py3-none-any.whl → 6.27.0.0__py3-none-any.whl

regscale/integrations/control_matcher.py

@@ -49,6 +49,7 @@ class ControlMatcher:
         Handles various formats:
         - NIST format: AC-1, AC-1(1), AC-1.1
         - With leading zeros: AC-01, AC-17(02)
+        - With spaces: AC-1 (1), AC-02 (04)
         - With text: "Access Control AC-1"
         - Multiple controls: "AC-1, AC-2"
 
@@ -63,14 +64,32 @@ class ControlMatcher:
         control_string = control_string.strip().upper()
 
         # Common NIST control ID pattern
-        # Matches: AC-1, AC-01, AC-1(1), AC-1(01), AC-1.1, AC-1.01, etc.
-        pattern = r"([A-Z]{2,3}-\d+(?:\(\d+\)|\.\d+)?)"
+        # Matches: AC-1, AC-01, AC-1(1), AC-1(01), AC-1 (1), AC-1.1, AC-1.01, etc.
+        # Allows optional whitespace before and inside parentheses
+        pattern = r"([A-Z]{2,3}-\d+(?:\s*\(\s*\d+\s*\)|\.\d+)?)"
 
         matches = re.findall(pattern, control_string)
         if matches:
-            # Normalize parentheses to dots for consistency
+            # Normalize parentheses to dots for consistency and remove spaces
             control_id = matches[0]
+            control_id = control_id.replace(" ", "")  # Remove all spaces
             control_id = control_id.replace("(", ".").replace(")", "")
+
+            # Normalize leading zeros (e.g., AC-01.02 -> AC-1.2)
+            parts = control_id.split("-")
+            if len(parts) == 2:
+                family = parts[0]
+                number_part = parts[1]
+
+                if "." in number_part:
+                    main_num, enhancement = number_part.split(".", 1)
+                    main_num = str(int(main_num))
+                    enhancement = str(int(enhancement))
+                    control_id = f"{family}-{main_num}.{enhancement}"
+                else:
+                    main_num = str(int(number_part))
+                    control_id = f"{family}-{main_num}"
+
             return control_id
 
         return None

regscale/integrations/due_date_handler.py

@@ -4,7 +4,7 @@
 
 import logging
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Union
 
 from regscale.core.app.application import Application
 from regscale.core.utils.date import get_day_increment
@@ -53,9 +53,13 @@ class DueDateHandler:
         # Default due date timelines (days)
         self.default_timelines = {
             regscale_models.IssueSeverity.Critical: 30,
+            "critical": 30,
             regscale_models.IssueSeverity.High: 60,
+            "high": 60,
             regscale_models.IssueSeverity.Moderate: 120,
+            "moderate": 120,
             regscale_models.IssueSeverity.Low: 364,
+            "low": 364,
         }
 
         # Load integration-specific timelines from config
@@ -66,10 +70,10 @@ class DueDateHandler:
 
     def _load_integration_timelines(self) -> Dict[regscale_models.IssueSeverity, int]:
         """
-        Load timeline configurations for this integration from init.yaml
-
-        :return: Dictionary mapping severity to days
-        :rtype: Dict[regscale_models.IssueSeverity, int]
+                Load timeline configurations for this integration from init.yaml
+        mv
+                :return: Dictionary mapping severity to days
+                :rtype: Dict[regscale_models.IssueSeverity, int]
         """
         timelines = self.default_timelines.copy()
 
@@ -184,7 +188,7 @@ class DueDateHandler:
 
     def calculate_due_date(
         self,
-        severity: regscale_models.IssueSeverity,
+        severity: Union[regscale_models.IssueSeverity, str],
         created_date: str,
         cve: Optional[str] = None,
         title: Optional[str] = None,
@@ -192,7 +196,7 @@ class DueDateHandler:
         """
         Calculate the due date for an issue based on severity, KEV status, and integration config
 
-        :param regscale_models.IssueSeverity severity: The severity of the issue
+        :param Union[regscale_models.IssueSeverity, str] severity: The severity of the issue
         :param str created_date: The creation date of the issue
         :param Optional[str] cve: The CVE identifier (if applicable)
         :param Optional[str] title: The title of the issue (for additional context)
@@ -244,7 +248,9 @@ class DueDateHandler:
         # Ensure due date is never in the past (allow yesterday for timezone differences)
         due_date = self._ensure_future_due_date(calculated_due_date, days)
 
-        logger.debug(f"Using {self.integration_name} timeline: {severity.name} = {days} days, due date = {due_date}")
+        logger.debug(
+            f"Using {self.integration_name} timeline: {severity.name if isinstance(severity, regscale_models.IssueSeverity) else severity} = {days} days, due date = {due_date}"
+        )
 
         return due_date
 

regscale/integrations/public/fedramp/docx_parser.py

@@ -246,7 +246,16 @@ class SSPDocParser:
             headers = self.extract_table_headers(table, namespaces)
             table_data = []
             tables_dicts_list["preceding_text"] = preceding_text[i] if i < len(preceding_text) else ""
-            if len(headers) == 1 and headers[0].lower() in vertical_tables:
+            # Check if this is a vertical table:
+            is_vertical = False
+            # - Single header that matches vertical_tables list
+            first_option = len(headers) == 1 and headers[0].lower() in vertical_tables
+            # - OR two headers where first matches and second is empty/whitespace
+            second_option = len(headers) == 2 and headers[0].lower() in vertical_tables and not headers[1].strip()
+            if first_option or second_option:
+                is_vertical = True
+
+            if is_vertical:
                 table_data = self.extract_vertical_row_data(table, namespaces)
                 tables_dicts_list["table_data"] = table_data
                 # tables_dicts_list.append({headers[0].lower(): table_data})