From 4a423e1405967fadde016cbcaec37ac49055edce Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicofonk@gmail.com>
Date: Fri, 19 Jul 2019 08:01:12 +0200
Subject: [PATCH 1/5] Remove beta logo of eelo theme

Close: #34
---
 .../static/themes/eelo/img/logo_eelo_inline.png | Bin 16483 -> 0 bytes
 searx/templates/eelo/index.html                 |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 searx/static/themes/eelo/img/logo_eelo_inline.png

diff --git a/searx/static/themes/eelo/img/logo_eelo_inline.png b/searx/static/themes/eelo/img/logo_eelo_inline.png
deleted file mode 100644
index a428e247c8ace4aad869b8e6733833de276415b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16483
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
U&HC~R0|Nttr>mdKI;Vst0P61JApigX

diff --git a/searx/templates/eelo/index.html b/searx/templates/eelo/index.html
index 73deb2671..fbebaf2f7 100644
--- a/searx/templates/eelo/index.html
+++ b/searx/templates/eelo/index.html
@@ -10,7 +10,7 @@
 
 <div id="index">
     <img src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="searx logo" />
-    <img id="logo_inline" src="{{ url_for('static', filename='img/logo_eelo_inline.png') }}" alt="e logo" />
+    <img id="logo_inline" src="{{ url_for('static', filename='img/logo_searx_a.png') }}" alt="e logo" />
     {% include 'eelo/components/search.html' %}
 </div>
 {% endblock %}
-- 
GitLab


From 6267e0cccffec8a3f1b114eb31c1498e3fd0fc19 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@e.email>
Date: Tue, 23 Jul 2019 13:32:59 +0000
Subject: [PATCH 2/5] Fix build issues

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22bf8a44f..348c9b7b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,7 @@ build:docker:
   stage: build
   image: docker:git
   services:
-    - docker:dind
+    - docker:18-dind
   before_script:
     - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
   script:
@@ -53,7 +53,7 @@ test:functional:
   stage: test
   image: docker:stable
   services:
-    - docker:dind
+    - docker:18-dind
   variables:
     DOCKER_HOST: tcp://docker:2375/
     DOCKER_DRIVER: overlay2
-- 
GitLab


From bc8261c5d2020f5d767f6c0f0c53ae7c703839a5 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicofonk@gmail.com>
Date: Wed, 17 Jul 2019 08:55:00 +0200
Subject: [PATCH 3/5] Fix searx version

Searx version is useful for external report tool like stats.searx.xyz.
Then is better for spot project to track the upstream tag to avoid conflict
during the next rebase. The new spot tag format is the folowing:
`<last searx tag>+<spot tag>`. I suggest to use the spot tag with the date format
`YYYYMMDD`. A full tag should be `v0.15.0+20190719`.

Ref: #36
---
 searx/templates/eelo/base.html | 2 +-
 searx/version.py               | 6 ++++++
 searx/webapp.py                | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/searx/templates/eelo/base.html b/searx/templates/eelo/base.html
index 31fb8160f..94dae554a 100644
--- a/searx/templates/eelo/base.html
+++ b/searx/templates/eelo/base.html
@@ -89,7 +89,7 @@
             <small>
                 e Foundation 2018-2019,
                 {{ _('Powered by') }} <a href="https://gitlab.e.foundation/e/cloud/my-spot">Spot</a>
-                {{ searx_version }}.<br/>An open-source metasearch engine forked from <a href="https://asciimoo.github.io/searx/">Searx</a>. 
+                {{ metadata_version }}.<br/>An open-source metasearch engine forked from <a href="https://asciimoo.github.io/searx/">Searx</a> {{ searx_version }}.
                 <span class="links">
                     <a href="https://e.foundation">{{ _('About') }}</a>
                     <a href="https://e.foundation/privacy-policy">{{ _('Privacy') }}</a>
diff --git a/searx/version.py b/searx/version.py
index 473eb722d..11bbcbffe 100644
--- a/searx/version.py
+++ b/searx/version.py
@@ -22,3 +22,9 @@ try:
     VERSION_STRING = get_distribution("searx").version
 except DistributionNotFound:
     VERSION_STRING = "0.0.0"
+
+try:
+    SEARX_VERSION, METADATA_VERSION = VERSION_STRING.split("+")
+except ValueError:
+    SEARX_VERSION = VERSION_STRING
+    METADATA_VERSION = ""
diff --git a/searx/webapp.py b/searx/webapp.py
index fea6046e2..48ccef934 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -52,7 +52,7 @@ from searx.utils import (
     get_static_files, get_result_templates, get_themes, gen_useragent,
     dict_subset, prettify_url, match_language
 )
-from searx.version import VERSION_STRING
+from searx.version import VERSION_STRING, SEARX_VERSION, METADATA_VERSION
 from searx.languages import language_codes as languages
 from searx.search import Search
 from searx.search_database import RedisCache
@@ -333,7 +333,8 @@ def render(template_name, override_theme=None, **kwargs):
     if locale in rtl_locales and 'rtl' not in kwargs:
         kwargs['rtl'] = True
 
-    kwargs['searx_version'] = VERSION_STRING
+    kwargs['searx_version'] = SEARX_VERSION
+    kwargs['metadata_version'] = METADATA_VERSION
 
     kwargs['method'] = request.preferences.get_value('method')
 
-- 
GitLab


