mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-04 21:57:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Ignore regexes in time-based entries

Browse source 
Fixes #1548
This commit is contained in:
Frank Denis 2020-12-20 13:49:08 +01:00
parent 859710d6f5
commit 2baabbca8a
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
utils/generate-domains-blocklist/generate-domains-blocklist.py
View file

@ -24,6 +24,7 @@ def parse_trusted_list(content):
rx_comment = re.compile(r"^(#|$)") rx_comment = re.compile(r"^(#|$)")
rx_inline_comment = re.compile(r"\s*#\s*[a-z0-9-].*$") rx_inline_comment = re.compile(r"\s*#\s*[a-z0-9-].*$")
rx_trusted = re.compile(r"^([*a-z0-9.-]+)\s*(@\S+)?$") rx_trusted = re.compile(r"^([*a-z0-9.-]+)\s*(@\S+)?$")
rx_timed = re.compile(r".+\s*(@\S+)?$")
names = set() names = set()
time_restrictions = {} time_restrictions = {}
@ -34,7 +35,7 @@ def parse_trusted_list(content):
if rx_comment.match(line): if rx_comment.match(line):
continue continue
line = str.strip(rx_inline_comment.sub("", line)) line = str.strip(rx_inline_comment.sub("", line))
if is_glob(line): if is_glob(line) and not rx_timed.match(line):
globs.add(line) globs.add(line)
names.add(line) names.add(line)
continue continue