Git
/
mgeeky-decode-spam-headers
mirror of https://github.com/mgeeky/decode-spam-headers.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Second fix for the issues/3

This commit is contained in:
Mariusz B. / mgeeky 2022-03-30 16:21:15 +02:00
parent 9bc13dacc3
commit 45c7c2d040
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
decode-spam-headers.py
View File

@ -1891,7 +1891,7 @@ class SMTPHeadersAnalysis:
if m1: if m1:
v1d = emailheader.decode_header(value)[0][0] v1d = emailheader.decode_header(value)[0][0]
if type(v1d) == bytes: if type(v1d) == bytes:
v1d = v1d.decode() v1d = v1d.decode(errors='ignore')
value = v1d value = v1d
return (num, header, value) return (num, header, value)
@ -1911,7 +1911,7 @@ class SMTPHeadersAnalysis:
if m1: if m1:
v1d = emailheader.decode_header(value)[0][0] v1d = emailheader.decode_header(value)[0][0]
if type(v1d) == bytes: if type(v1d) == bytes:
v1d = v1d.decode() v1d = v1d.decode(errors='ignore')
value = v1d value = v1d
return (num, header, value) return (num, header, value)
@ -3594,14 +3594,14 @@ Results will be unsound. Make sure you have pasted your headers with correct spa
if m1: if m1:
v1d = emailheader.decode_header(value)[0][0] v1d = emailheader.decode_header(value)[0][0]
if type(v1d) == bytes: if type(v1d) == bytes:
v1d = v1d.decode() v1d = v1d.decode(errors='ignore')
v1 = v1d v1 = v1d
m2 = re.search(r'\=\?[a-z0-9\-]+\?Q\?', v2, re.I) m2 = re.search(r'\=\?[a-z0-9\-]+\?Q\?', v2, re.I)
if m2: if m2:
v2d = emailheader.decode_header(value)[0][0] v2d = emailheader.decode_header(value)[0][0]
if type(v2d) == bytes: if type(v2d) == bytes:
v2d = v2d.decode() v2d = v2d.decode(errors='ignore')
v2 = v2d v2 = v2d
result += f'\t- Subject: {self.logger.colored(v1, "green")}\n' result += f'\t- Subject: {self.logger.colored(v1, "green")}\n'
@ -5323,7 +5323,7 @@ Src: https://www.cisco.com/c/en/us/td/docs/security/esa/esa11-1/user_guide/b_ESA
value_decoded = emailheader.decode_header(value)[0][0] value_decoded = emailheader.decode_header(value)[0][0]
if type(value_decoded) == bytes: if type(value_decoded) == bytes:
value_decoded = value_decoded.decode() value_decoded = value_decoded.decode(errors='ignore')
hhh = self.logger.colored(header, 'magenta') hhh = self.logger.colored(header, 'magenta')
tmp += f'\t({num0:02}) Header: {hhh}\n' tmp += f'\t({num0:02}) Header: {hhh}\n'
@ -5360,7 +5360,7 @@ Src: https://www.cisco.com/c/en/us/td/docs/security/esa/esa11-1/user_guide/b_ESA
value = emailheader.decode_header(value)[0][0] value = emailheader.decode_header(value)[0][0]
if type(value) == bytes: if type(value) == bytes:
value = value.decode() value = value.decode(errors='ignore')
self.addSecurityAppliance('MS ForeFront Anti-Spam') self.addSecurityAppliance('MS ForeFront Anti-Spam')
result = '- Base64 encoded & encrypted Antispam Message Info:\n\n' result = '- Base64 encoded & encrypted Antispam Message Info:\n\n'