From 7a701db3bf840cbe55de2a33a9ea186647367164 Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicofonk@gmail.com>
Date: Wed, 17 Jul 2019 09:45:47 +0200
Subject: [PATCH 4/5] Fix Mozilla observatory issues

Close: #36
---
 docker-compose.yml        | 1 +
 etc/nginx/vhost.d/default | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 etc/nginx/vhost.d/default

diff --git a/docker-compose.yml b/docker-compose.yml
index c6cd1aa3f..87a27d780 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,6 +19,7 @@ services:
     restart: unless-stopped
     container_name: proxy
     volumes:
+      - ./etc/nginx/vhost.d/default:/etc/nginx/vhost.d/default
       - /mnt/data/html:/usr/share/nginx/html
       - /mnt/data/vhosts:/etc/nginx/vhost.d
       - /mnt/data/certs:/etc/nginx/certs:ro
diff --git a/etc/nginx/vhost.d/default b/etc/nginx/vhost.d/default
new file mode 100644
index 000000000..07c6b072b
--- /dev/null
+++ b/etc/nginx/vhost.d/default
@@ -0,0 +1,5 @@
+add_header Content-Security-Policy "frame-ancestors 'self'";
+add_header Referrer-Policy "no-referrer, strict-origin-when-cross-origin";
+add_header X-Frame-Options "SAMEORIGIN";
+add_header X-XSS-Protection "1; mode=block";
+add_header X-Content-Type-Options "nosniff";
-- 
GitLab


From 928ab905c00ea4b0102e5f33cea04d19186d3d8c Mon Sep 17 00:00:00 2001
From: Nicolas Gelot <nicofonk@gmail.com>
Date: Thu, 18 Jul 2019 00:12:45 +0200
Subject: [PATCH 5/5] Fix /config endpoint

This patch casts dict_keys to a liste to solve the http 500
related to `Object of type dict_keys is not JSON serializable`.
---
 searx/webapp.py              | 63 ++++++++++++++++++++----------------
 tests/functional/test_api.py |  6 ++++
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/searx/webapp.py b/searx/webapp.py
index 48ccef934..36f361232 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -785,34 +785,41 @@ def clear_cookies():
 
 @app.route('/config')
 def config():
-    return jsonify({'categories': categories.keys(),
-                    'engines': [{'name': engine_name,
-                                 'categories': engine.categories,
-                                 'shortcut': engine.shortcut,
-                                 'enabled': not engine.disabled,
-                                 'paging': engine.paging,
-                                 'language_support': engine.language_support,
-                                 'supported_languages':
-                                     engine.supported_languages.keys()
-                                     if isinstance(engine.supported_languages, dict)
-                                     else engine.supported_languages,
-                                 'safesearch': engine.safesearch,
-                                 'time_range_support': engine.time_range_support,
-                                 'timeout': engine.timeout}
-                                for engine_name, engine in engines.items()],
-                    'plugins': [{'name': plugin.name,
-                                 'enabled': plugin.default_on}
-                                for plugin in plugins],
-                    'instance_name': settings['general']['instance_name'],
-                    'locales': settings['locales'],
-                    'default_locale': settings['ui']['default_locale'],
-                    'autocomplete': settings['search']['autocomplete'],
-                    'safe_search': settings['search']['safe_search'],
-                    'default_theme': settings['ui']['default_theme'],
-                    'version': VERSION_STRING,
-                    'doi_resolvers': [r for r in settings['doi_resolvers']],
-                    'default_doi_resolver': settings['default_doi_resolver'],
-                    })
+    return jsonify(
+        {
+            "categories": list(categories.keys()),
+            "engines": [
+                {
+                    "name": engine_name,
+                    "categories": engine.categories,
+                    "shortcut": engine.shortcut,
+                    "enabled": not engine.disabled,
+                    "paging": engine.paging,
+                    "language_support": engine.language_support,
+                    "supported_languages": list(engine.supported_languages.keys())
+                    if isinstance(engine.supported_languages, dict)
+                    else engine.supported_languages,
+                    "safesearch": engine.safesearch,
+                    "time_range_support": engine.time_range_support,
+                    "timeout": engine.timeout,
+                }
+                for engine_name, engine in engines.items()
+            ],
+            "plugins": [
+                {"name": plugin.name, "enabled": plugin.default_on}
+                for plugin in plugins
+            ],
+            "instance_name": settings["general"]["instance_name"],
+            "locales": settings["locales"],
+            "default_locale": settings["ui"]["default_locale"],
+            "autocomplete": settings["search"]["autocomplete"],
+            "safe_search": settings["search"]["safe_search"],
+            "default_theme": settings["ui"]["default_theme"],
+            "version": VERSION_STRING,
+            "doi_resolvers": [r for r in settings["doi_resolvers"]],
+            "default_doi_resolver": settings["default_doi_resolver"],
+        }
+    )
 
 
 @app.errorhandler(404)
diff --git a/tests/functional/test_api.py b/tests/functional/test_api.py
index b5c31eba4..330bc9ab7 100644
--- a/tests/functional/test_api.py
+++ b/tests/functional/test_api.py
@@ -27,3 +27,9 @@ def test_index(ctx, redisdb):
     assert len(response["results"]) > 5
     assert len(response["image_results"]) == 5
     assert len(response['videos_results']) == 2
+
+
+def test_config(ctx):
+    res = requests.get(ctx.url + "/config")
+    assert res.status_code == 200
+    assert res.json()["instance_name"] == "/e/ spot"
-- 
GitLab