Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solved naive filesystem path concatenation Issue#20 #23

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −9
Open

Solved naive filesystem path concatenation Issue#20 #23

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
175db39
Update cuckooml.py
Oct 6, 2018
2d33485
Update cuckooml.py
Oct 6, 2018
9449f83
Update cuckooml.py
Oct 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions modules/processing/cuckooml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def init_cuckooml():

# Load reports for clustering
loader = Loader()
loader.load_binaries(CUCKOO_ROOT + "/" + cfg.cuckooml.data_directory)
loader.load_binaries(os.path.join(CUCKOO_ROOT, cfg.cuckooml.data_directory))

# Get features dictionaries
simple_features_dict = loader.get_simple_features()
Expand Down Expand Up @@ -140,7 +140,7 @@ def init_cuckooml():


if cfg.cuckooml.compare_new_samples:
test_location = CUCKOO_ROOT + "/" + cfg.cuckooml.test_directory
test_location = os.path.join(CUCKOO_ROOT, cfg.cuckooml.test_directory)

new_sample = None
if os.path.isdir(test_location):
Expand All @@ -163,8 +163,8 @@ def init_cuckooml():

if cfg.cuckooml.clustering and cfg.cuckooml.save_clustering_results:
if cfg.cuckooml.clustering_results_directory:
ml.save_clustering_results(loader, CUCKOO_ROOT+"/"+cfg.cuckooml.\
clustering_results_directory)
ml.save_clustering_results(loader, os.path.join(CUCKOO_ROOT, cfg.cuckooml.\
clustering_results_directory))
else:
ml.save_clustering_results(loader)

Expand Down Expand Up @@ -1076,7 +1076,7 @@ def compare_sample(self, sample, amend=False):
sample.update(clustering["min_samples"], "min_samples")
sample.update(clustering["min_cluster_size"], \
"min_cluster_size")
sample.save_json(os.path.dirname(sample.json_path)+"/")
sample.save_json(os.path.join(os.path.dirname(sample.json_path), "/"))
# TODO: handle more than one test sample
elif isinstance(sample, Loader):
clustering_result = pd.DataFrame()
Expand Down Expand Up @@ -1182,10 +1182,10 @@ def __init__(self):

def load_binaries(self, directory):
"""Load all binaries' reports from given directory."""
self.binaries_location = directory + "/"
self.binaries_location = os.path.join(directory, "/")
for f in os.listdir(directory):
self.binaries[f] = Instance()
self.binaries[f].load_json(directory+"/"+f, f)
self.binaries[f].load_json(os.path.join(directory, f), f)
self.binaries[f].label_sample()
self.binaries[f].extract_features()
self.binaries[f].extract_basic_features()
Expand All @@ -1210,8 +1210,7 @@ def save_binaries(self, alternative_location=""):
save_location = self.binaries_location
if alternative_location:
save_location = alternative_location
if save_location[-1] != "/":
save_location += "/"


# Create directory if it does not exist
if not os.path.exists(save_location):
Expand Down