From e840ae2a9143bfc1160bae063a41a9b92e04bca9 Mon Sep 17 00:00:00 2001
From: greninja <sshadab84@gmail.com>
Date: Wed, 28 Dec 2016 21:31:10 +0530
Subject: [PATCH] Features added referring to #15

---
 conf/.cuckoo.conf.swp          | Bin 0 -> 16384 bytes
 conf/cuckooml.conf             |   3 +++
 modules/processing/cuckooml.py |  38 +++++++++++++++++++++++++++++++--
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 conf/.cuckoo.conf.swp

diff --git a/conf/.cuckoo.conf.swp b/conf/.cuckoo.conf.swp
new file mode 100644
index 0000000000000000000000000000000000000000..c6a0f7037a8f60bdf5db047dbf8ad05e1827fa93
GIT binary patch
literal 16384
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
M`n49Mg50D30S8t$HUIzs

literal 0
HcmV?d00001

diff --git a/conf/cuckooml.conf b/conf/cuckooml.conf
index 71d65e46..b4cb0296 100644
--- a/conf/cuckooml.conf
+++ b/conf/cuckooml.conf
@@ -38,3 +38,6 @@ compare_new_samples = true
 
 # Set folder for samples to be compared against clustering
 test_directory = sample_data/test
+
+# Enable plotting functionality
+plotting = true
diff --git a/modules/processing/cuckooml.py b/modules/processing/cuckooml.py
index 14912c24..6c8b9306 100644
--- a/modules/processing/cuckooml.py
+++ b/modules/processing/cuckooml.py
@@ -15,11 +15,23 @@
 from lib.cuckoo.common.constants import CUCKOO_ROOT
 from math import log
 
+global imported 
+imported = True
+
+if Config("cuckooml").cuckooml.plotting:
+    try:
+        import matplotlib.pyplot as plt
+        import seaborn as sns
+    except ImportError, e:
+        print >> sys.stderr, "Plotting libraries \
+            (matplotlib and seaborn) are not available."
+        print >> sys.stderr, e
+	imported = False
+
+        
 try:
-    import matplotlib.pyplot as plt
     import numpy as np
     import pandas as pd
-    import seaborn as sns
     from hdbscan import HDBSCAN
     from sklearn import metrics
     from sklearn.cluster import DBSCAN
@@ -797,6 +809,17 @@ def filter_dataset(self, dataset=None, feature_coverage=0.1,
 
     def detect_abnormal_behaviour(self, count_dataset=None, figures=True):
         """Detect samples that behave significantly different than others."""
+        
+	# Safety check for plotting	
+	if not imported:
+		figures = False        
+	else:		
+        	if not Config("cuckooml").cuckooml.plotting and figures:
+			print >> sys.stderr, "Warning:'plotting' flag disabled in conf/cuckooml.conf, \
+                                  'figures' flag will be overwritten."
+			figures = False
+
+
         if count_dataset is None:
             # Pull all count features
             count_features = self.feature_category(":count:")
@@ -1133,6 +1156,17 @@ def performance_metric(clustering, labels, data, noise):
 
     def clustering_label_distribution(self, clustering, labels, plot=False):
         """Get statistics about number of ground truth labels per cluster."""
+        
+        # Safety check for plotting
+	if not imported:
+		plot = False        
+	else:
+		if not Config("cuckooml").cuckooml.plotting and plot:
+			print >> sys.stderr, "Warning:'plotting' flag disabled in conf/cuckooml.conf, \
+                                  'plot' flag will be overwritten."
+			plot = False
+
+
         cluster_ids = set(clustering["label"].tolist())
         labels_ids = set(labels["label"].tolist())
         cluster_distribution = {}