diff --git a/AirlockTools.py b/AirlockTools.py index 04f94c5..575d060 100644 --- a/AirlockTools.py +++ b/AirlockTools.py @@ -37,10 +37,9 @@ min_files_for_path = 4 threat_tolerance_constant = 4 policy_relationship_map ={ #Enforcement : Audit -#"bf0b1f9b-bfea-4f44-97c0-80e27ff61712" : "538d3218-92f4-4943-a6ee-db9267ab62d8", #AT Servers General, AT Servers General Audit -#"31ababac-65de-4c6a-86dd-6691d7e3ee3b" : "fc05b42a-b846-4e72-88ca-c35d416e699f", #AT Epic, #AT Epic Audit -#"d1f58960-f866-49e0-848a-a5b09fffd4cd" : "d55c03a6-c376-4391-8626-4f843b882a7c" #AT DMZ Enforced, #AT DMZ Audit -#"bf0b1f9b-bfea-4f44-97c0-80e27ff61712" : "d126db36-72ed-4937-adc7-d88b7509a5b5" #AT Servers General, AT Testing +"bf0b1f9b-bfea-4f44-97c0-80e27ff61712" : "538d3218-92f4-4943-a6ee-db9267ab62d8", #AT Servers General, AT Servers General Audit +"31ababac-65de-4c6a-86dd-6691d7e3ee3b" : "fc05b42a-b846-4e72-88ca-c35d416e699f", #AT Epic, #AT Epic Audit +"d1f58960-f866-49e0-848a-a5b09fffd4cd" : "d55c03a6-c376-4391-8626-4f843b882a7c" #AT DMZ Enforced, #AT DMZ Audit } @@ -97,7 +96,9 @@ def menu_main(): elif choice == "4": utils.policyfunctions.prepare_to_enforce(url, bad_publisher_list, pups, badpathparts, threat_tolerance_constant, path_exclusion_constant, min_files_for_path) elif choice == "5": - utils.policyfunctions.updateAuditPoliciesFromEnforcementPolices(url, policy_relationship_map) + ct.areYouSure() + confirmation = input(ct.colorText("Type 'I AGREE' to continue: ","white")) + if confirmation.strip().upper() == "I AGREE": utils.policyfunctions.updateAuditPoliciesFromEnforcementPolices(url, policy_relationship_map) elif choice == "6": devicelist = utils.clientfunctions.promptForDevices() utils.clientfunctions.findAgents(url, devicelist, False) diff --git a/utils/hashfunctions.py b/utils/hashfunctions.py index f1097fa..52ef616 100644 --- a/utils/hashfunctions.py +++ b/utils/hashfunctions.py @@ -155,7 +155,6 @@ def combineHashAndHist(hash_path, condensed_path): df = pd.read_parquet(hash_path) # Merge on sha256 df = pd.merge(condensed_combo, df, on='sha256', how='inner') - df.to_csv("testing4.csv") # Rename and reorder columns df = df.rename(columns={'publisher_x': 'publisher'}) df = df.rename(columns={'policy_x': 'policy'}) diff --git a/utils/utils.py b/utils/utils.py index 3a5a4b2..d43fe5a 100644 --- a/utils/utils.py +++ b/utils/utils.py @@ -290,13 +290,13 @@ def printEnforceChecklist(parq_base_dir,appr_base_dir, needappr_base_dir, pfligh print(colorText("Q. Quit", "cyan")) def areYouSure(): - print(colorText(f"🛑*****************************************************************************************************************************************🛑","red")) + print(colorText(f"🛑****************************************************************************************************************************************🛑","red")) print(colorText(f"⚠️=========================================================================================================================================⚠️","yellow")) print(colorText(f"🛑========================================================================================================================================🛑","red")) print(colorText(f"⚠️-------------This program will now begin to make changes to the Airlock Console. Do you understand and agree to proceed? ----------------⚠️", "yellow")) - print(colorText(f"🛑=========================================================================================================================================🛑","red")) + print(colorText(f"🛑========================================================================================================================================🛑","red")) print(colorText(f"⚠️=========================================================================================================================================⚠️","yellow")) - print(colorText(f"🛑******************************************************************************************************************************************🛑","red")) + print(colorText(f"🛑****************************************************************************************************************************************🛑","red")) def locked():