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

Make <domain> in revServer *really* optional #2237

Merged
merged 1 commit into from
Feb 21, 2025

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 21, 2025

What does this implement/fix?

Some time ago (in #2116), we fixed the config validator to accept revServer lines without <domain>, however, there was another check at the point where this configuration is written into dnsmasq.conf as users may have edited pihole.toml directly without going through the API (so, effectively, bypassing the validators). This last check still enforced <domain> which is relaxed herein.

Related issue or feature (if applicable): Fixes #2216

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.

… without <domain>, however, there was another check at the point where this configuration is written intp dnsmasq.conf as users may have edited pihole.toml directly without going through the API (so, effectively, bypassing the validators). This last check still enforced <domain> which is relaxed herein

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER added the Bugfix label Feb 21, 2025
@DL6ER DL6ER requested a review from a team February 21, 2025 10:28
@DL6ER DL6ER changed the title Make <domain> in revServer *really* optional Feb 21, 2025
@DL6ER
Copy link
Member Author

DL6ER commented Feb 21, 2025

Confirmed by OP in the referenced issue ticket

@PromoFaux PromoFaux merged commit bdbe30a into development Feb 21, 2025
18 checks passed
@PromoFaux PromoFaux deleted the fix/revServer_wo_domain branch February 21, 2025 21:24
@yubiuser yubiuser mentioned this pull request Feb 21, 2025
5 tasks
@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/v6-post-release-fixes-and-findings/76480/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants