From 4895ee9fa220d0f761daca2f5065be22bcd6fb80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Vinot?= <raphael@vinot.info>
Date: Wed, 10 Feb 2016 16:39:56 +0100
Subject: [PATCH] Add new category (Credential)

---
 bin/Categ.py                  |  41 +++++-----
 bin/packages/modules.cfg      |   7 +-
 files/Credential              | 140 ++++++++++++++++++++++++++++++++++
 files/make_Credential_list.sh |  10 +++
 files/top_pwd_clear           |  35 +++++++++
 5 files changed, 206 insertions(+), 27 deletions(-)
 create mode 100644 files/Credential
 create mode 100755 files/make_Credential_list.sh
 create mode 100644 files/top_pwd_clear

diff --git a/bin/Categ.py b/bin/Categ.py
index 15af4f52..74d568d7 100755
--- a/bin/Categ.py
+++ b/bin/Categ.py
@@ -54,9 +54,7 @@ if __name__ == "__main__":
     p = Process(config_section)
 
     # SCRIPT PARSER #
-    parser = argparse.ArgumentParser(
-        description='This script is a part of the Analysis Information \
-                    Leak framework.')
+    parser = argparse.ArgumentParser(description='Start Categ module on files.')
 
     parser.add_argument(
         '-d', type=str, default="../files/",
@@ -68,7 +66,7 @@ if __name__ == "__main__":
     # FUNCTIONS #
     publisher.info("Script Categ started")
 
-    categories = ['CreditCards', 'Mail', 'Onion', 'Web']
+    categories = ['CreditCards', 'Mail', 'Onion', 'Web', 'Credential']
     tmp_dict = {}
     for filename in categories:
         bname = os.path.basename(filename)
@@ -81,24 +79,23 @@ if __name__ == "__main__":
 
     while True:
         filename = p.get_from_set()
-        if filename is not None:
-
-            paste = Paste.Paste(filename)
-            content = paste.get_p_content()
-
-            for categ, pattern in tmp_dict.items():
-                found = re.findall(pattern, content)
-                if len(found) > 0:
-                    msg = '{} {}'.format(paste.p_path, len(found))
-                    print msg, categ
-                    p.populate_set_out(msg, categ)
-
-                    publisher.info(
-                        'Categ;{};{};{};Detected {} as {}'.format(
-                            paste.p_source, paste.p_date, paste.p_name,
-                            len(found), categ))
-
-        else:
+        if filename is None:
             publisher.debug("Script Categ is Idling 10s")
             print 'Sleeping'
             time.sleep(10)
+            continue
+
+        paste = Paste.Paste(filename)
+        content = paste.get_p_content()
+
+        for categ, pattern in tmp_dict.items():
+            found = set(re.findall(pattern, content))
+            if len(found) > 0:
+                msg = '{} {}'.format(paste.p_path, len(found))
+                print msg, categ
+                p.populate_set_out(msg, categ)
+
+                publisher.info(
+                    'Categ;{};{};{};Detected {} as {}'.format(
+                        paste.p_source, paste.p_date, paste.p_name,
+                        len(found), categ))
diff --git a/bin/packages/modules.cfg b/bin/packages/modules.cfg
index 4b41b4ff..04887d09 100644
--- a/bin/packages/modules.cfg
+++ b/bin/packages/modules.cfg
@@ -27,7 +27,7 @@ subscribe = Redis_Words
 
 [Categ]
 subscribe = Redis_Global
-publish = Redis_CreditCards,Redis_Mail,Redis_Onion,Redis_Web
+publish = Redis_CreditCards,Redis_Mail,Redis_Onion,Redis_Web,Redis_Credential
 
 [CreditCards]
 subscribe = Redis_CreditCards
@@ -51,10 +51,7 @@ publish = Redis_Url,ZMQ_Url
 subscribe = Redis_Global
 
 [Credential]
-subscribe = Redis_Global
-
-[Keys]
-subscribe = Redis_Global
+subscribe = Redis_Credential
 
 [Phone]
 subscribe = Redis_Global
diff --git a/files/Credential b/files/Credential
new file mode 100644
index 00000000..484cba84
--- /dev/null
+++ b/files/Credential
@@ -0,0 +1,140 @@
+000000
+670b14728ad9902aecba32e22fa4f6bd
+c984aed014aec7623a54f0591da07a85fd4b762d
+91b4d142823f7d20c5f08df69122de43f35f057a988d9619f6d3138485c9a203
+111111
+96e79218965eb72c92a549dd5a330112
+3d4f2bf07dc1be38b20cd6e46949a1071f9d0e3d
+bcb15f821479b4d5772bd0ca866c00ad5f926e3580720659cc80d39c9d09802a
+123123
+4297f44b13955235245b2497399d7a93
+601f1889667efaebb33b8c12572835da3f027f78
+96cae35ce8a9b0244178bf28e4966c2ce1b8385723a96a6b838858cdd6ca0a1e
+1234
+81dc9bdb52d04dc20036dbd8313ed055
+7110eda4d09e062aa5e4a390b0a572ac0d2c0220
+03ac674216f3e15c761ee1a5e255f067953623c8b388b4459e13f978d7c846f4
+12345
+827ccb0eea8a706c4c34a16891f84e7b
+8cb2237d0679ca88db6464eac60da96345513964
+5994471abb01112afcc18159f6cc74b4f511b99806da59b3caf5a9c173cacfc5
+123456
+e10adc3949ba59abbe56e057f20f883e
+7c4a8d09ca3762af61e59520943dc26494f8941b
+8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92
+1234567
+fcea920f7412b5da7be0cf42b8c93759
+20eabe5d64b0e216796e834f52d61fd0b70332fc
+8bb0cf6eb9b17d0f7d22b456f121257dc1254e1f01665370476383ea776df414
+12345678
+25d55ad283aa400af464c76d713c07ad
+7c222fb2927d828af22f592134e8932480637c0d
+ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f
+123456789
+25f9e794323b453885f5181f1b624d0b
+f7c3bc1d808e04732adf679965ccc34ca7ae3441
+15e2b0d3c33891ebb0f1ef609ec419420c20e320ce94c65fbc8c3312448eb225
+1234567890
+e807f1fcf82d132f9bb018ca6738a19f
+01b307acba4f54f55aafc33bb06bbbf6ca803e9a
+c775e7b757ede630cd0aa1113bd102661ab38829ca52a6422ab782862f268646
+1qaz2wsx
+1c63129ae9db9c60c3e8aa94d3e00495
+c6922b6ba9e0939583f973bc1682493351ad4fe8
+059a00192592d5444bc0caad7203f98b506332e2cf7abb35d684ea9bf7c18f08
+abc123
+e99a18c428cb38d5f260853678922e03
+6367c48dd193d56ea7b0baad25b19455e529f5ee
+6ca13d52ca70c883e0f0bb101e425a89e8624de51db2d2392593af6a84118090
+adobe123
+7558af202997483d3afef3bb2b5a709d
+c42cea5baee0f8903baedf607586e734d0b98f2d
+923783d62d262107202f1d290871b5a5dfc7fc75ee3a9a0869ecba42650b45aa
+azerty
+ab4f63f9ac65152575886860dde480a1
+9cf95dacd226dcf43da376cdb6cbba7035218921
+f2d81a260dea8a100dd517984e53c56a7523d96942a834b9cdc249bd4e8c7aa9
+baseball
+276f8db0b86edaa7fc805516c852c889
+a2c901c8c6dea98958c219f6f2d038c44dc5d362
+a01edad91c00abe7be5b72b5e36bf4ce3c6f26e8bce3340eba365642813ab8b6
+dragon
+8621ffdbc5698829397d97767ac13db3
+af8978b1797b72acfff9595a5a2a373ec3d9106d
+a9c43be948c5cabd56ef2bacffb77cdaa5eec49dd5eb0cc4129cf3eda5f0e74c
+football
+37b4e2d82900d5e94b8da524fbeb33c0
+2d27b62c597ec858f6e7b54e7e58525e6a95e6d8
+6382deaf1f5dc6e792b76db4a4a7bf2ba468884e000b25e7928e621e27fb23cb
+iloveyou
+f25a2fc72690b780b2a14e140ef6a9e0
+ee8d8728f435fd550f83852aabab5234ce1da528
+e4ad93ca07acb8d908a3aa41e920ea4f4ef4f26e7f86cf8291c5db289780a5ae
+letmein
+0d107d09f5bbe40cade3de5c71e9e9b7
+b7a875fc1ea228b9061041b7cec4bd3c52ab3ce3
+1c8bfe8f801d79745c4631d09fff36c82aa37fc4cce4fc946683d7b336b63032
+login
+d56b699830e77ba53855679cb1d252da
+2736fab291f04e69b62d490c3c09361f5b82461a
+428821350e9691491f616b754cd8315fb86d797ab35d843479e732ef90665324
+master
+eb0a191797624dd3a48fa681d3061212
+4f26aeafdb2367620a393c973eddbe8f8b846ebd
+fc613b4dfd6736a7bd268c8a0e74ed0d1c04a959f59dd74ef2874983fd443fc9
+monkey
+d0763edaa9d9bd2a9516280e9044d885
+ab87d24bdc7452e55738deb5f868e1f16dea5ace
+000c285457fc971f862a79b786476c78812c8897063c6fa9c045f579a3b2d63f
+passw0rd
+bed128365216c019988915ed3add75fb
+7c6a61c68ef8b9b6b061b28c348bc1ed7921cb53
+8f0e2f76e22b43e2855189877e7dc1e1e7d98c226c95db247cd1d547928334a9
+password
+5f4dcc3b5aa765d61d8327deb882cf99
+5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8
+5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8
+password1
+7c6a180b36896a0a8c02787eeafb0e4c
+e38ad214943daad1d64c102faec29de4afe9da3d
+0b14d501a594442a01c6859541bcb3e8164d183d32937b851835442f69d5c94e
+photoshop
+c7c9cfbb7ed7d1cebb7a4442dc30877f
+32ee117b4abfed8750c1f2ded8af243141ec371e
+3f4a09b92ccf3382d71c8e3937b06b7945c6f1e42338d3f7e4c8577f220d810b
+princess
+8afa847f50a716e64932d995c8e7435a
+775bb961b81da1ca49217a48e533c832c337154a
+04e77bf8f95cb3e1a36a59d1e93857c411930db646b46c218a0352e432023cf2
+qwerty
+d8578edf8458ce06fbc5bb76a58c5ca4
+b1b3773a05c0ed0176787a4f1574ff0075f7521e
+65e84be33532fb784c48129675f9eff3a682b27168c0ea744b2cf58ee02337c5
+qwertyuiop
+6eea9b7ef19179a06954edd0f6c05ceb
+b0399d2029f64d445bd131ffaa399a42d2f8e7dc
+9a900403ac313ba27a1bc81f0932652b8020dac92c234d98fa0b06bf0040ecfd
+shadow
+3bf1114a986ba87ed28fc1b5884fc2f8
+ed9d3d832af899035363a69fd53cd3be8f71501c
+0bb09d80600eec3eb9d7793a6f859bedde2a2d83899b70bd78e961ed674b32f4
+solo
+5653c6b1f51852a6351ec69c8452abc6
+49f25741ff0db65a7c4290aa73f34b4d4a3644c6
+5364f2f2fc4f54e9d47ad29cfb08ef430c8153394bf2a0dff5cbe77a0ffef861
+starwars
+5badcaf789d3d1d09794d8f021f40f0e
+327156ab287c6aa52c8670e13163fc1bf660add4
+74fca0325b5fdb3a34badb40a2581cfbd5344187e8d3432952a5abc0929c1246
+sunshine
+0571749e2ac330a7455809c6b0e7af90
+8d6e34f987851aa599257d3831a1af040886842f
+a941a4c4fd0c01cddef61b8be963bf4c1e2b0811c037ce3f1835fddf6ef6c223
+trustno1
+5fcfd41e547a12215b173ff47fdd3739
+e68e11be8b70e435c65aef8ba9798ff7775c361e
+203b70b5ae883932161bbd0bded9357e763e63afce98b16230be33f0b94c2cc5
+welcome
+40be4e59b9a2a2b5dffb918c0e86b3d7
+c0b137fe2d792459f26ff763cce44574a5b5ab03
+280d44ab1e9f79b5cce2dd4f58f5fe91f0fbacdac9f7447dffc318ceb79f2d02
diff --git a/files/make_Credential_list.sh b/files/make_Credential_list.sh
new file mode 100755
index 00000000..ec7fd4e5
--- /dev/null
+++ b/files/make_Credential_list.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+while read line; do
+    echo $line
+    echo -n $line | md5sum | cut -d' ' -f 1
+    echo -n $line | sha1sum | cut -d' ' -f 1
+    echo -n $line | sha256sum | cut -d' ' -f 1
+done < top_pwd_clear > Credential
diff --git a/files/top_pwd_clear b/files/top_pwd_clear
new file mode 100644
index 00000000..be0ece6f
--- /dev/null
+++ b/files/top_pwd_clear
@@ -0,0 +1,35 @@
+000000
+111111
+123123
+1234
+12345
+123456
+1234567
+12345678
+123456789
+1234567890
+1qaz2wsx
+abc123
+adobe123
+azerty
+baseball
+dragon
+football
+iloveyou
+letmein
+login
+master
+monkey
+passw0rd
+password
+password1
+photoshop
+princess
+qwerty
+qwertyuiop
+shadow
+solo
+starwars
+sunshine
+trustno1
+welcome