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 "Never forward non-FQDNs" checkbox #3887

Merged
merged 1 commit into from
Dec 1, 2020
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 1, 2020

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes, and have included unit tests where possible.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)

What does this PR aim to accomplish?:

When there is a Pi-hole domain set and "Never forward non-FQDNs" is ticked, we add local=/$domain/ to tell FTL that this domain is purely local and FTL may answer queries from /etc/hosts or DHCP but should never forward queries on that domain to any upstream servers.

Saving the changed checkbox can currently be seen as broken because it requires you to change the box, save the page and then go to the DHCP settings page and also save this one (w/ or w/o changes doesn't matter).

This bug has been reported on Discourse (see link by Pralor below)

How does this PR accomplish the above?:

Always re-process the DHCP settings when saving the DNS settings to avoid users having to click twice.

What documentation changes (if any) are needed to support this PR?:

None

…icked, we add to tell FTL that this domain is purely local and FTL may answer queries from /etc/hosts or DHCP but should never forward queries on that domain to any upstream servers

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bug: fixed Contains a bug resolution label Dec 1, 2020
@DL6ER DL6ER changed the title When there is a Pi-hole domain set and "Never forward non-FQDNs" is t… Fix "Never forward non-FQDNs" checkbox Dec 1, 2020
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/private-host-names-not-sent-to-upstream-since-v5-3-2/41014/17

Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

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

Ignore CircleCI, I was playing with something last night

@PromoFaux PromoFaux merged commit 13cb0c1 into development Dec 1, 2020
@PromoFaux PromoFaux deleted the fix/non-FQDN-checkbox branch December 1, 2020 09:43
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-core-web-v5-2-1-and-ftl-v5-3-2-released/41148/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug: fixed Contains a bug resolution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants