Icycoide/searxng
1
0
Fork 1
mirror of https://github.com/searxng/searxng.git synced 2025-07-13 00:09:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] image_proxy: always close the httpx respone

Browse source 
previously, when the content type was not an image and some other error,
the httpx response was not closed
This commit is contained in:
Alexandre Flament 2021-08-14 19:36:30 +02:00
parent df15c655f7
commit 43fcaa642a
2 changed files with 52 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

49
searx/webapp.py
View file

@ -1065,7 +1065,7 @@ def _is_selected_language_supported(engine, preferences): # pylint: disable=red
@app.route('/image_proxy', methods=['GET'])
def image_proxy():
# pylint: disable=too-many-return-statements
# pylint: disable=too-many-return-statements, too-many-branches
url = request.args.get('url')
if not url:
@ -1076,14 +1076,20 @@ def image_proxy():
return '', 400
maximum_size = 5 * 1024 * 1024
forward_resp = False
resp = None
try:
headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})
headers['User-Agent'] = gen_useragent()
request_headers = {
'User-Agent': gen_useragent(),
'Accept': 'image/webp,*/*',
'Accept-Encoding': 'gzip, deflate',
'Sec-GPC': '1',
'DNT': '1',
}
stream = http_stream(
method = 'GET',
url = url,
headers = headers,
headers = request_headers,
timeout = settings['outgoing']['request_timeout'],
allow_redirects = True,
max_redirects = 20
@ -1095,32 +1101,37 @@ def image_proxy():
and int(content_length) > maximum_size ):
return 'Max size', 400
if resp.status_code == 304:
return '', resp.status_code
if resp.status_code != 200:
logger.debug(
'image-proxy: wrong response code: {0}'.format(
resp.status_code))
logger.debug('image-proxy: wrong response code: %i', resp.status_code)
if resp.status_code >= 400:
return '', resp.status_code
return '', 400
if not resp.headers.get('content-type', '').startswith('image/'):
logger.debug(
'image-proxy: wrong content-type: {0}'.format(
resp.headers.get('content-type')))
if not resp.headers.get('Content-Type', '').startswith('image/'):
logger.debug('image-proxy: wrong content-type: %s', resp.headers.get('Content-Type', ''))
return '', 400
forward_resp = True
except httpx.HTTPError:
logger.exception('HTTP error')
return '', 400
finally:
if resp and not forward_resp:
# the code is about to return an HTTP 400 error to the browser
# we make sure to close the response between searxng and the HTTP server
try:
resp.close()
except httpx.HTTPError:
logger.exception('HTTP error on closing')
try:
headers = dict_subset(
resp.headers,
{'Content-Length', 'Length', 'Date', 'Last-Modified', 'Expires', 'Etag'}
{'Content-Type', 'Content-Encoding', 'Content-Length', 'Length'}
)
total_length = 0
def forward_chunk():
nonlocal total_length
total_length = 0
for chunk in stream:
total_length += len(chunk)
if total_length > maximum_size: