From 08583758b067a11971d4cdd6db0c15091f9797ca Mon Sep 17 00:00:00 2001
From: "Mariusz B. / mgeeky" <mb@binary-offensive.com>
Date: Wed, 7 Sep 2022 13:16:07 +0200
Subject: [PATCH] Universal output coloring with colorama, fixed domain
 extraction bug in testDomainImpersonation

---
 decode-spam-headers.py | 39 +++++++++++++++++++++++++++++++++------
 requirements.txt       |  3 ++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/decode-spam-headers.py b/decode-spam-headers.py
index eca8e4b..7dbf785 100644
--- a/decode-spam-headers.py
+++ b/decode-spam-headers.py
@@ -110,7 +110,7 @@
 #   - tldextract
 #   - packaging
 #   - dnspython
-#   - requests
+#   - colorama
 #
 # Mariusz Banach / mgeeky, '21-'22
 # <mb [at] binary-offensive.com>
@@ -123,6 +123,7 @@ import json
 import textwrap
 import socket
 import time
+import atexit
 import base64
 
 from html import escape
@@ -139,6 +140,15 @@ except ImportError:
 ''')
     sys.exit(1)
 
+try: 
+    import colorama
+except ImportError:
+    print('''
+[!] You need to install colorama: 
+        # pip3 install colorama
+''')
+    sys.exit(1)
+
 try:
     import packaging.version
 
@@ -181,6 +191,7 @@ except ImportError:
 ''')
     sys.exit(1)
 
+colorama.init()
 
 options = {
     'debug': False,
@@ -217,7 +228,6 @@ class Logger:
 
     colors_dict = {
         'error': colors_map['red'],
-        'trace': colors_map['magenta'],
         'info ': colors_map['green'],
         'debug': colors_map['grey'],
         'other': colors_map['grey'],
@@ -4405,8 +4415,9 @@ Src: https://www.cisco.com/c/en/us/td/docs/security/esa/esa11-1/user_guide/b_ESA
         if len(m.groups()) < 2:
             return []
 
-        username = m.group(1)
-        domain = m.group(2)
+        username = m.group(1).replace('<', '')
+        domain = m.group(2).replace('>', '')
+
         email = f'{username}@{domain}'
 
         firstHop = self.received_path[1]
@@ -4451,11 +4462,21 @@ Src: https://www.cisco.com/c/en/us/td/docs/security/esa/esa11-1/user_guide/b_ESA
         result += f'\t                       (first hop\'s domain: {self.logger.colored(firstHopDomain1, "cyan")})\n\n'
 
         if firstHopDomain1.lower() != senderDomain.lower():
-            response = None
+            response = []
             try:
-                if domain.endswith('.'): domain = domain[:-1]
+                if domain.endswith('.'): 
+                    domain = domain[:-1]
                 response = dns.resolver.resolve(domain, 'TXT')
 
+            except dns.resolver.NoAnswer as e:
+                response = []
+
+            except dns.resolver.NoNameservers as e:
+                response = []
+
+            except AttributeError as e:
+                response = []
+
             except Exception as e:
                 response = []
 
@@ -6517,3 +6538,9 @@ Use -N flag to disable console colors, or switch your console for better UI expe
 
 if __name__ == '__main__':
     main(sys.argv)
+
+
+@atexit.register
+def goodbye():
+    colorama.deinit()
+
diff --git a/requirements.txt b/requirements.txt
index db6be8b..5551899 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@ python-dateutil
 tldextract
 packaging
 dnspython
-requests
\ No newline at end of file
+requests
+colorama
\ No newline at end of file