pfBlockerNG: extend support for AdBlock-style lists #1303
Closed
Conversation
This file contains 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
* Use less memory, write whitelist to disk right away * Fix regular expression conversion to disallow matching limiter chars * Do not recreate whitelist file for each alias
* Use a dedicated log file for whitelisting results * Restrict detailed view on whitelisted domains to log file * Make the new file visible via the Logs page
* Missing: * TOP1M support * Whitelist support * Testing it
andrebrait
force-pushed
the
pffblockerng_devel_whitelist_regex
branch
from
60ecbea to
b26ee61
Compare
* This is the intended behavior for them * Enabled resolving multiple wildcards for blacklists
andrebrait
force-pushed
the
pffblockerng_devel_whitelist_regex
branch
from
b26ee61 to
b9a6874
Compare
|
Idea: move the |
andrebrait
force-pushed
the
pffblockerng_devel_whitelist_regex
branch
from
b9a6874 to
c7e351a
Compare
andrebrait
force-pushed
the
pffblockerng_devel_whitelist_regex
branch
2 times, most recently
from
77537b7 to
f926b71
Compare
netgate-git-updates
force-pushed
the
devel
branch
from
15a8e61 to
a8234ec
Compare
andrebrait
force-pushed
the
pffblockerng_devel_whitelist_regex
branch
from
f926b71 to
40d5d9f
Compare
|
Superseded by #1343 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This supersedes #1302 and closes #14838.
Extend support for AdBlock-style lists:
In Python mode, most processing was moved to Python, with the surrounding code merely assembling lists that get consumed by it.
User-defined, TOP1M and Whitelist entries from AdBlock-style lists get all joined in a single file (PHP) that gets loaded and parsed later (Python).
Whenever possible, simple domain matches are kept as-is. The presence of any wildcards triggers the conversion of that specific entry into a Regular Expression in the Python format.
In Unbound mode, everything is kept the same, except that whitelisting is now done in 3 distinct steps (User-defined and TOP1M using fixed string matching with ggrep, and Whitelist entries from AdBlock-style lists using extended regular expressions with ggrep), in a postprocessing step separate from the deduplication, etc.
In both cases, the
# Whitecount in the logs now refers to how many whitelist entries were found, rather than how many domains were removed from the Blacklist.This still needs testing and input on where to log things in a more adequate fashion.