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.
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
Warn when connection to Spamhaus times out #1817
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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.") | ||
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.""" | ||
|
@@ -678,6 +680,8 @@ def check_mail_domain(domain, env, output): | |
dbl = query_dns(domain+'.dbl.spamhaus.org', "A", nxdomain=None) | ||
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)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here:
|
||
else: | ||
output.print_error("""This domain is listed in the Spamhaus Domain Block List (code %s), | ||
which may prevent recipients from receiving your mail. | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we could add a the website endpoint that we point the users to when the IP/domain turns out to be legitimately blocked (
http://www.spamhaus.org/query/ip/<ipv4>
), for example: