Cleaning up menu, added Move to Audit/Enforcement

flows/localApproval.py

@@ -27,11 +27,9 @@ from utils.setup import get_base_directory
 from models.agent import Agent
 from services.agenthandler import findAllAgents, moveAgentToRelatedPolicy, selectAgents
 from services.API import AirlockAPIWrapper
-from Server.scheduler import (
-    register_function,
-    run_once_job,
-)
-from utils.utils import colorText, load_env, load_env_json
+
+from utils.utils import colorText
+from utils.configmanager import get_protected_json, load_env, load_env_json
 
 logger = logging.getLogger(__name__)
 
@@ -68,7 +66,7 @@ def getLocalApprovals(api: AirlockAPIWrapper):
 
 def scheduleAddingLAHashes(api: AirlockAPIWrapper):
 
-    policy_relationship_map = load_env_json("POLICY_MAP_ENF_AUD","{}")
+    policy_relationship_map = get_protected_json("POLICY_MAP_ENF_AUD","{}")
     bad_publisher_list = load_env_json("BAD_PUBLISHER", "[]")
     pups = load_env_json("PUPS", "[]")
     threat_tolerance_constant = load_env("VT_THREAT_TOLERANCE", cast_type = int)
@@ -168,7 +166,7 @@ def returnFromLocalApproval(api, device_df, policy_relationship_map, bad_publish
     #TODO finish logic for adding hashes
     """
     working_dir = load_env("WORKING_DIR")
-    policy_relationship_map = load_env_json("POLICY_MAP_ENF_AUD","{}")
+    policy_relationship_map = get_protected_json("POLICY_MAP_ENF_AUD","{}")
     bad_publisher_list = load_env_json("BAD_PUBLISHER", "[]")
     pups = load_env_json("PUPS", "[]")
     threat_tolerance_constant = load_env("VT_THREAT_TOLERANCE")
@@ -225,7 +223,7 @@ def monitorAuditStatus(api: AirlockAPIWrapper):
     last_agents = []
     if not last_agents:
         last_agents = current_agents
-    policy_relationship_map = load_env_json("POLICY_MAP_ENF_AUD","{}")
+    policy_relationship_map = get_protected_json("POLICY_MAP_ENF_AUD","{}")
 
     # Reverse map for audit → enforcement
     reverse_policy_map = {v: k for k, v in policy_relationship_map.items()}

flows/prepPolicy.py

@@ -24,13 +24,12 @@ import pandas as pd
 from models.execution import ExecutionHistoryRecord, Hash
 from models.policy import Allowlist, Policy
 from services.API import AirlockAPIWrapper
+from utils.configmanager import get_protected_value, load_env, load_env_json
 from utils.selector import Selector
 from utils.utils import (
     colorText,
     formatHTML,
     import_to_dataframe,
-    load_env,
-    load_env_json,
     regulator,
 )
 
@@ -250,8 +249,8 @@ def buildPreflights():
         formatHTML(df, f"{working_dir}\\Preflight\\HTML\\{name}.html")
 
 def splitFilepathsGrouped(df, col="filename"):
-    path_exclusion_constant = load_env("PATH_EXCLUSION_CONST", cast_type= int)
-    min_files_for_path = load_env("MIN_FILES_FOR_PATH", cast_type= int)
+    path_exclusion_constant = get_protected_value("PATH_EXCLUSION_CONST", cast_type= int)
+    min_files_for_path = get_protected_value("MIN_FILES_FOR_PATH", cast_type= int)
 
     def clean_split(path):
         if not isinstance(path, (str, bytes, os.PathLike)):
@@ -317,7 +316,7 @@ def calculatePath(approved_hashes, split):
         dfs_by_policy = [approved_hashes]
 
     badpathparts = load_env_json("BAD_PATH_PARTS", "[]")
-    min_files_for_path = load_env("MIN_FILES_FOR_PATH", cast_type = int)
+    min_files_for_path = get_protected_value("MIN_FILES_FOR_PATH", cast_type = int)
 
     processed_dfs = []