lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 10:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

unbound: catch exception on blocklist reading (#6035)

Browse Source
This commit is contained in:
kulikov-a 2022-12-21 16:15:18 +03:00 committed by GitHub
parent 75e428f8a2
commit 360d4a45e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/opnsense/scripts/unbound/blocklists.py
View File

@ -53,19 +53,24 @@ def uri_reader(uri):
req.raw.decode_content = True
prev_chop = ''
while True:
chop = req.raw.read(1024).decode()
if not chop:
if prev_chop:
yield prev_chop
break
else:
parts = (prev_chop + chop).split('\n')
if parts[-1] != "\n":
prev_chop = parts.pop()
try:
chop = req.raw.read(1024).decode()
if not chop:
if prev_chop:
yield prev_chop
break
else:
prev_chop = ''
for part in parts:
yield part
parts = (prev_chop + chop).split('\n')
if parts[-1] != "\n":
prev_chop = parts.pop()
else:
prev_chop = ''
for part in parts:
yield part
except Exception as e:
syslog.syslog(syslog.LOG_ERR,'blocklist download : error reading file from %s (error : %s)' % (uri, e))
return
else:
syslog.syslog(syslog.LOG_ERR,
'blocklist download : unable to download file from %s (status_code: %d)' % (uri, req.status_code)