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.

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

Fix blocked upstream (IP) handling #2176

Merged
merged 1 commit into from
Feb 3, 2025
Merged

Fix blocked upstream (IP) handling #2176

merged 1 commit into from
Feb 3, 2025

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 2, 2025

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:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…short-circuited locally as this will cause FTL to reply with the locally defined blcoking mode instead of the IP address of the upstream DNS server's blocking page

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER merged commit bbf4dae into development Feb 3, 2025
18 checks passed
@DL6ER DL6ER deleted the fix/umbrella branch February 3, 2025 05:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[v6] Resolving of opendns family shield umbrella page not working
2 participants