master #12
+3
-1
@@ -1 +1,3 @@
|
|||||||
.env
|
.env
|
||||||
|
*.html
|
||||||
|
*__pycache__*
|
||||||
+24
-16
@@ -4,6 +4,7 @@ import utils.getdeviceevents
|
|||||||
import utils.allowlist
|
import utils.allowlist
|
||||||
import utils.hashfunctions
|
import utils.hashfunctions
|
||||||
import utils.pathfunctions
|
import utils.pathfunctions
|
||||||
|
import utils.allowfunctions
|
||||||
import urllib3
|
import urllib3
|
||||||
import pandas as pd
|
import pandas as pd
|
||||||
|
|
||||||
@@ -40,28 +41,28 @@ def menu():
|
|||||||
augmented = utils.hashfunctions.augmentAggregatedHashes(url,aggregated)
|
augmented = utils.hashfunctions.augmentAggregatedHashes(url,aggregated)
|
||||||
print(augmented)
|
print(augmented)
|
||||||
|
|
||||||
augmented.to_html("augmentedlist.html", index=False)
|
augmented.to_html("z_augmented_list.html", index=False)
|
||||||
|
|
||||||
badpublisherlist = []
|
badpublisherlist = []
|
||||||
categorized = utils.hashfunctions.categorizeHashes(augmented, 5, badpublisherlist)
|
categorized = utils.hashfunctions.categorizeHashes(augmented, 5, badpublisherlist)
|
||||||
categorized[0].to_html("needsreview.html", index=False)
|
categorized[0].to_html("z_needs_review.html", index=False)
|
||||||
categorized[1].to_html("approved.html", index=False)
|
categorized[1].to_html("z_approved_hashes.html", index=False)
|
||||||
categorized[2].to_html("remaining.html", index=False)
|
categorized[2].to_html("z_remaining.html", index=False)
|
||||||
|
|
||||||
if choice == '4':
|
if choice == '4':
|
||||||
html_file = "augmentedlist.html"
|
html_file = "z_augmented_list.html"
|
||||||
augmented_df = pd.read_html(html_file)
|
augmented_df = pd.read_html(html_file)
|
||||||
print(augmented_df)
|
print(augmented_df)
|
||||||
combined_df = pd.concat(augmented_df, ignore_index=True)
|
combined_df = pd.concat(augmented_df, ignore_index=True)
|
||||||
|
|
||||||
path_eligible, path_ineligible = utils.pathfunctions.filepathInitialGroup(combined_df)
|
path_eligible, path_ineligible = utils.pathfunctions.filepathInitialGroup(combined_df)
|
||||||
path_eligible.to_html("EligblePaths.html", index=False)
|
path_eligible.to_html("z_eligble_paths.html", index=False)
|
||||||
path_ineligible.to_html("IneligiblePaths.html",index=False)
|
path_ineligible.to_html("z_ineligible_paths.html",index=False)
|
||||||
|
|
||||||
if choice == '5':
|
if choice == '5':
|
||||||
|
|
||||||
executionhist = utils.allowlist.allowlistexechistories(url,True)
|
executionhist = utils.allowlist.allowlistexechistories(url,True)
|
||||||
print(executionhist)
|
#print(executionhist)
|
||||||
|
|
||||||
aggregated = utils.hashfunctions.aggregateHashes(executionhist)
|
aggregated = utils.hashfunctions.aggregateHashes(executionhist)
|
||||||
print(aggregated)
|
print(aggregated)
|
||||||
@@ -69,20 +70,27 @@ def menu():
|
|||||||
augmented = utils.hashfunctions.augmentAggregatedHashes(url,aggregated)
|
augmented = utils.hashfunctions.augmentAggregatedHashes(url,aggregated)
|
||||||
print(augmented)
|
print(augmented)
|
||||||
|
|
||||||
augmented.to_html("augmentedlist.html", index=False)
|
augmented.to_html("z_augmented_list.html", index=False)
|
||||||
html_file = "augmentedlist.html"
|
html_file = "z_augmented_list.html"
|
||||||
augmented_df = pd.read_html(html_file)
|
augmented_df = pd.read_html(html_file)
|
||||||
combined_df = pd.concat(augmented_df, ignore_index=True)
|
combined_df = pd.concat(augmented_df, ignore_index=True)
|
||||||
|
|
||||||
path_eligible, path_ineligible = utils.pathfunctions.filepathInitialGroup(combined_df)
|
path_eligible, path_ineligible = utils.pathfunctions.filepathInitialGroup(combined_df)
|
||||||
path_eligible.to_html("EligblePaths.html", index=False)
|
path_eligible.to_html("z_eligble_paths.html", index=False)
|
||||||
path_ineligible.to_html("IneligiblePaths.html",index=False)
|
path_ineligible.to_html("z_ineligible_paths.html",index=False)
|
||||||
|
|
||||||
badpublisherlist = []
|
badpublisherlist = ["Brave Software, Inc.", "Zoom Video Communications, Inc."]
|
||||||
categorized = utils.hashfunctions.categorizeHashes(augmented, 5, badpublisherlist)
|
categorized = utils.hashfunctions.categorizeHashes(augmented, 5, badpublisherlist)
|
||||||
categorized[0].to_html("needsreview.html", index=False)
|
categorized[0].to_html("z_needs_review.html", index=False)
|
||||||
categorized[1].to_html("approved.html", index=False)
|
categorized[1].to_html("z_approved_hashes.html", index=False)
|
||||||
categorized[2].to_html("remaining.html", index=False)
|
categorized[2].to_html("z_remaining.html", index=False)
|
||||||
|
|
||||||
|
allowpaths = utils.allowfunctions.filter_and_drop(categorized[1],path_eligible,4)
|
||||||
|
allowpaths.to_html("z_allowed_paths.html", index=False)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
-62550
File diff suppressed because one or more lines are too long
@@ -0,0 +1,5 @@
|
|||||||
|
hashes = ''
|
||||||
|
while True:
|
||||||
|
inputhash = input("Hash: ")
|
||||||
|
hashes = hashes + ',' + inputhash
|
||||||
|
print(hashes)
|
||||||
@@ -1,2 +1,4 @@
|
|||||||
|
pandas==2.3.2
|
||||||
python-dotenv==1.1.1
|
python-dotenv==1.1.1
|
||||||
Requests==2.32.5
|
Requests==2.32.5
|
||||||
|
urllib3==2.5.0
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,16 @@
|
|||||||
|
import pandas as pd
|
||||||
|
|
||||||
|
def filter_and_drop(approved, eligiblepaths, min_hashes):
|
||||||
|
"""
|
||||||
|
Filters eligiblepaths to rows where all hashes are in approved,
|
||||||
|
then drops rows with fewer than min_hashes hashes.
|
||||||
|
"""
|
||||||
|
approved_hashes = set(approved['sha256'])
|
||||||
|
|
||||||
|
def all_hashes_approved(row):
|
||||||
|
return all(h in approved_hashes for h in row['sha256'])
|
||||||
|
|
||||||
|
filtered = eligiblepaths[eligiblepaths.apply(all_hashes_approved, axis=1)]
|
||||||
|
filtered = filtered[filtered['sha256'].apply(len) >= min_hashes]
|
||||||
|
|
||||||
|
return filtered
|
||||||
+58
-24
@@ -2,6 +2,7 @@ import datetime
|
|||||||
import requests
|
import requests
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
def allowlistexechistories(url, outputjson: bool):
|
def allowlistexechistories(url, outputjson: bool):
|
||||||
endpoint = url + '/v1/group'
|
endpoint = url + '/v1/group'
|
||||||
@@ -20,38 +21,71 @@ def allowlistexechistories(url, outputjson: bool):
|
|||||||
policyids.append(list['groupid'])
|
policyids.append(list['groupid'])
|
||||||
choice = input("Select Policy Group: ")
|
choice = input("Select Policy Group: ")
|
||||||
choice = int(choice) - 1
|
choice = int(choice) - 1
|
||||||
endpoint = url + '/v1/logging/exechistories'
|
checkpoint = '000000000000000000000000'
|
||||||
payload_dict = {
|
json_output = {'error': 'Success', 'response': {'exechistories': []}}
|
||||||
"type":[1, 2, 6, 7],
|
while True:
|
||||||
"checkpoint":"68a153c23963989b484541b4",
|
json_response_data = checkpoint_stomper(checkpoint, url, policiesnames[choice], headers)
|
||||||
"policy": [policiesnames[choice]]
|
if not json_response_data['response']['exechistories']:
|
||||||
}
|
break
|
||||||
payload = json.dumps(payload_dict)
|
for index, item in enumerate(json_response_data['response']['exechistories']):
|
||||||
print(payload)
|
if index == len(json_response_data['response']['exechistories']) -1:
|
||||||
response = requests.request("POST", endpoint, headers=headers, data=payload, verify=False)
|
checkpoint = item['checkpoint']
|
||||||
|
print(f"Date Greater than 30 Days, Stepping to new Checkpoint. {item['checkpoint']}")
|
||||||
|
else:
|
||||||
|
if (datetime.date.today() - datetime.timedelta(days=10) > datetime.datetime.strptime(item['datetime'].replace(' +0000 UTC', ''), '%Y-%m-%dT%H:%M:%SZ').date()):
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
#json_output['response']['exechistories'].append(json_response_data['response']['exechistories'][1])
|
||||||
|
for output in json_response_data['response']['exechistories']:
|
||||||
|
json_output['response']['exechistories'].append(output)
|
||||||
|
json_output = json.dumps(json_output)
|
||||||
if outputjson == True:
|
if outputjson == True:
|
||||||
return response
|
return json_output
|
||||||
|
#endpoint = url + '/v1/logging/exechistories'
|
||||||
parse_text = json.loads(response.text)
|
#payload_dict = {
|
||||||
for item in parse_text['response']['exechistories']:
|
# "type":[1, 2, 6, 7],
|
||||||
print(item['checkpoint'])
|
# "checkpoint":"000000000000000000000000",
|
||||||
print(item['datetime'])
|
# "policy": [policiesnames[choice]]
|
||||||
print(item['hostname'])
|
#}
|
||||||
print(item['filename'])
|
#payload = json.dumps(payload_dict)
|
||||||
|
#print(payload)
|
||||||
|
#response = requests.request("POST", endpoint, headers=headers, data=payload, verify=False)
|
||||||
|
#parse_text = json.loads(response.text)
|
||||||
|
#text_response = checkpoint_stomper(parse_text['response']['exechistories'], url, policiesnames[choice])
|
||||||
|
#
|
||||||
|
#if outputjson == False:
|
||||||
|
# return response
|
||||||
|
#
|
||||||
|
#parse_text = json.loads(response.text)
|
||||||
|
#
|
||||||
|
#for item in parse_text['response']['exechistories']:
|
||||||
|
# print(item['checkpoint'])
|
||||||
|
# print(item['datetime'])
|
||||||
|
# print(item['hostname'])
|
||||||
|
# print(item['filename'])
|
||||||
# checkpoint_stomper(item['checkpoint'], endpoint, headers, policiesnames[choice])
|
# checkpoint_stomper(item['checkpoint'], endpoint, headers, policiesnames[choice])
|
||||||
|
|
||||||
def checkpoint_stomper(checkpoint, endpoint, headers, policyname):
|
def checkpoint_stomper(checkpoint, url, policy, headers):
|
||||||
print(checkpoint)
|
endpoint = url + '/v1/logging/exechistories'
|
||||||
payload_dict = {
|
payload_dict = {
|
||||||
"type":[1,2,6,7],
|
"type":[1,2,6,7],
|
||||||
"checkpoint": checkpoint,
|
"checkpoint": checkpoint,
|
||||||
"policy":[policyname]
|
"policy": [policy]
|
||||||
}
|
}
|
||||||
payload = json.dumps(payload_dict)
|
payload = json.dumps(payload_dict)
|
||||||
response = requests.request("POST", endpoint, headers=headers, data=payload, verify=False)
|
response = requests.request("POST", endpoint, headers=headers, data=payload, verify=False)
|
||||||
parse_text = json.loads(response.text)
|
parse_text = json.loads(response.text)
|
||||||
# Send Whole JSON Response
|
return parse_text
|
||||||
for item in parse_text['response']['exechistories']:
|
#for index, item in enumerate(parse_text):
|
||||||
print("test")
|
# if index == len(parse_text) - 1:
|
||||||
|
# checkpoint = item['checkpoint']
|
||||||
|
# print(f"Time: {item['datetime']} Checkpoint: {item['checkpoint']}")
|
||||||
|
# response_fuzzer(checkpoint, url, policyname)
|
||||||
|
# else:
|
||||||
|
# if (datetime.date.today() - datetime.timedelta(days=30) > datetime.datetime.strptime(item['datetime'].replace( ' +0000 UTC', ''), '%Y-%m-%dT%H:%M:%SZ').date()):
|
||||||
|
# pass
|
||||||
|
# else:
|
||||||
|
# response_fuzzer(checkpoint, url, policyname)
|
||||||
|
|
||||||
|
|
||||||
|
print("Finished")
|
||||||
+24
-14
@@ -8,12 +8,12 @@ def aggregateHashes(executions_json) -> pd.DataFrame:
|
|||||||
"""
|
"""
|
||||||
Takes the executions, aggregates all the data with sha256 as primary, then returns aggregated dataframe
|
Takes the executions, aggregates all the data with sha256 as primary, then returns aggregated dataframe
|
||||||
"""
|
"""
|
||||||
data = executions_json.json()
|
data = json.loads(executions_json)
|
||||||
df = pd.DataFrame(data["response"]["exechistories"])
|
df = pd.DataFrame(data["response"]["exechistories"])
|
||||||
|
|
||||||
if df.empty:
|
if df.empty:
|
||||||
return df
|
return df
|
||||||
|
print(df)
|
||||||
# Aggregate by sha256, deduplicate lists, and preserve order
|
# Aggregate by sha256, deduplicate lists, and preserve order
|
||||||
agg_df = df.groupby("sha256").agg(lambda x: list(dict.fromkeys(x))).reset_index()
|
agg_df = df.groupby("sha256").agg(lambda x: list(dict.fromkeys(x))).reset_index()
|
||||||
|
|
||||||
@@ -64,16 +64,17 @@ def augmentAggregatedHashes(url, agg_df: pd.DataFrame) -> pd.DataFrame:
|
|||||||
|
|
||||||
df_api = pd.DataFrame(rows)
|
df_api = pd.DataFrame(rows)
|
||||||
|
|
||||||
aug_df = agg_df.merge(df_api, on="sha256", how="left")
|
df = agg_df.merge(df_api, on="sha256", how="left")
|
||||||
|
aug_df = df[['sha256', 'filename_x', 'description', 'productname', 'productversion', 'publisher_y', 'publisher_x', 'netdomain', 'hostname', 'username', 'pprocess', 'gprocess', 'commandline', 'reputation_lastseen', 'reputation_scannercount', 'reputation_scannermatch', 'reputation_status', 'reputation_threatlevel', 'reputation_threatname', 'reputation_timestamp']]
|
||||||
return aug_df
|
return aug_df
|
||||||
|
|
||||||
def categorizeHashes(aug_df: pd.DataFrame, threat_tolerance: int, untrusted_publishers: list):
|
def categorizeHashes(aug_df: pd.DataFrame, threat_tolerance: int, untrusted_publishers: list):
|
||||||
if untrusted_publishers is None:
|
if untrusted_publishers is None:
|
||||||
untrusted_publishers = []
|
untrusted_publishers = []
|
||||||
|
|
||||||
df = aug_df.copy()
|
df = aug_df.copy()
|
||||||
def reputationtool(row, threat_tolerance):
|
|
||||||
|
def reputationtool(row, threat_tolerance):
|
||||||
if row["reputation_scannermatch"] == "N/A":
|
if row["reputation_scannermatch"] == "N/A":
|
||||||
return True
|
return True
|
||||||
try:
|
try:
|
||||||
@@ -83,11 +84,20 @@ def categorizeHashes(aug_df: pd.DataFrame, threat_tolerance: int, untrusted_publ
|
|||||||
pass
|
pass
|
||||||
return False
|
return False
|
||||||
|
|
||||||
mask_needsreview = (df["publisher_y"] == "Not Signed") & df.apply(lambda row: reputationtool(row, threat_tolerance), axis=1)
|
mask_needsreview = (df["publisher_y"] == "Not Signed") & df.apply(lambda row: reputationtool(row, threat_tolerance), axis=1)
|
||||||
mask_approved = (df["publisher_y"] != "Not Signed") & (~df["publisher_y"].isin(untrusted_publishers))
|
|
||||||
|
|
||||||
needsreview_df = df[mask_needsreview]
|
mask_approved = (
|
||||||
approved_df = df[mask_approved]
|
((df["publisher_y"] != "Not Signed") & (~df["publisher_y"].isin(untrusted_publishers))) &
|
||||||
remaining_df = df[~(mask_needsreview | mask_approved)]
|
(df["publisher_y"] != "Not Signed") # explicitly signed
|
||||||
|
) | (
|
||||||
|
(df["publisher_y"] == "Not Signed") &
|
||||||
|
(~df.apply(lambda row: reputationtool(row, threat_tolerance), axis=1)) &
|
||||||
|
(~df["publisher_y"].isin(untrusted_publishers)) # exclude untrusted even if unsigned
|
||||||
|
)
|
||||||
|
|
||||||
return needsreview_df, approved_df, remaining_df
|
|
||||||
|
needsreview_df = df[mask_needsreview]
|
||||||
|
approved_df = df[mask_approved]
|
||||||
|
remaining_df = df[~(mask_needsreview | mask_approved)]
|
||||||
|
|
||||||
|
return needsreview_df, approved_df, remaining_df
|
||||||
|
|||||||
+27
-1
@@ -41,18 +41,44 @@ def filepathInitialGroup(df: pd.DataFrame):
|
|||||||
return join_parts(prefix)
|
return join_parts(prefix)
|
||||||
|
|
||||||
# Step 6: Group directories by shared prefix using custom logic
|
# Step 6: Group directories by shared prefix using custom logic
|
||||||
|
"""
|
||||||
|
Loop through each directory path
|
||||||
|
directories: list of all directory paths.
|
||||||
|
groups: will hold lists of grouped directories.
|
||||||
|
used: tracks which directories have already been grouped.
|
||||||
|
"""
|
||||||
directories = df["directory"].tolist()
|
directories = df["directory"].tolist()
|
||||||
groups = []
|
groups = []
|
||||||
used = set()
|
used = set()
|
||||||
|
|
||||||
|
#For Each directory, compare it with others
|
||||||
|
"""
|
||||||
|
Skip if already grouped.
|
||||||
|
Start a new group with the current path.
|
||||||
|
parts_i is the list of folder names in the path (e.g., ["C:", "Users", "John", "Documents"]).
|
||||||
|
"""
|
||||||
|
|
||||||
for i, path in enumerate(directories):
|
for i, path in enumerate(directories):
|
||||||
if path in used:
|
if path in used:
|
||||||
continue
|
continue
|
||||||
group = [path]
|
group = [path]
|
||||||
parts_i = get_parts(path)
|
parts_i = get_parts(path)
|
||||||
|
|
||||||
|
#Compare with all other directories: For each other directory, split it into parts and find the common prefix (shared folder structure).
|
||||||
|
"""
|
||||||
|
Logic:
|
||||||
|
If the directory is deep (>3 parts) and shares at least 3 parts → group it.
|
||||||
|
If it's exactly 3 parts long and shares at least 2 → group it.
|
||||||
|
Or, if it shares all but one part and is deep → group it.
|
||||||
|
These rules are designed to:
|
||||||
|
Group directories that are closely related in structure.
|
||||||
|
Avoid grouping unrelated paths that just happen to start similarly.
|
||||||
|
"""
|
||||||
|
|
||||||
for j in range(i + 1, len(directories)):
|
for j in range(i + 1, len(directories)):
|
||||||
parts_j = get_parts(directories[j])
|
parts_j = get_parts(directories[j])
|
||||||
common = os.path.commonprefix([parts_i, parts_j])
|
common = os.path.commonprefix([parts_i, parts_j])
|
||||||
|
#Apply grouping rules
|
||||||
if (len(parts_i) > 3 and len(common) >= 3) or (len(parts_i) == 3 and len(common) >= 2):
|
if (len(parts_i) > 3 and len(common) >= 3) or (len(parts_i) == 3 and len(common) >= 2):
|
||||||
group.append(directories[j])
|
group.append(directories[j])
|
||||||
used.add(directories[j])
|
used.add(directories[j])
|
||||||
@@ -81,7 +107,7 @@ def filepathInitialGroup(df: pd.DataFrame):
|
|||||||
path_ineligible = grouped_df[grouped_df["depth"] <= 2].drop(columns=["depth"])
|
path_ineligible = grouped_df[grouped_df["depth"] <= 2].drop(columns=["depth"])
|
||||||
|
|
||||||
# Step 10: Move entries from eligible to ineligible if grouped_directory contains 'C:\Users' or 'c$\Users'
|
# Step 10: Move entries from eligible to ineligible if grouped_directory contains 'C:\Users' or 'c$\Users'
|
||||||
mask = path_eligible["grouped_directory"].str.contains(r"(?i)(?:\\Users|\\c\$\\Users)")
|
mask = path_eligible["grouped_directory"].str.contains(r"(?i)(?:\\Users|\\c\$\\Users|inetpub\\wwwroot|windows\\temp)", na=False)
|
||||||
move_to_ineligible = path_eligible[mask]
|
move_to_ineligible = path_eligible[mask]
|
||||||
path_eligible = path_eligible[~mask]
|
path_eligible = path_eligible[~mask]
|
||||||
path_ineligible = pd.concat([path_ineligible, move_to_ineligible], ignore_index=True)
|
path_ineligible = pd.concat([path_ineligible, move_to_ineligible], ignore_index=True)
|
||||||
|
|||||||
Reference in New Issue
Block a user