From 29c368250eb2420d3a78a7f196f95f91e69297ac Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Tue, 24 Apr 2018 17:03:10 +0200
Subject: [PATCH] create new dashbord alert

---
 bin/Bitcoin.py | 13 ++++++++++---
 bin/Onion.py   |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/bin/Bitcoin.py b/bin/Bitcoin.py
index eef56940..890a2498 100755
--- a/bin/Bitcoin.py
+++ b/bin/Bitcoin.py
@@ -40,10 +40,11 @@ def check_bc(bc):
         return False
 ########################################################
 
-def search_key(content, message):
+def search_key(content, message, paste):
     bitcoin_address = re.findall(regex_bitcoin_public_address, content)
     bitcoin_private_key = re.findall(regex_bitcoin_private_key, content)
     validate_address = False
+    key = False
     if(len(bitcoin_address) >0):
         #print(message)
         for address in bitcoin_address:
@@ -53,14 +54,20 @@ def search_key(content, message):
                 if(len(bitcoin_private_key) > 0):
                     for private_key in bitcoin_private_key:
                         print('Bitcoin private key found : {}'.format(private_key))
+                        key = True
 
         if(validate_address):
             p.populate_set_out(message, 'Duplicate')
-            to_print = 'bitcoin found: {} address and {} private Keys'.format(len(bitcoin_address), len(bitcoin_private_key))
+            to_print = 'Bitcoin found: {} address and {} private Keys'.format(len(bitcoin_address), len(bitcoin_private_key))
             print(to_print)
             publisher.warning(to_print)
             msg = ('bitcoin;{}'.format(message))
             p.populate_set_out( msg, 'alertHandler')
+            if(key):
+                to_print = 'Bitcoin;{};{};{};'.format(paste.p_source, paste.p_date,
+                                                    paste.p_name)
+                publisher.warning('{}Detected {} Bitcoin private key;{}'.format(
+                    to_print, len(bitcoin_private_key),paste.p_path))
 
 if __name__ == "__main__":
     publisher.port = 6380
@@ -91,4 +98,4 @@ if __name__ == "__main__":
         # Do something with the message from the queue
         paste = Paste.Paste(message)
         content = paste.get_p_content()
-        search_key(content, message)
+        search_key(content, message, paste)
diff --git a/bin/Onion.py b/bin/Onion.py
index e77d6262..5e35b8aa 100755
--- a/bin/Onion.py
+++ b/bin/Onion.py
@@ -149,7 +149,7 @@ if __name__ == "__main__":
                                                         PST.p_date,
                                                         PST.p_name)
                     for url in fetch(p, r_cache, urls, domains_list, path):
-                        publisher.warning('{}Checked {};{}'.format(to_print, url, PST.p_path))
+                        publisher.info('{}Checked {};{}'.format(to_print, url, PST.p_path))
                         p.populate_set_out('onion;{}'.format(PST.p_path), 'alertHandler')
                 else:
                     publisher.info('{}Onion related;{}'.format(to_print, PST.p_path))