From 33a32105ca77f23160ae68293019c4ffc641f41e Mon Sep 17 00:00:00 2001 From: Petr Kejval Date: Sat, 15 Feb 2020 21:18:01 +0100 Subject: [PATCH] DNSBL - Fix regex for domains starting with number (#1694) --- .../src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dns/unbound-plus/src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py b/dns/unbound-plus/src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py index 1b6acba98..247c74973 100755 --- a/dns/unbound-plus/src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py +++ b/dns/unbound-plus/src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py @@ -30,7 +30,7 @@ import re, urllib3, threading, subprocess -re_blacklist = re.compile(r'(^127\.0\.0\.1\s|^0\.0\.0\.0\s)(.*)|^([a-z_.-]+$)', re.I) +re_blacklist = re.compile(r'(^127\.0\.0\.1[\s]+|^0\.0\.0\.0[\s]+)([^\s]+)|^([0-9a-z_.-]+$)', re.I) re_whitelist = re.compile(r'$^') # default - match nothing blacklist = set() urls = set() @@ -72,6 +72,8 @@ def add_to_blacklist(domain): def parse_line(line): """ Checks if line matches re_blacklist. If so, tries add domain to BL set. """ global blacklist + line = line.replace('\\t', " ") + line = line.replace('\\r', "") match = re_blacklist.match(line) if match: if match.group(2) != None: