-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
Allow limited parsing of ABP style adlists #5179
Conversation
I recommend that we clarify that this is "limited parsing of ABP style blocklists" for lines that are clearly identified as wildcard blocks only. |
Gravity should be fine now. I haven't thought about |
|
After last commit:
|
Also now fixed Before:
After:
|
Dare I ask |
I'd like to see
|
Co-authored-by: Adam Warner <me@adamwarner.co.uk> Signed-off-by: Christian König <ckoenig@posteo.de>
…nd header Also splits the piped "one-liner" in ParseFileIntoDomains into individually commented commands (makes for easier reading and debugging) Signed-off-by: Adam Warner <me@adamwarner.co.uk>
… we now expect some valid results to contain '|' Signed-off-by: Adam Warner <me@adamwarner.co.uk>
0de3405
to
9c46ac8
Compare
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Signed-off-by: Christian König <ckoenig@posteo.de>
Can you revert that last change please. The trailing anchor needs to be addressed separately. |
73ced65
to
129c07d
Compare
This reverts commit 0b5da9f. Signed-off-by: Christian König <ckoenig@posteo.de>
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-ftl-v5-22-web-v5-19-and-core-v5-16-1-released/61999/1 |
The change in gravity .sh to expand the valid_domain_pattern, this to allow domain entries with a trailing period appeard to be lost in the v5.16.1 current:
during the trials I performed:
|
Two different issues. This PR and code is to parse specific ABP style lists. The validity of trailing anchors is a separate and unrelated issue. Edit: I noted this previously in this PR #5179 (comment) |
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/urgent-feature-request-to-whitelist/63603/15 |
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/add-feature-to-import-publicly-maintained-regex-lists/27161/19 |
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/supporting-dnsmasq-wildcard-blocklists/8761/11 |
What does this PR aim to accomplish?:
This PR implements limited support for AdBlock Plus (ABP)-style domain lists in Pi-hole. Accompanies pi-hole/FTL#1532
Allowed are only entries in
||subdomain.domain.tlp^
style.By submitting this pull request, I confirm the following:
git rebase
)