Menu and Error Checking updated

utils/allowlist.py

@@ -58,7 +58,7 @@ def checkpoint_stomper(checkpoint, url, policy, headers):
 
 def listPolicies(url): 
     endpoint = url + '/v1/group'
-    print(ct.colorText("[+] Grabbing All Policies", "magenta"))
+    print(ct.colorText("[+] Grabbing All Policies", "cyan"))
     payload = {}
     headers = {
         "X-APIKey": os.getenv('APIKEY')
@@ -71,6 +71,6 @@ def listPolicies(url):
         print(ct.colorText(f"{index}. {list['name']}", "yellow"))
         policiesnames.append(list['name'])
         policyids.append(list['groupid'])
-    choice = input(ct.colorText("Select Policy Group: ", "yellow"))
+    choice = input(ct.colorText("Select Policy Group: ", "white"))
     choice = int(choice) - 1
     return choice, policiesnames

utils/getdeviceevents.py

@@ -58,17 +58,23 @@ def devicehistory(url, outputjson: bool):
 	}
 
 	response = requests.request("POST", endpoint, headers=headers, data=payload, verify=False)
-	
-	if outputjson == True:
+
+	if outputjson:
 		return response
 
 	parse_text = json.loads(response.text)
 
-	for block in parse_text['response']['exechistory']:
-		print(ct.colorText(f"Command: {block['commandline']}","green"))
-		print(ct.colorText(f"Date: {block['datetime']}","green"))
-		print(ct.colorText(f"Filename: {block['filename']}","green"))
-		print(ct.colorText(f"Policy Name: {block['policyname']}","green"))
-		print(ct.colorText(f"Hostname: {block['hostname']}","green"))
-		print(ct.colorText(f"Hash: {block['sha256']}","green"))
-		print("\n")
+	# Safely get exechistory
+	exechistory = parse_text.get('response', {}).get('exechistory')
+
+	if isinstance(exechistory, list):
+		for block in exechistory:
+			print(ct.colorText(f"Command: {block.get('commandline', 'N/A')}", "green"))
+			print(ct.colorText(f"Date: {block.get('datetime', 'N/A')}", "green"))
+			print(ct.colorText(f"Filename: {block.get('filename', 'N/A')}", "green"))
+			print(ct.colorText(f"Policy Name: {block.get('policyname', 'N/A')}", "green"))
+			print(ct.colorText(f"Hostname: {block.get('hostname', 'N/A')}", "green"))
+			print(ct.colorText(f"Hash: {block.get('sha256', 'N/A')}", "green"))
+			print("\n")
+	else:
+		print(ct.colorText("No execution history found or data is not in expected format.", "red"))

utils/hashfunctions.py

@@ -16,7 +16,7 @@ import pandas as pd
 import requests
 import os
 import json
-import utils.colortext as ct
+
 
 
 def aggregateHashes(executions_json) -> pd.DataFrame:
@@ -28,7 +28,7 @@ def aggregateHashes(executions_json) -> pd.DataFrame:
 
     if df.empty:
          return df
-    print(color_text(df,"green"))
+    print(df)
     # Aggregate by sha256, deduplicate lists, and preserve order
     agg_df = df.groupby("sha256").agg(lambda x: list(dict.fromkeys(x))).reset_index()