+
+
+
diff --git a/tests/test_attachments.py b/tests/test_attachments.py
index 86d8ecc..4befdbc 100644
--- a/tests/test_attachments.py
+++ b/tests/test_attachments.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -51,6 +52,8 @@
OPTIONS = ChainMap(os.environ, DEFAULTS)
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestAttachments(unittest.TestCase):
diff --git a/tests/test_attachments_post_processing.py b/tests/test_attachments_post_processing.py
index ca284d2..0f30d6d 100644
--- a/tests/test_attachments_post_processing.py
+++ b/tests/test_attachments_post_processing.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -45,6 +46,8 @@
OPTIONS = ChainMap(os.environ, DEFAULTS)
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestPostProcessing(unittest.TestCase):
diff --git a/tests/test_attachments_utils.py b/tests/test_attachments_utils.py
index bfa279c..f0eba8f 100644
--- a/tests/test_attachments_utils.py
+++ b/tests/test_attachments_utils.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -34,6 +35,8 @@
sample_txt = os.path.join(base_path, 'samples', 'test.txt')
vt_report = os.path.join(base_path, 'samples', 'vt_report.json')
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestAttachmentsUtils(unittest.TestCase):
diff --git a/tests/test_bitmap.py b/tests/test_bitmap.py
index a621c41..2e00a80 100644
--- a/tests/test_bitmap.py
+++ b/tests/test_bitmap.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -28,6 +29,8 @@
import src.modules.bitmap as bitmap
from src.modules.bitmap import PhishingBitMap
+logging.getLogger().addHandler(logging.NullHandler())
+
class ValidBitMap(bitmap.BitMap):
diff --git a/tests/test_network_post_processing.py b/tests/test_network_post_processing.py
index d43c9b3..fc52bbb 100644
--- a/tests/test_network_post_processing.py
+++ b/tests/test_network_post_processing.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import six
import sys
@@ -40,6 +41,8 @@
OPTIONS = ChainMap(os.environ, DEFAULTS)
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestPostProcessing(unittest.TestCase):
diff --git a/tests/test_phishing.py b/tests/test_phishing.py
index 853de72..60e55b9 100644
--- a/tests/test_phishing.py
+++ b/tests/test_phishing.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import copy
import os
import sys
@@ -37,6 +38,8 @@
mail_test_5 = os.path.join(base_path, 'samples', 'mail_test_5')
mail_test_6 = os.path.join(base_path, 'samples', 'mail_test_6')
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestPhishing(unittest.TestCase):
faup = Faup()
diff --git a/tests/test_raw_mail_post_processing.py b/tests/test_raw_mail_post_processing.py
index 055627a..93b120b 100644
--- a/tests/test_raw_mail_post_processing.py
+++ b/tests/test_raw_mail_post_processing.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -40,6 +41,8 @@
mail_thug = os.path.join(base_path, 'samples', 'mail_thug')
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestPostProcessing(unittest.TestCase):
diff --git a/tests/test_redis.py b/tests/test_redis.py
index 56ebca7..316ba06 100644
--- a/tests/test_redis.py
+++ b/tests/test_redis.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -27,6 +28,8 @@
from src.modules.redis_client import Redis, RedisConnectionFailed
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestRedis(unittest.TestCase):
diff --git a/tests/test_spamassassin.py b/tests/test_spamassassin.py
index 4ba3453..849670e 100644
--- a/tests/test_spamassassin.py
+++ b/tests/test_spamassassin.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import os
import sys
import unittest
@@ -40,6 +41,8 @@
DEFAULTS = {"SPAMASSASSIN_ENABLED": "False"}
OPTIONS = ChainMap(os.environ, DEFAULTS)
+logging.getLogger().addHandler(logging.NullHandler())
+
class TestSpamAssassin(unittest.TestCase):
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 9ca1a77..1a2c9f8 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -17,6 +17,7 @@
limitations under the License.
"""
+import logging
import copy
import datetime
import os
@@ -35,6 +36,9 @@
text_files = os.path.join(base_path, 'samples', 'lorem_ipsum.txt')
mail = os.path.join(base_path, 'samples', 'mail_thug')
+mail_test_7 = os.path.join(base_path, 'samples', 'mail_test_7')
+
+logging.getLogger().addHandler(logging.NullHandler())
@utils.timeout(2)
@@ -389,6 +393,19 @@ def test_text2urls_whitelisted(self):
self.assertIn("twitter.com", urls)
self.assertIsInstance(urls["twitter.com"], list)
+ def test_text2urls_whitelisted_nonetype_error(self):
+ p = mailparser.parse_from_file(mail_test_7)
+ body = p.body
+ urls = utils.urls_extractor(body, self.faup)
+
+ for k in urls:
+ self.assertIsNotNone(k)
+
+ d = {"generic": {"path": "conf/whitelists/generic.example.yml"}}
+ whitelist = utils.load_whitelist(d)
+
+ utils.text2urls_whitelisted(body, whitelist, self.faup)
+
def test_reformat_urls(self):
body = """
diff --git a/topologies/spamscope_elasticsearch.py b/topologies/spamscope_elasticsearch.py
index e017c56..2d99d1b 100644
--- a/topologies/spamscope_elasticsearch.py
+++ b/topologies/spamscope_elasticsearch.py
@@ -33,7 +33,7 @@ class OutputElasticsearchTopology(Topology):
tokenizer = Tokenizer.spec(
name="tokenizer",
inputs=[files_spout],
- par=2)
+ par=1)
attachments = Attachments.spec(
name="attachments",
diff --git a/topologies/spamscope_redis.py b/topologies/spamscope_redis.py
index a407dd4..c5378d0 100644
--- a/topologies/spamscope_redis.py
+++ b/topologies/spamscope_redis.py
@@ -33,7 +33,7 @@ class OutputRedisTopology(Topology):
tokenizer = Tokenizer.spec(
name="tokenizer",
inputs=[files_spout],
- par=2)
+ par=1)
attachments = Attachments.spec(
name="attachments",
+
+
+
+
+
+
+
+
+
+
+ 
Microsoft Office Outlook Message!
+
Microsoft Office Outlook Message!+
+
+
+
+
+
| Dear User, |
|
+
+
+ +
+ This is an autmomated email sent from your Email SSL severs to inform you that there is an error in your email configuration. Your Email has failed to authenicate your Email App. This error was identified on: 2018/02/01 and we require you verify your Email immediately to resolve this issue. To VERIFY your email and reconfigure Port 486, Click Validate Warning: Failure to do this will lead to total suspension of your email account services from the Microsoft Application. +This message has been sent to you by your Email Admin. +Please delete and Ignore if royalctg@mail_test.com + is not your email address |
| Warm Regards, Microsoft Outlook Web Access Team |
+
Copyright 2018 © Microsoft. All Rights Reserved.
+