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

regscale/_version.py

@@ -33,7 +33,7 @@ def get_version_from_pyproject() -> str:
                     return match.group(1)
     except Exception:
         pass
-    return "6.21.2.0"  # fallback version
+    return "6.28.2.1"  # fallback version
 
 
 __version__ = get_version_from_pyproject()

regscale/airflow/hierarchy.py

@@ -2,9 +2,9 @@
 
 from typing import Optional
 
-from regscale.regscale import cli
-from regscale.models.click_models import ClickCommand
 from regscale.airflow.click_mixins import AirflowClickGroup
+from regscale.models.click_models import ClickCommand
+from regscale.regscale import cli
 
 AIRFLOW_CLICK_GROUP = AirflowClickGroup.from_group(cli, prefix="regscale")
 AIRFLOW_CLICK_OPERATORS = AIRFLOW_CLICK_GROUP.flatten_operator()

regscale/core/app/api.py

@@ -43,8 +43,11 @@ class Api:
         from regscale.core.app.application import Application
         from regscale.integrations.variables import ScannerVariables
 
-        if isinstance(timeout, str):
-            timeout = int(timeout)
+        if isinstance(timeout, str) or isinstance(timeout, float):
+            try:
+                timeout = int(timeout)
+            except ValueError:
+                timeout = ScannerVariables.timeout
 
         self.verify = True
         self.timeout = timeout

regscale/core/app/application.py

@@ -77,10 +77,18 @@ class Application(metaclass=Singleton):
             "azureCloudSecret": DEFAULT_SECRET,
             "azureCloudTenantId": DEFAULT_TENANT,
             "azureCloudSubscriptionId": "<mySubscriptionIdGoesHere>",
+            "azureEntraAccessToken": DEFAULT_POPULATED,
+            "azureEntraClientId": DEFAULT_CLIENT,
+            "azureEntraSecret": DEFAULT_SECRET,
+            "azureEntraTenantId": DEFAULT_TENANT,
             "cisaKev": "https://www.cisa.gov/sites/default/files/feeds/known_exploited_vulnerabilities.json",
             "crowdstrikeClientId": DEFAULT_CLIENT,
             "crowdstrikeClientSecret": DEFAULT_SECRET,
             "crowdstrikeBaseUrl": "<crowdstrikeApiUrl>",
+            "csamToken": DEFAULT_SECRET,
+            "csamURL": "<myCSAMURLgoeshere>",
+            "csamFilter": {},
+            "csamFrameworkCatalog": {},
             "dependabotId": "<myGithubUserIdGoesHere>",
             "dependabotOwner": "<myGithubRepoOwnerGoesHere>",
             "dependabotRepo": "<myGithubRepoNameGoesHere>",
@@ -197,6 +205,12 @@ class Application(metaclass=Singleton):
                     "minimumSeverity": "low",
                     "useKev": True,  # Override the issue due date with the KEV date
                 },
