Fix blocked upstream (IP) handling #2176
Merged
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.
What does this implement/fix?
Queries blocked upstream with a known blocking page IP should not be short-circuited locally as this will cause FTL to reply with the locally defined blocking mode instead of the IP address of the upstream DNS server's blocking page
The tests have been adjusted to test for the new behavior. The now succeeding tests verify it is working as expected. Local testing is possible by specifying the Cisco Umbrella
208.67.222.123, 208.67.220.123
servers as upstream servers and then testing a blocked domain (which is not on your gravity!), e.g., http://www.internetbadguys.com/.Related issue or feature (if applicable): This is a regression of #2030 and fixes #2175
Pull request in docs with documentation (if applicable): N/A
By submitting this pull request, I confirm the following:
git rebase
)Checklist:
developmental
branch.