From ad26f016e34c832a0718edae93e6d348f91fbf5e Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Thu, 19 Jul 2018 16:50:42 +0200
Subject: [PATCH] add: Decoder Module, decode binary, hex and base64

---
 OVERVIEW.md                    | 14 ++++++++++----
 bin/LAUNCH.sh                  |  2 ++
 bin/Web.py                     |  1 +
 bin/packages/config.cfg.sample |  5 +++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/OVERVIEW.md b/OVERVIEW.md
index d4ad525b..80a6f337 100644
--- a/OVERVIEW.md
+++ b/OVERVIEW.md
@@ -36,18 +36,24 @@ ARDB overview
 					'vt_report'		vt_report
 					'nb_seen_in_all_pastes'	nb_seen_in_all_pastes
 
+	SET  - 'all_decoder'		decoder*
+
+	SET  - 'hash_all_type'		hash_type * 
 	SET  - 'hash_base64_all_type'	hash_type *
 	SET  - 'hash_binary_all_type'	hash_type *
 
+	SET  - 'hash_paste:'+paste	hash * °°°
 	SET  - 'base64_paste:'+paste	hash *
 	SET  - 'binary_paste:'+paste	hash *
 
+	ZADD - 'hash_date:'+20180622	hash *	°°°		nb_seen_this_day
 	ZADD - 'base64_date:'+20180622	hash *			nb_seen_this_day
+	ZADD - 'binary_date:'+20180622	hash *			nb_seen_this_day
 
-	ZADD - 'base64_hash'+hash	paste *			nb_seen_in_paste
-	ZADD - 'binary_hash'+hash	paste *			nb_seen_in_paste
-
-	SET  - 'hash_all_type'		hash_type
+	ZADD - 'nb_seen_hash:'+hash	paste *	°°°		nb_seen_in_paste
+	ZADD - 'base64_hash:'+hash	paste *			nb_seen_in_paste
+	ZADD - 'binary_hash:'+hash	paste *			nb_seen_in_paste
 
+	ZADD - 'hash_type:'+type	date	°°°		nb_seen
 	ZADD - 'base64_type:'+type	date			nb_seen
 	ZADD - 'binary_type:'+type	date			nb_seen
diff --git a/bin/LAUNCH.sh b/bin/LAUNCH.sh
index d393d621..64b4d552 100755
--- a/bin/LAUNCH.sh
+++ b/bin/LAUNCH.sh
@@ -146,6 +146,8 @@ function launching_scripts {
     sleep 0.1
     screen -S "Script_AIL" -X screen -t "Binary" bash -c './Binary.py; read x'
     sleep 0.1
+    screen -S "Script_AIL" -X screen -t "Decoder" bash -c './Decoder.py; read x'
+    sleep 0.1
     screen -S "Script_AIL" -X screen -t "Bitcoin" bash -c './Bitcoin.py; read x'
     sleep 0.1
     screen -S "Script_AIL" -X screen -t "Phone" bash -c './Phone.py; read x'
diff --git a/bin/Web.py b/bin/Web.py
index 45e5bfbe..3d53e306 100755
--- a/bin/Web.py
+++ b/bin/Web.py
@@ -124,6 +124,7 @@ if __name__ == "__main__":
                     except ipaddress.AddressValueError:
                         continue
                     cc = getattr(l, 'cc')
+                    asn = ''
                     if getattr(l, 'asn') is not None:
                         asn = getattr(l, 'asn')[2:] #remobe b'
 
diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample
index eddd5165..08b75324 100644
--- a/bin/packages/config.cfg.sample
+++ b/bin/packages/config.cfg.sample
@@ -2,6 +2,7 @@
 bloomfilters = Blooms
 dicofilters = Dicos
 pastes = PASTES
+hash = HASHS
 base64 = BASE64
 
 wordtrending_csv = var/www/static/csv/wordstrendingdata
@@ -65,6 +66,10 @@ max_execution_time = 60
 path = Base64/
 max_execution_time = 60
 
+[Hex]
+path = Base64/
+max_execution_time = 60
+
 [Modules_Duplicates]
 #Number of month to look back
 maximum_month_range = 3