+                "tanium_cloud": {
+                    "critical": 30,
+                    "high": 30,
+                    "moderate": 90,
+                    "low": 180,
+                },
                 "tenable": {
                     "critical": 30,
                     "high": 30,
@@ -211,6 +225,7 @@ class Application(metaclass=Singleton):
                     "low": 365,
                     "medium": 90,
                     "status": "Open",
+                    "minimumSeverity": "low",
                 },
                 "xray": {
                     "critical": 30,
@@ -260,6 +275,8 @@ class Application(metaclass=Singleton):
             "tenableMinimumSeverityFilter": "low",
             "token": DEFAULT_POPULATED,
             "userId": "enter RegScale user id here",
+            "useMilestones": False,
+            "preventAutoClose": False,
             "otx": "enter AlienVault API key here",
             "wizAccessToken": DEFAULT_POPULATED,
             "wizAuthUrl": "https://auth.wiz.io/oauth/token",
@@ -654,7 +671,8 @@ class Application(metaclass=Singleton):
 
     def save_config(self, conf: dict) -> None:
         """
-        Save Configuration to init.yaml
+        Save Configuration to init.yaml using atomic file operations to prevent corruption
+        during parallel writes.
 
         :param dict conf: Application configuration
         :rtype: None
@@ -671,8 +689,22 @@ class Application(metaclass=Singleton):
         try:
             self.logger.debug(f"Saving config to {self.config_file}.")
             with self._config_lock:
-                with open(self.config_file, "w", encoding="utf-8") as file:
-                    yaml.dump(conf, file)
+                # Use atomic file operations: write to temp file, then rename
+                # This prevents corruption when multiple processes write simultaneously
+                import tempfile
+
+                config_dir = os.path.dirname(self.config_file) or "."
+                temp_fd, temp_path = tempfile.mkstemp(dir=config_dir, prefix=".tmp_", suffix=".yaml", text=True)
+                try:
+                    with os.fdopen(temp_fd, "w", encoding="utf-8") as temp_file:
+                        yaml.dump(conf, temp_file)
+                    # Atomic rename - this is atomic on POSIX systems
+                    os.replace(temp_path, self.config_file)
+                except Exception:
+                    # Clean up temp file if something goes wrong
+                    with contextlib.suppress(OSError):
+                        os.unlink(temp_path)
+                    raise
         except OSError:
             self.logger.error(f"Could not save config to {self.config_file}.")
 
@@ -694,9 +726,7 @@ class Application(metaclass=Singleton):
         if domain.endswith("/"):
             domain = domain[:-1]
         with contextlib.suppress(requests.RequestException):
-            return api.get(
-                url=f"{domain}/api/config/getLicense".lower(),
-            )
+            return api.get(url=urljoin(domain, "/api/config/getLicense").lower())
         return None
 
     def load_config(self) -> dict:

regscale/core/app/internal/control_editor.py

@@ -32,8 +32,7 @@ from regscale.core.app.utils.app_utils import (
     get_user_names,
 )
 from regscale.models.app_models.click import regscale_id, regscale_module
-from regscale.models.regscale_models.control import Control
-from regscale.models.regscale_models.control_implementation import ControlImplementation
+from regscale.models.regscale_models import Control, ControlImplementation
 
 
 ALL_IMPS = "all_implementations.xlsx"
@@ -256,6 +255,76 @@ def check_and_format_cells(column: str, col: list[Any]) -> None:
             cell.protection = Protection(locked=False)  # Unprotect the cell
 
 
+def _extract_control_owner_display(item: dict) -> str:
+    """
+    Extract and format control owner display name from item data.
+
+    :param dict item: Item data containing controlOwner information
+    :return: Formatted control owner display string
+    :rtype: str
+    """
+    if not item.get("controlOwner") or item["controlOwner"] is None:
+        return "Unassigned"
+
+    control_owner = item["controlOwner"]
+    last_name = str(control_owner.get("lastName", "")).strip() if control_owner.get("lastName") else ""
+    first_name = str(control_owner.get("firstName", "")).strip() if control_owner.get("firstName") else ""
+    user_name = str(control_owner.get("userName", "")).strip() if control_owner.get("userName") else ""
+
+    if last_name or first_name or user_name:
+        return f"{last_name}, {first_name} ({user_name})"
+    return "Unassigned"
+
+
+def _extract_control_data(item: dict) -> tuple:
+    """
+    Extract control-related data from item.
+
+    :param dict item: Item data containing control information
+    :return: Tuple of (control_id, control_title, control_description, control_weight, catalogue_id)
+    :rtype: tuple
+    """
+    if not item.get("control") or item["control"] is None:
+        return "", "", "", 0, 0
+
+    control = item["control"]
+    return (
+        control.get("controlId", ""),
+        control.get("title", ""),
+        control.get("description", ""),
+        control.get("weight", 0),
+        control.get("catalogueID", 0),
+    )
+
+
+def _build_implementation_row(item: dict) -> list:
+    """
+    Build a single implementation row from item data.
+
+    :param dict item: Item data from GraphQL response
+    :return: List representing a row of implementation data
+    :rtype: list
+    """
+    control_owner_display = _extract_control_owner_display(item)
+    control_id, control_title, control_description, control_weight, catalogue_id = _extract_control_data(item)
+
+    return [
+        item.get("id", 0),
+        item.get("controlID", 0),
+        control_owner_display,
+        control_id,
+        control_title,
+        control_description,
+        item.get("status", ""),
+        item.get("policy", ""),
+        item.get("implementation", ""),
+        item.get("responsibility", ""),
+        item.get("inheritable", False),
+        control_weight,
+        catalogue_id,
+    ]
+
+
 def _fetch_implementations(api: "Api", parent_id: int, parent_module: str) -> "pd.DataFrame":
     """
     Function to fetch implementations from RegScale.
@@ -313,25 +382,8 @@ def _fetch_implementations(api: "Api", parent_id: int, parent_module: str) -> "p
     if existing_implementation_data["controlImplementations"]["totalCount"] <= 0:
         error_and_exit("No records exist for the given RegScale Id and RegScale Module.")
 
-    all_imps = [
-        [
-            item["id"],
-            item["controlID"],
-            f'{str(item["controlOwner"]["lastName"]).strip()}, {str(item["controlOwner"]["firstName"]).strip()} '
-            + f'({str(item["controlOwner"]["userName"]).strip()})',
-            item["control"]["controlId"],
-            item["control"]["title"],
-            item["control"]["description"],
-            item["status"],
-            item["policy"],
-            item["implementation"],
-            item["responsibility"],
-            item["inheritable"],
-            item["control"]["weight"],
-            item["control"]["catalogueID"],
-        ]
-        for item in existing_implementation_data.get("controlImplementations", {}).get("items", [])
-    ]
+    items = existing_implementation_data.get("controlImplementations", {}).get("items", [])
+    all_imps = [_build_implementation_row(item) for item in items]
 
     all_imps_df = pd.DataFrame(
         all_imps,