From c5a1daa70616c072b54b47d58b6ab0c5128daba4 Mon Sep 17 00:00:00 2001 From: Petr Kejval Date: Sat, 22 Feb 2020 13:59:53 +0100 Subject: [PATCH] unbound-plus: another regex fix (#1704) --- .../src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 247c74973..054b73149 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]+)([^\s]+)|^([0-9a-z_.-]+$)', re.I) +re_blacklist = re.compile(r'(^127\.0\.0\.1[\s]+|^0\.0\.0\.0[\s]+)([0-9a-z_.-]+)(?:\s|$)|^([0-9a-z_.-]+)(?:\s|$)', re.I) re_whitelist = re.compile(r'$^') # default - match nothing blacklist = set() urls = set() @@ -139,7 +139,7 @@ def load_whitelist(): print(f"Loaded {len(wl)} whitelist items") try: - re_whitelist = re.compile('|'.join(wl)) + re_whitelist = re.compile('|'.join(wl), re.I) except Exception as e: print(f"Whitelist regex compile failed: {str(e)}")