Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding two other exceptions to try block #73

Merged
merged 1 commit into from
Mar 21, 2018
Merged

Adding two other exceptions to try block #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions trustymail/trustymail.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,13 +492,13 @@ def dmarc_scan(resolver, domain):
if not answer.startswith('v=DMARC1'):
handle_error('[DMARC]', domain, '{0}'.format(error_message))
domain.valid_dmarc = False
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer, dns.resolver.NoNameservers, dns.exception.Timeout):
handle_syntax_error('[DMARC]', domain, '{0}'.format(error_message))
domain.valid_dmarc = False
try:
# Ensure ruf/rua/email domains have MX records
resolver.query(email_domain, 'MX', tcp=True)
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer):
except (dns.resolver.NXDOMAIN, dns.resolver.NoAnswer, dns.resolver.NoNameservers, dns.exception.Timeout):
handle_syntax_error('[DMARC]', domain, 'The domain for reporting '
'address {0} does not have any '
'MX records'.format(email_address))
Expand Down