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

Revert empty domain dot replacement #2314

Merged
merged 3 commits into from
Aug 29, 2022
Merged

Revert empty domain dot replacement #2314

merged 3 commits into from
Aug 29, 2022

Conversation

yubiuser
Copy link
Member

What does this PR aim to accomplish?:

Reverts #1244. This was introduced to replace "empty" domain strings with a dot (.). For historic reasons, dnsmasq strippes all trailing dots. If a query consists only of the dot (root zone), FTL has been seeing only an empty domain so far. FTL PR pi-hole/FTL#1413 changes this behavior, therefore, the mock-up introduced by #1244 is no longer needed.


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 and I have tested my changes.
  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)

  • I have read the above and my PR is ready for review. Check this box to confirm

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser yubiuser added the PR: Approval Required Open Pull Request, needs approval label Aug 28, 2022
@yubiuser yubiuser requested a review from a team August 28, 2022 17:56
rdwebdesign
rdwebdesign previously approved these changes Aug 28, 2022
@DL6ER
Copy link
Member

DL6ER commented Aug 28, 2022

You're also removing this from db_queries.js - this may not be a good idea in case users are looking back in time until before the FTL update.

@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/regex-for-blocking-just-dot-as-domain/57319/13

Signed-off-by: Christian König <ckoenig@posteo.de>
…conversion

Signed-off-by: Christian König <ckoenig@posteo.de>
@yubiuser
Copy link
Member Author

I added special handling for the root zone during domain validation and excepted it from IDNA conversion (it always failed the conversion, returning false and preventing adding the root zone to the database)

@yubiuser yubiuser merged commit 775a4e1 into devel Aug 29, 2022
@yubiuser yubiuser deleted the remove_dot branch August 29, 2022 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Approval Required Open Pull Request, needs approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants