d3cim
/
block
mirror of https://github.com/d3cim/block.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[UPSTREAM] Parse names prefixed with [*.] 

f7e3381650
This commit is contained in:
quindecim 2022-01-26 23:29:21 +01:00
parent be408e17d4
commit 54d1593ff5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/generate-domains-blocklist.py
View File

@ -55,6 +55,7 @@ def parse_list(content, trusted=False):
rx_u = re.compile( rx_u = re.compile(
r"^@*\|\|([a-z0-9][a-z0-9.-]*[.][a-z]{2,})\^?(\$(popup|third-party))?$") r"^@*\|\|([a-z0-9][a-z0-9.-]*[.][a-z]{2,})\^?(\$(popup|third-party))?$")
rx_l = re.compile(r"^([a-z0-9][a-z0-9.-]*[.][a-z]{2,})$") rx_l = re.compile(r"^([a-z0-9][a-z0-9.-]*[.][a-z]{2,})$")
rx_lw = re.compile(r"^[*][.]([a-z0-9][a-z0-9.-]*[.][a-z]{2,})$")
rx_h = re.compile( rx_h = re.compile(
r"^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}\s+([a-z0-9][a-z0-9.-]*[.][a-z]{2,})$" r"^[0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}[.][0-9]{1,3}\s+([a-z0-9][a-z0-9.-]*[.][a-z]{2,})$"
) )
@ -67,7 +68,7 @@ def parse_list(content, trusted=False):
names = set() names = set()
time_restrictions = {} time_restrictions = {}
rx_set = [rx_u, rx_l, rx_h, rx_mdl, rx_b, rx_dq] rx_set = [rx_u, rx_l, rx_lw, rx_h, rx_mdl, rx_b, rx_dq]
for line in content.splitlines(): for line in content.splitlines():
line = str.lower(str.strip(line)) line = str.lower(str.strip(line))
if rx_comment.match(line): if rx_comment.match(line):
@ -305,4 +306,3 @@ ignore_retrieval_failure = args.ignore_retrieval_failure
blocklists_from_config_file( blocklists_from_config_file(
conf, allowlist, time_restricted, ignore_retrieval_failure) conf, allowlist, time_restricted, ignore_retrieval_failure)