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

Jump to bottom

Warn when connection to Spamhaus times out #1817

Merged
merged 4 commits into from Jan 28, 2021
Merged

Warn when connection to Spamhaus times out #1817

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
254b235
Warn when connection to Spamhaus times out
fspoettel Sep 4, 2020
b0c83d7
remove extra line
fspoettel Sep 4, 2020
81bfdc4
undo quote change
fspoettel Oct 2, 2020
9401dac
Remove rev_ip4 from IP timeout message
fspoettel Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion management/status_checks.py
View file
Open in desktop
Expand Up @@ -293,6 +293,8 @@ def run_network_checks(env, output):
zen = query_dns(rev_ip4+'.zen.spamhaus.org', 'A', nxdomain=None)
if zen is None:
output.print_ok("IP address is not blacklisted by zen.spamhaus.org.")
elif zen == "[timeout]":
output.print_warning("Connection to zen.spamhaus.org timed out. We could not determine whether your server's IP address {} is blacklisted. Please try again later.".format(rev_ip4))
fspoettel marked this conversation as resolved.
Show resolved Hide resolved
else:
output.print_error("""The IP address of this machine %s is listed in the Spamhaus Block List (code %s),
which may prevent recipients from receiving your email. See http://www.spamhaus.org/query/ip/%s."""
Expand Down Expand Up @@ -675,9 +677,11 @@ def check_mail_domain(domain, env, output):
# Stop if the domain is listed in the Spamhaus Domain Block List.
# The user might have chosen a domain that was previously in use by a spammer
# and will not be able to reliably send mail.
dbl = query_dns(domain+'.dbl.spamhaus.org', "A", nxdomain=None)
dbl = query_dns(domain+".dbl.spamhaus.org", "A", nxdomain=None)
fspoettel marked this conversation as resolved.
Show resolved Hide resolved
if dbl is None:
output.print_ok("Domain is not blacklisted by dbl.spamhaus.org.")
elif dbl == "[timeout]":
output.print_warning("Connection to dbl.spamhaus.org timed out. We could not determine whether the domain {} is blacklisted. Please try again later.".format(domain))
Copy link
Contributor

@ddavness ddavness Jan 18, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here: http://www.spamhaus.org/query/domain/example.com:

Connection to dbl.spamhaus.org timed out. We could not determine whether the domain example.com is blacklisted. Please try again later, or see http://www.spamhaus.org/query/domain/example.com

else:
output.print_error("""This domain is listed in the Spamhaus Domain Block List (code %s),
which may prevent recipients from receiving your mail.
Expand Down