lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 17:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

unbound: blocklists: lowercase all domains

Browse Source 
while here, also add size check to cached blocklists, as they might be empty
due to network errors.
This commit is contained in:
Stephan de Wit 2023-03-20 09:05:52 +01:00
parent 667b50d564
commit b8d3e6a7ef
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opnsense/scripts/unbound/blocklists/__init__.py
View File

@ -100,7 +100,7 @@ class BaseBlocklistHandler:
if entry not in ['127.0.0.1', '0.0.0.0']:
break
if entry:
yield entry
yield entry.lower()
def _uri_reader(self, uri):
"""

12
src/opnsense/scripts/unbound/blocklists/default_bl.py
View File

@ -52,9 +52,8 @@ class DefaultBlocklistHandler(BaseBlocklistHandler):
result = {}
for blocklist, bl_shortcode in self._blocklists_in_config():
per_file_stats = {'uri': blocklist, 'skip': 0, 'blocklist': 0}
for entry in self._domains_in_blocklist(blocklist):
domain = entry.lower()
if self._whitelist_pattern.match(entry):
for domain in self._domains_in_blocklist(blocklist):
if self._whitelist_pattern.match(domain):
per_file_stats['skip'] += 1
else:
if self.domain_pattern.match(domain):
@ -82,9 +81,10 @@ class DefaultBlocklistHandler(BaseBlocklistHandler):
if self.domain_pattern.match(entry):
result[entry] = {'bl': 'Manual', 'wildcard': False}
elif key.startswith('wildcard'):
if self.domain_pattern.match(value):
entry = value.rstrip().lower()
if self.domain_pattern.match(entry):
# do not apply whitelist to wildcard domains
result[value] = {'bl': 'Manual', 'wildcard': True}
result[entry] = {'bl': 'Manual', 'wildcard': True}
return result
@ -109,7 +109,7 @@ class DefaultBlocklistHandler(BaseBlocklistHandler):
cache_loc = '/tmp/bl_cache/'
if os.path.exists(cache_loc):
filep = cache_loc + h
if os.path.exists(filep):
if os.path.exists(filep) and os.path.getsize(filep) > 0:
fstat = os.stat(filep).st_ctime
if (time.time() - fstat) < self.cache_ttl: # 20 hours, a bit under the recommended cron time
from_cache = True

2
src/opnsense/service/templates/OPNsense/Unbound/core/dnsbl_module.py
View File

@ -312,7 +312,7 @@ class DNSBL:
if not query.type in ('A', 'AAAA', 'CNAME', 'HTTPS'):
return False
domain = query.domain.rstrip('.')
domain = query.domain.rstrip('.').lower()
sub = domain
match = None
while match is None: