From e6a44232aad84226679ee27f8ea08894f426694f Mon Sep 17 00:00:00 2001 From: Sean Whalen Date: Mon, 5 Mar 2018 17:49:28 -0500 Subject: [PATCH] More error handling --- parsedmarc.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/parsedmarc.py b/parsedmarc.py index 188cead..274663c 100644 --- a/parsedmarc.py +++ b/parsedmarc.py @@ -1088,6 +1088,8 @@ def get_dmarc_reports_from_inbox(host, user, password, raise IMAPError("Connection timed out") except ssl.SSLError as error: raise IMAPError(error.__str__()) + except ssl.CertificateError as error: + raise IMAPError(error.__str__()) def save_output(results, output_directory="output"): @@ -1274,6 +1276,8 @@ def email_results(results, host, mail_from, mail_to, port=0, starttls=True, raise SMTPError("Connection timed out") except ssl.SSLError as error: raise SMTPError(error.__str__()) + except ssl.CertificateError as error: + raise SMTPError(error.__str__()) def watch_inbox(host, username, password, callback, archive_folder="Archive", @@ -1337,6 +1341,8 @@ def watch_inbox(host, username, password, callback, archive_folder="Archive", raise IMAPError("Connection timed out") except ssl.SSLError as error: raise IMAPError(error.__str__()) + except ssl.CertificateError as error: + raise IMAPError(error.__str__()) except KeyboardInterrupt: break