honeynet#15 features added

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
+
+# Do plotting?
+plotting = true

modules/processing/cuckooml.py

@@ -15,11 +15,18 @@
 from lib.cuckoo.common.constants import CUCKOO_ROOT
 from math import log
 
+if Config("cuckooml").cuckooml.plotting:
+    try:
+        import matplotlib.pyplot as plt
+        import seaborn as sns
+    except ImportError, e:
+        print >> sys.stderr, "Some error while importing"
+        print >> sys.stderr, e
+
+
 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
@@ -800,7 +807,10 @@ def detect_abnormal_behaviour(self, count_dataset=None, figures=True):
 
         # Safety check for plotting
         if not Config("cuckooml").cuckooml.plotting and figures:
-            print >> sys.stderr, "Warning: 'plotting' and 'figures' do not match. Plotting modules might not be imported."
+
+            print >> sys.stderr, "Warning: 'plotting' and 'figures' do not match. \
+                                  Plotting modules might not be imported."
+
             figures = False
 
 
@@ -1143,7 +1153,9 @@ def clustering_label_distribution(self, clustering, labels, plot=False):
 
         # Safety check for plotting
         if not Config("cuckooml").cuckooml.plotting and plot:
-            print >> sys.stderr, "Warning: 'plotting' and 'plot' do not match. Plotting modules might not be imported."
+	    print >> sys.stderr, "Warning: 'plotting' and 'plot' do not match.\
+                                  Plotting modules might not be imported."
+
             plot = False
 
 

requirements.txt

@@ -3,6 +3,7 @@ beautifulsoup4==4.4.1
 cffi==1.2.1
 chardet==2.3.0
 cryptography==1.0
+cython==0.25.2
 Django==1.8.4
 dpkt==1.8.6.2
 ecdsa==0.13