kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-17 18:00:12 +01:00
Code

[enh] image-proxy : handle ETag and date related headers, add hash to URL

Browse Source
This commit is contained in:
dalf 2015-01-17 21:54:40 +01:00
parent a865e6672f
commit b6d27aca59
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
searx/utils.py
View File

@ -206,3 +206,11 @@ def format_date_by_locale(date_string, locale_string):
except: except:
logger.warning('cannot set original locale: {0}'.format(orig_locale)) logger.warning('cannot set original locale: {0}'.format(orig_locale))
return formatted_date return formatted_date
def dict_subset(d, properties):
result = {}
for k in properties:
if k in d:
result[k] = d[k]
return result

24
searx/webapp.py
View File

@ -25,6 +25,7 @@ if __name__ == '__main__':
import json import json
import cStringIO import cStringIO
import os import os
import hashlib
from datetime import datetime, timedelta from datetime import datetime, timedelta
from requests import get as http_get from requests import get as http_get
@ -41,7 +42,7 @@ from searx.engines import (
) )
from searx.utils import ( from searx.utils import (
UnicodeWriter, highlight_content, html_to_text, get_themes, UnicodeWriter, highlight_content, html_to_text, get_themes,
get_static_files, get_result_templates, gen_useragent get_static_files, get_result_templates, gen_useragent, dict_subset
) )
from searx.version import VERSION_STRING from searx.version import VERSION_STRING
from searx.languages import language_codes from searx.languages import language_codes
@ -213,11 +214,13 @@ def image_proxify(url):
if url.startswith('//'): if url.startswith('//'):
url = 'https:' + url url = 'https:' + url
h = hashlib.sha256(url + settings['server']['secret_key']).hexdigest()
if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'): if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'):
return url return url
return '{0}?{1}'.format(url_for('image_proxy'), return '{0}?{1}'.format(url_for('image_proxy'),
urlencode(dict(url=url))) urlencode(dict(url=url, h=h)))
def render(template_name, override_theme=None, **kwargs): def render(template_name, override_theme=None, **kwargs):
@ -562,10 +565,21 @@ def image_proxy():
if not url: if not url:
return '', 400 return '', 400
h = hashlib.sha256(url + settings['server']['secret_key']).hexdigest()
if h != request.args.get('h'):
return '', 400
headers = dict_subset(request.headers, {'If-Modified-Since', 'If-None-Match'})
headers['User-Agent'] = gen_useragent()
resp = http_get(url, resp = http_get(url,
stream=True, stream=True,
timeout=settings['server'].get('request_timeout', 2), timeout=settings['server'].get('request_timeout', 2),
headers={'User-Agent': gen_useragent()}) headers=headers)
if resp.status_code == 304:
return '', resp.status_code
if resp.status_code != 200: if resp.status_code != 200:
logger.debug('image-proxy: wrong response code: {0}'.format(resp.status_code)) logger.debug('image-proxy: wrong response code: {0}'.format(resp.status_code))
@ -586,7 +600,9 @@ def image_proxy():
return '', 502 # Bad gateway - file is too big (>5M) return '', 502 # Bad gateway - file is too big (>5M)
img += chunk img += chunk
return Response(img, mimetype=resp.headers['content-type']) headers = dict_subset(resp.headers, {'Content-Length', 'Length', 'Date', 'Last-Modified', 'Expires', 'Etag'})
return Response(img, mimetype=resp.headers['content-type'], headers=headers)
@app.route('/stats', methods=['GET']) @app.route('/stats', methods=['GET'])