Proxify most of images references
Create hash only when necessary
commit1d5151215266d74085406604f99d8dec1c7cbe72
authordalf <alex@al-f.net>
dateSun 18 Jan 2015, 09:54 (12 years ago)
parent9154cf7
searx/templates/courgette/result_templates/code.html+2−2
@@ -1,9 +1,9 @@
11<div class="result {{ result.class }}">
22 <h3 class="result_title">{% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
33 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}
4− <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
4+ <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
55 {% if result.repository %}<p class="content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
66 {{ result.codelines|code_highlighter(result.code_language)|safe }}
77
88 <p class="url">{{ result.pretty_url }}</p>
9−</div>
9+</div>
searx/templates/courgette/result_templates/videos.html+2−2
@@ -5,6 +5,6 @@
55
66 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
77 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
8− <a href="{{ result.url }}"><img width="400" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
8+ <a href="{{ result.url }}"><img width="400" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
99 <p class="url">{{ result.pretty_url }}</p>
10−</div>
10+</div>
searx/templates/default/result_templates/code.html+1−1
@@ -2,7 +2,7 @@
22 <h3 class="result_title"> {% if result['favicon'] %}<img width="14" height="14" class="favicon" src="static/{{theme}}/img/icon_{{result['favicon']}}.ico" alt="{{result['favicon']}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
33 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a></p>
44 {% if result.publishedDate %}<p class="published_date">{{ result.publishedDate }}</p>{% endif %}
5− <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
5+ <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
66 {% if result.repository %}<p class="result-content"><a href="{{ result.repository|safe }}">{{ result.repository }}</a></p>{% endif %}
77
88 {{ result.codelines|code_highlighter(result.code_language)|safe }}
searx/templates/default/result_templates/default.html+1−1
@@ -2,5 +2,5 @@
22 <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
33 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a>
44 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
5− <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
5+ <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
66</div>
searx/templates/default/result_templates/map.html+1−1
@@ -8,6 +8,6 @@
88 <h3 class="result_title"><a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
99 <p class="url">{{ result.pretty_url }} <a class="cache_link" href="https://web.archive.org/web/{{ result.url }}">cached</a>
1010 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span>{% endif %}</p>
11− <p class="content">{% if result.img_src %}<img src="{{ result.img_src }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
11+ <p class="content">{% if result.img_src %}<img src="{{ image_proxify(result.img_src) }}" class="image" />{% endif %}{% if result.content %}{{ result.content|safe }}<br class="last"/>{% endif %}</p>
1212 </div>
1313</div>
searx/templates/default/result_templates/videos.html+1−1
@@ -1,6 +1,6 @@
11<div class="result">
22 <h3 class="result_title">{% if "icon_"~result.engine~".ico" in favicons %}<img width="14" height="14" class="favicon" src="{{ url_for('static', filename='img/icons/icon_'+result.engine+'.ico') }}" alt="{{result.engine}}" />{% endif %}<a href="{{ result.url }}">{{ result.title|safe }}</a></h3>
33 {% if result.publishedDate %}<span class="published_date">{{ result.publishedDate }}</span><br />{% endif %}
4− <a href="{{ result.url }}"><img class="thumbnail" src="{{ result.thumbnail }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
4+ <a href="{{ result.url }}"><img class="thumbnail" src="{{ image_proxify(result.thumbnail) }}" title="{{ result.title|striptags }}" alt="{{ result.title|striptags }}"/></a>
55 <p class="url">{{ result.url }}</p>
66</div>
searx/templates/oscar/result_templates/videos.html+1−1
@@ -15,7 +15,7 @@
1515
1616<div class="container-fluid">
1717 <div class="row">
18− <a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ result.thumbnail|safe }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>
18+ <a href="{{ result.url }}"><img class="thumbnail col-xs-6 col-sm-4 col-md-4 result-content" src="{{ image_proxify(result.thumbnail) }}" alt="{{ result.title|striptags }} {{ result.engine }}" /></a>
1919 {% if result.content %}<p class="col-xs-12 col-sm-8 col-md-8 result-content">{{ result.content|safe }}</p>{% endif %}
2020 </div>
2121</div>
searx/webapp.py+2−2
@@ -214,11 +214,11 @@ def image_proxify(url):
214214 if url.startswith('//'):
215215 url = 'https:' + url
216216
217− h = hashlib.sha256(url + settings['server']['secret_key']).hexdigest()
218−
219217 if not settings['server'].get('image_proxy') and not request.cookies.get('image_proxy'):
220218 return url
221219
220+ h = hashlib.sha256(url + settings['server']['secret_key']).hexdigest()
221+
222222 return '{0}?{1}'.format(url_for('image_proxy'),
223223 urlencode(dict(url=url, h=h)))
224224