regscale-cli 6.21.2.0__py3-none-any.whl → 6.28.2.1__py3-none-any.whl

regscale/integrations/public/fedramp/fedramp_five.py

@@ -2257,7 +2257,7 @@ def create_ports_and_protocols(ports_and_protocols: List[PortsAndProtocolData],
             startPort=port.start_port,
             endPort=port.end_port,
             protocol=port.protocol,
-            purpose=port.purpose,
+            purpose=port.purpose or "N/A",
             usedBy=port.used_by,
             parentId=ssp_id,
             parentModule="securityplans",

regscale/integrations/public/fedramp/poam/scanner.py

@@ -108,7 +108,7 @@ class FedrampPoamIntegration(ScannerIntegration):
                 error_and_exit(FILE_PATH_ERROR)
             self.workbook = self.workbook or load_workbook(filename=self.file_path, data_only=True, read_only=True)
             self.poam_sheets = kwargs.get("poam_sheets") or [
-                sheet for sheet in self.workbook.sheetnames if re.search("POA&M Items", sheet)
+                sheet for sheet in self.workbook.sheetnames if re.search("POA&M Items|Configuration Findings", sheet)
             ]
         except (FileNotFoundError, InvalidFileException, KeyError) as e:
             logger.error(f"Failed to load workbook: {e}")
@@ -338,7 +338,9 @@ class FedrampPoamIntegration(ScannerIntegration):
                 yield from findings
 
             if not poam_id or not poam_id.upper():
-                print(weakness_name, poam_id)
+                logger.debug(
+                    f"Invalid POAM ID on row {index}, sheet {sheet}: weakness_name={weakness_name}, poam_id={poam_id}"
+                )
                 logger.warning(f"Invalid POAM ID on row {index}, sheet {sheet}. Skipping.")
                 yield from findings
 
@@ -403,6 +405,10 @@ class FedrampPoamIntegration(ScannerIntegration):
                         if not status_date:
                             continue
 
+                    # Extract Controls field (Column B) for Configuration Findings
+                    controls = val_mapping.get_value(data, "Controls")
+                    affected_controls = str(controls) if controls else None
+
                     # Validate pluginText
                     finding = IntegrationFinding(
                         control_labels=[],
@@ -436,6 +442,7 @@ class FedrampPoamIntegration(ScannerIntegration):
                         risk_adjustment=self.determine_risk_adjustment(val_mapping.get_value(data, "Risk Adjustment")),
                         operational_requirements=str(val_mapping.get_value(data, "Operational Requirement")),
                         deviation_rationale=str(val_mapping.get_value(data, "Deviation Rationale")),
+                        affected_controls=affected_controls,
                         poam_id=poam_id,
                     )
                     if finding.is_valid():
@@ -498,6 +505,24 @@ class FedrampPoamIntegration(ScannerIntegration):
             asset_ids = val_mapping.get_value(data, ASSET_IDENTIFIER)
             if not asset_ids:
                 return row_assets
+
+            # Skip rows where asset identifier contains date/description text (header rows)
+            asset_ids_str = str(asset_ids).lower()
+            if any(
+                keyword in asset_ids_str
+                for keyword in [
+                    "date the weakness",
+                    "aka discovery",
+                    "permanent column",
+                    "date of intended",
+                    "last changed or closed",
+                    "port/protocol",
+                    "specified in the inventory",
+                ]
+            ):
+                logger.debug(f"Skipping row with header/description text in asset identifier: {str(asset_ids)[:100]}")
+                return row_assets
+
             asset_id_list = self.gen_asset_list(asset_ids)
 
             if not asset_id_list:
@@ -559,6 +584,9 @@ class FedrampPoamIntegration(ScannerIntegration):
                 return raw_type
 
             for asset_id in asset_id_list:
+                # Handle long asset names
+                asset_name, asset_notes = self._handle_long_asset_name(asset_id)
+
                 # Get raw values and clean them
                 raw_values = {
                     "ip": asset_id if validate_ip_address(asset_id) else "",
@@ -571,8 +599,8 @@ class FedrampPoamIntegration(ScannerIntegration):
                 asset_type = determine_asset_type(asset_id, raw_values["type"])
 
                 res = IntegrationAsset(
-                    name=asset_id,
-                    identifier=asset_id,
+                    name=asset_name,  # Use shortened name if needed
+                    identifier=asset_name,  # Use shortened name as identifier
                     asset_type=asset_type,  # Use determined asset type
                     asset_category=regscale_models.AssetCategory.Hardware,
                     parent_id=self.plan_id,
@@ -581,6 +609,7 @@ class FedrampPoamIntegration(ScannerIntegration):
                     ip_address=raw_values["ip"],
                     fqdn=raw_values["fqdn"],
                     mac_address=raw_values["mac"],
+                    notes=asset_notes,  # Store full name if truncated
                     date_last_updated=get_current_datetime(),
                 )
                 row_assets.append(res)
@@ -591,15 +620,53 @@ class FedrampPoamIntegration(ScannerIntegration):
 
         return row_assets
 
+    def _handle_long_asset_name(self, asset_id: str, max_length: int = 450) -> tuple[str, str]:
+        """
+        Handle asset names that exceed database field limits.
+        Generates a hash-based identifier for long names and preserves full name in notes.
+
+        :param str asset_id: The asset identifier
+        :param int max_length: Maximum allowed length (default: 450)
+        :return: Tuple of (shortened_name, notes)
+        :rtype: tuple[str, str]
+        """
+        if len(asset_id) <= max_length:
+            return asset_id, ""
+
+        # Generate hash-based identifier
+        import hashlib
+
+        hash_suffix = hashlib.sha256(asset_id.encode()).hexdigest()[:8]
+        truncated = asset_id[: max_length - 9]  # Leave room for underscore and hash
+        short_name = f"{truncated}_{hash_suffix}"
+        notes = f"Full identifier: {asset_id}"
+
+        logger.warning(f"Asset identifier exceeds {max_length} chars, truncated to: {short_name[:100]}...")
+        return short_name, notes
+
     def gen_asset_list(self, asset_ids: str):
         """
         Generate a list of asset identifiers from a string.
+        Handles multiple separator types: commas, semicolons, pipes, tabs, newlines.
+        Preserves spaces within asset identifiers (e.g., "10.10.160.200 ( 2049 / TCP )").
+        Also removes surrounding brackets that might wrap the list.
 
         :param str asset_ids: The asset identifier string
         :return: The list of asset identifiers
         :rtype: List[str]
         """
-        return [aid.strip() for aid in re.split(r"[,\n\r]+", asset_ids) if isinstance(aid, str) and aid.strip()]
+        # Remove surrounding brackets if present (handles cases like "[10.10.1.1, 10.10.1.2]")
+        asset_ids = asset_ids.strip()
+        if asset_ids.startswith("[") and asset_ids.endswith("]"):
+            asset_ids = asset_ids[1:-1].strip()
+
+        # Split only on actual delimiters: commas, semicolons, pipes, tabs, newlines, carriage returns
+        # Do NOT split on spaces to preserve port/protocol info like "10.10.160.200 ( 2049 / TCP )"
+        return [
+            aid.strip()
+            for aid in re.split(r"[,;\|\t\n\r]+", asset_ids)
+            if isinstance(aid, str) and aid.strip() and len(aid.strip()) > 0
+        ]
 
     @staticmethod
     def empty(string: Optional[str]) -> Optional[str]:
@@ -625,9 +692,10 @@ class FedrampPoamIntegration(ScannerIntegration):
         :return: The status (Open/Closed) or None
         :rtype: Optional[str]
         """
-        if "closed" in sheet.lower():
+        sheet_lower = sheet.lower()
+        if "closed" in sheet_lower:
             return "Closed"
-        elif "open" in sheet.lower():
+        elif "open" in sheet_lower or "configuration findings" in sheet_lower:
             return "Open"
         return None