Add ABP-support for /api/search#1649
Merged
Merged
Conversation
3b76ffc to
b2e8f20
Compare
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
b2e8f20 to
db1fa3a
Compare
Member
Author
|
Rebased on latest |
Signed-off-by: DL6ER <dl6er@dl6er.de>
This was referenced Oct 7, 2023
Signed-off-by: DL6ER <dl6er@dl6er.de>
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Conflicts have been resolved. |
Member
|
Tested working on both allow and deny type lists. Web interface probably needs updating to print the distinction |
PromoFaux
approved these changes
Oct 8, 2023
DL6ER
added a commit
that referenced
this pull request
Oct 12, 2023
This is a regression of #1649 Signed-off-by: DL6ER <dl6er@dl6er.de>
5 tasks
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this implement/fix?
This PR adds support for ABP-blocking in
/api/search. So far, ABP blocking was only kind-of available viapartialmatching but this did not work in all cases.Example for a domain that is ABP-blocked (searched for
a.b.c.d.e.000dn.com):{ "search": { "domains": [], "gravity": [ { "domain": "||000dn.com^", "type": "block", "address": "https://big.oisd.nl/", "comment": null, "enabled": true, "id": 4, "date_added": 1680173138, "date_modified": 1680173138, "date_updated": 1696090045, "number": 212157, "invalid_domains": 0, "abp_entries": 212157, "status": 1, "groups": [ 0 ] } ], "total": 1, "parameters": { "N": 20, "partial": false, "domain": "a.b.c.d.e.000dn.com", "debug": false } }, "took": 0.00480961799621582 }Example for an antigravity match (searched for
x.y.z.a.189.cn):{ "search": { "domains": [], "gravity": [ { "domain": "@@||a.189.cn^", "type": "allow", "address": "https://raw.githubusercontent.com/hagezi/dns-blocklists/main/adblock/whitelist-urlshortener.txt", "comment": null, "enabled": true, "id": 13, "date_added": 1695923490, "date_modified": 1695923495, "date_updated": 1696090047, "number": 1895, "invalid_domains": 1, "abp_entries": 1895, "status": 1, "groups": [ 0 ] } ], "total": 0, "parameters": { "N": 20, "partial": false, "domain": "x.y.z.a.189.cn", "debug": false } }, "took": 0.00474715232849121 }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:
git rebase)Checklist:
developmentalbranch.