From 23f4f6c5bbeeb1ef9a27315bec14f33e9e5dcf8f Mon Sep 17 00:00:00 2001 From: Muntashir Al-Islam Date: Tue, 20 Jul 2021 17:19:35 +0600 Subject: [PATCH] [UPDATE] Parse all supported filter patterns For both remote and local files, parse all the filter patterns supported by DNSCrypt. A list of supported patterns are given here: https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Filters#filter-patterns --- config/generate-domains-blocklist.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/generate-domains-blocklist.py b/config/generate-domains-blocklist.py index 6bdbe95..e64f297 100755 --- a/config/generate-domains-blocklist.py +++ b/config/generate-domains-blocklist.py @@ -20,7 +20,7 @@ except (ImportError, ModuleNotFoundError): def parse_time_restricted_list(content): rx_comment = re.compile(r"^(#|$)") 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() @@ -61,7 +61,7 @@ def parse_list(content, trusted=False): rx_mdl = re.compile(r'^"[^"]+","([a-z0-9][a-z0-9.-]*[.][a-z]{2,})",') rx_b = re.compile(r"^([a-z0-9][a-z0-9.-]*[.][a-z]{2,}),.+,[0-9: /-]+,") rx_dq = re.compile(r"^address=/([a-z0-9][a-z0-9.-]*[.][a-z]{2,})/.") - rx_trusted = re.compile(r"^([*a-z0-9.-]+)\s*(@\S+)?$") + rx_trusted = re.compile(r"^(=?[*a-z0-9.\-\[\]\?\:]+)\s*(@\S+)?$") if trusted: