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

Improve EDNS handling #2062

Merged
merged 3 commits into from
Sep 14, 2024
Merged

Improve EDNS handling #2062

merged 3 commits into from
Sep 14, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Sep 14, 2024

What does this implement/fix?

This PR merges a few EDNS related changes:

  • Add downstream EDE info for synthesized replies
    This commit enriches downstream DNS replies with blocking information. This can be controlled (and also disabled) via the new setting dns.blocking.edns.
    Example:
    image

  • Add EDE 15 from upstream => Blocked detection
    Pi-hole already detects NXRA (NXDOMAIN without RA bit from Quad9 or unbound with option rpz-signal-nxdomain-ra), NULL address (0.0.0.0 / ::) and a set of known IP addresses (Cisco Umbrella) to determine a query was blocked upstream. This PR adds a new detection that is a query has EDE 15 = Blocked set by the upstream resolver. This can be seen, e.g. in routeDNS which is used by the user requesting this feature.

  • Unify query and cache status enums
    This is mostly a code maintenance commit without any externally visible changes. It removes the enum domain_client_status in favor of the more generic enum query_status.


Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): pi-hole/docs#1094


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.

Signed-off-by: DL6ER <dl6er@dl6er.de>
…enting this

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Do we need amendments to the docs for the new database query status QUERY_EXTERNAL_BLOCKED_EDE15?

@DL6ER
Copy link
Member Author

DL6ER commented Sep 14, 2024

See pi-hole/docs#1094

@rdwebdesign
Copy link
Member

Do we need to change the web interface to show this new value?

@DL6ER
Copy link
Member Author

DL6ER commented Sep 14, 2024

@rdwebdesign No, in v6, we query FTL for the defined types and, hence, no web code changes are necessary if new types are added.

@DL6ER DL6ER merged commit 031c466 into development Sep 14, 2024
16 checks passed
@DL6ER DL6ER deleted the new/edns_reasoning branch September 14, 2024 19:39
@rdwebdesign
Copy link
Member

no web code changes are necessary if new types are added.

Cool!

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.

3 participants