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 regression of #1667 #1680

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Fix regression of #1667 #1680

merged 1 commit into from
Oct 20, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 19, 2023

What does this implement/fix?

Subdomains beginning and ending in dash are actually fine (pattern [a-z0-9_-]{0,63}\.), move the corresponding tests to a concluding TLD check region (pattern [a-z0-9][a-z0-9-]{0,61}[a-z0-9])

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

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.

…-z0-9_-]{0,63}\\.), move the corresponding tests to a concluding TLD check region (pattern [a-z0-9][a-z0-9-]{0,61}[a-z0-9])

Signed-off-by: DL6ER <[email protected]>
@DL6ER DL6ER requested a review from a team October 19, 2023 17:42
@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/gravity-domain-filtering-different/65726/4

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.

Tested against the blocklist in use for the initial but report and confirm that the issue is no longer present

[i] Target: https://raw.githubusercontent.com/chadmayfield/my-pihole-blocklists/master/lists/pi_blocklist_porn_all.list
  [✓] Status: Retrieval successful
  [✓] Parsed 1906594 exact domains and 0 ABP-style domains (blocking, ignored 0 non-domain entries)
  [i] List stayed unchanged

@PromoFaux PromoFaux merged commit 4eca25e into development-v6 Oct 20, 2023
@PromoFaux PromoFaux deleted the fix/gravity_dash_dot branch October 20, 2023 13:57
@PromoFaux PromoFaux mentioned this pull request Feb 18, 2025
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