-
-
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
Reduce number of false positives when gravity unable to import domains - change the wording of the output #5128
Reduce number of false positives when gravity unable to import domains - change the wording of the output #5128
Conversation
15e4de8
to
9a2e5cd
Compare
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/fresh-install-steven-black-list-invalid-domains/60523/27 |
1b0d449
to
fba322d
Compare
@jfb-pihole can I have your thoughts on this version, too, please? |
"Sample of unusable entries:" I would change this to "sample of entries not imported into Pi-hole" |
The expression "unusable entries" tries to make it clear Pi-hole can't use those entries... I know the difference is very small (if any), but I think the expression "not imported into Pi-hole" will raise a lot of questions like "Why Pi-hole didn't import everything? What is wrong?". We can explain better using something like "X lines without domains not imported by Pi-hole", but this looks too long. |
I'm OK with that change. We just need to indicate that the domains weren't imported. |
|
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/stevenblack-adlists-show-15-invalid-domains/60641/2 |
…'s host file), and discount them when calculating the number of "invalid" domains in a given list Soften the output message when reporting on unsuable domains Signed-off-by: Adam Warner <me@adamwarner.co.uk>
bf09c9d
to
79f4a7c
Compare
d2d92eb
to
d45b483
Compare
…learer Signed-off-by: Adam Warner <me@adamwarner.co.uk>
d45b483
to
9939cf1
Compare
This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there: https://discourse.pi-hole.net/t/pi-hole-web-v5-18-2-and-core-v5-15-1-released/60695/1 |
These changes will lead to a high system load when fed a list that contains nothing of value or use. Any list that is in ABP format will try to filter out the common localhosts from a long string of invalid information (read ABP regex) and Pi-hole will try its hardest to salvage the list. Looks like we need to have an intermediate step that looks for any hosts entry in the supplied list and if there are none then stop. I thought we had ABP filtering before but that may have been to try to convert ABP in to hosts format. If I can find that detection regex then we can reuse it to just remove the invalid entries and then count the length of the array of hosts entries. If there are none then we don't need to proceed. Sample list that doesn't work for Pi-hole anymore is https://big.oisd.nl. The older https://dbl.oisd.nl has been removed and we safely note that the list is gone. But people will try to replace dbl with big and we shouldn't crash just because they are feeding garbage to Pi-hole now. |
If you want to go for an all-or-nothing approach, just check the number of lines of |
Okay, ideally we should only remove false positives from potential positives but I haven't looked too deeply at the code to see how it all is being processed now. ( |
The |
What does this PR aim to accomplish?:
Currently when we analyse an adlist, we print out a warning if any invalid domains are detected. However, it is not always strictly true that there is something wrong with the entry - it is more that they are incompatible with Pi-hole
https://discourse.pi-hole.net/t/fresh-install-steven-black-list-invalid-domains/60523
This PR introduces a small list of common localhost domains (as included at the top of StevenBlack's list to discount these as being counted as "invalid", and also changes the wording of invalid domains to unusable entries.
Example output before these changes:
Example output after these changes:
The copy could probably be further clarified to mention that this is not an error - just for information, and that nothing is wrong, but it is late and I'm struggling to find the words
By submitting this pull request, I confirm the following:
git rebase
)