From 0e77afcfb1d19c40851a7160430c2e30dac04391 Mon Sep 17 00:00:00 2001
From: Petr Kejval <petr.kejval6@gmail.com>
Date: Wed, 1 Apr 2020 20:11:36 +0200
Subject: [PATCH] Fix issue #1759 - dnsbl.py

Fix for https://github.com/opnsense/plugins/issues/1759

* Restrict download timeout to 5 seconds and 2 retries. Parse only if HTTP response status is 200 OK.
* "Whitelist" (exclude) domains which aren't starting with alphanumeric char causing Unbound not to start.
---
 .../opnsense/scripts/OPNsense/Unboundplus/dnsbl.py   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 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 054b73149..811a6ebc1 100755
--- a/dns/unbound-plus/src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py
+++ b/dns/unbound-plus/src/opnsense/scripts/OPNsense/Unboundplus/dnsbl.py
@@ -86,11 +86,12 @@ def process_url(url):
     print(f"Processing BL items from: {url}")
 
     try:
-        http = urllib3.PoolManager()
-        r = http.request('GET', url)
+        http = urllib3.PoolManager(timeout=5.0)
+        r = http.request('GET', url, retries=2)
 
-        for line in str(r.data).split('\\n'):
-            parse_line(line)
+        if r.status == 200:
+            for line in str(r.data).split('\\n'):
+                parse_line(line)
     except Exception as e:
         print(str(e))
 
@@ -135,7 +136,8 @@ def load_whitelist():
     print("Loading whitelist")
     global re_whitelist
     wl = load_list('/var/unbound/etc/whitelist.inc', ',')
-    wl.add('.*localhost$')
+    wl.add(r'.*localhost$')
+    wl.add(r'^(?![a-zA-Z\d]).*') # Exclude domains NOT starting with alphanumeric char
     print(f"Loaded {len(wl)} whitelist items")
 
     try: