Compare commits

..

No commits in common. "145b36a7bdff14c69a3e47ddd71e6c5ab7ddd152" and "894e862720ef82542f3909c5ed6da97853861426" have entirely different histories.

13
main.py
View File

@ -32,12 +32,7 @@ def get_decoded_header(value):
decoded_header_items = decode_header(value) decoded_header_items = decode_header(value)
decoded_header_value = '' decoded_header_value = ''
for item in decoded_header_items: for item in decoded_header_items:
try:
decoded_item = item[0].decode(item[1], 'ignore') if item[1] is not None else item[0] decoded_item = item[0].decode(item[1], 'ignore') if item[1] is not None else item[0]
except:
logger.warning(f"Decoding went wrong for value '{value}'!")
# Pretend decoded item is empty :-(
decoded_item = ''
if isinstance(decoded_item, bytes): if isinstance(decoded_item, bytes):
decoded_item = decoded_item.decode('ascii', 'ignore') decoded_item = decoded_item.decode('ascii', 'ignore')
decoded_header_value += decoded_item decoded_header_value += decoded_item
@ -126,14 +121,6 @@ def main():
Milter.runmilter("SuspiciousFromMilter", config.milter_socket, config.milter_timeout, rmsock=False) Milter.runmilter("SuspiciousFromMilter", config.milter_socket, config.milter_timeout, rmsock=False)
logger.info(f"Milter finished running.") logger.info(f"Milter finished running.")
def test():
# simple method to deal with unexpected exceptions on the fly :(
test_from_value = '=?UNKNOWN?Q?=E1?= Foo <foo@example.com>'
logger.info(f"Begin of test().")
test_instance = SuspiciousFrom()
test_instance.header('from', test_from_value)
logger.info(f"End of test().")
if __name__ == "__main__": if __name__ == "__main__":
#test()
main() main()