kamp/searxng
1
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2024-11-23 12:31:25 +01:00
Code
2,960 Commits 6 Branches 17 Tags 135 MiB
88f9ac58f4
Commit Graph

2960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dalf
88f9ac58f4 [mod] move public instance list to https://searx.space 2020-02-14 13:48:44 +01:00
Markus Heiser
7f224713e5
Merge pull request #1621 from nfk/locale 
Fix regional settings #844
 2020-02-08 14:54:22 +00:00
Markus Heiser
7c79eb9b1b Merge commit 'refs/pull/1621/head' of https://github.com/asciimoo/searx 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-02-08 15:08:33 +01:00
Markus Heiser
50b070c5d3 Merge pull request #1835 from dalf/uwsgi_fix 
[fix] Disable HTTP keep alive
 2020-02-08 12:52:22 +00:00
Markus Heiser
3f127b6c95
Merge branch 'master' into uwsgi_fix 2020-02-08 12:47:56 +00:00
Markus Heiser
3062e2adf9 Merge pull request #1823 from kvch/make-engines-private 
Thanks! .. excellent work, I see you on #1836 :)
 2020-02-08 12:04:42 +00:00
Noémi Ványi
99435381a8 [enh] introduce private engines 
This PR adds a new setting to engines named `tokens`.
It expects a list of tokens which lets searx validate
if the request should be accepted or not.
 2020-02-08 11:47:39 +01:00
Dalf
0579d93783 [fix] Disable HTTP keep alive 
Fix HTTP 429 response from filtron
See https://github.com/searx/searx-docker/issues/24
 2020-02-07 19:16:15 +01:00
Adam Tauber
f9c7a678d2 [doc] fix rst format to be able to upload the package to pypi 2020-02-07 12:00:45 +01:00
Adam Tauber
ab1b1ac358
Merge pull request #1831 from nfk/nicofonk/fix/werkzeug_import 
Fix deprecated werkzeug import
 2020-02-06 21:58:42 +00:00
Nicolas Gelot
b8b13372c8 Fix deprecated werkzeug import 
Close: #1830
Signed-off-by: Nicolas Gelot <nicolas.gelot@e.email>
 2020-02-06 22:49:35 +01:00
Adam Tauber
6060ab85f8 [enh] version v0.16.0 2020-01-30 13:39:06 +01:00
Adam Tauber
89662cd33e [enh] update AUTHORS.rst with new contributors 2020-01-30 13:33:19 +01:00
Adam Tauber
b6a2aff94a [enh] update translations 2020-01-30 11:16:15 +01:00
Adam Tauber
8e3bd3fcbd [mod] add py2 deprecation warning to webapp 2020-01-28 15:52:50 +01:00
Markus Heiser
54675c7690
Merge pull request #1766 from dalf/fix-infinite-scroll 
[mod] infinite scroll: XHR requests are sent with the header "Accept: text/html"
 2020-01-28 11:04:02 +00:00
Markus Heiser
e64ff38217
Merge branch 'master' into fix-infinite-scroll 2020-01-28 10:59:03 +00:00
Markus Heiser
bda1895655
Merge pull request #1804 from unixfox/patch-1 
searx.be stopped using Fathom analytics
 2020-01-12 11:25:47 +00:00
Emilien Devos
e84067816b
searx.be stopped using Fathom analytics 2020-01-12 10:48:29 +00:00
Adam Tauber
68abe6ff11
Merge pull request #1800 from Yetangitu/flickr_noapi_double_encode 
[engines|fix] flickr_noapi: Fix double-encode error (fixes #1799)
 2020-01-08 00:42:17 +00:00
frankdelange
db9d7d47bd Fix double-encode error (fixes #1799) 2020-01-07 21:41:43 +01:00
Markus Heiser
22d05b3e59
Merge pull request #1791 from return42/add-docs 
misc docs
 2020-01-06 14:28:24 +00:00
Markus Heiser
86b5163641 docs: move wiki/Searx-instances from wiki to docs 
fix project link in conf.py

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-06 15:06:36 +01:00
Markus Heiser
f521a279ac Merge branch 'master' of https://github.com/asciimoo/searx into add-docs 2020-01-06 14:32:34 +01:00
Markus Heiser
0f4f0e517e docs(user): move wiki/Searx-instances from wiki to docs 
fixed some reST markups

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-06 14:31:18 +01:00
Markus Heiser
a3bbf95ad5
Merge pull request #1781 from finn0/bug/oscar-theme 
Oscar: move info box at top of the page
 2020-01-06 08:16:22 +00:00
Markus Heiser
1d86d0054f
Merge branch 'master' into bug/oscar-theme 2020-01-06 08:05:29 +00:00
Markus Heiser
3bb97fcb84 docs(user): public instances, fix Searxes@Danwin entry 
fixes: https://github.com/asciimoo/searx/issues/1770

This is not Searx at all. This is Meta-Searx with other engines.

See https://github.com/asciimoo/searx/issues/1770#issuecomment-570776655

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-05 10:02:42 +01:00
Markus Heiser
200c3a31f5 docs(user): move wiki/Searx-instances from wiki to docs (WIP) 
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785).

links has been ported from markdown to reST by::

      regexpr:        \[([^\]]*)\]\(([^)]*)\)
      substitution:  `\1 <\2>`__

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-04 18:26:04 +01:00
Markus Heiser
7347d9b508 docs(user): move wiki/Searx-instances from wiki to docs 
Move wiki entry https://github.com/asciimoo/searx/wiki/Searx-instances
into user section of the docs (#1785).

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2020-01-04 17:09:11 +01:00
Markus Heiser
51b9295b84 Merge branch 'master' of https://github.com/asciimoo/searx into add-docs 2020-01-03 14:30:53 +01:00
Adam Tauber
17b6faa4c3 [fix] pep8 2020-01-02 22:38:12 +01:00
Adam Tauber
ad5bb994b1 [fix] add py3 compatibility 2020-01-02 22:30:18 +01:00
Adam Tauber
1e6253ce16 [fix] handle empty response 2020-01-02 22:29:55 +01:00
Adam Tauber
86a378bd01 [fix] handle missing thumbnail 2020-01-02 22:29:28 +01:00
Adam Tauber
2dc2e1e8f9 [fix] skip invalid encoded attributes 2020-01-02 22:29:10 +01:00
Adam Tauber
2292e6e130 [fix] handle missing result size 2020-01-02 22:28:47 +01:00
Adam Tauber
a1b85571a2 [fix] tmp suspend insecure engines 2020-01-02 22:28:18 +01:00
Markus Heiser
2a7855854b
Merge pull request #1623 from ypid/fix/nginx-subdir-hosting 
Fix Nginx subdir URL install docs which allowed download of settings.yml
 2019-12-31 16:26:21 +01:00
Robin Schneider
3e5a3ee4e4
Let Nginx deliver static files directory in all examples 2019-12-31 14:43:14 +01:00
Robin Schneider
088337295a
Simply Nginx example by using alias directive for subdirectory URL 
We explicitly specific the static directory here using alias to allow to
host from a other subdirectory than "searx" which just so happens to
match the source code directory.
 2019-12-31 14:41:27 +01:00
Robin Schneider
a1d9c81915
Fix Nginx subdir URL install docs which allowed download of settings.yml 
Closes: #1617

There is an issue with the setup example in https://asciimoo.github.io/searx/dev/install/installation.html#installation for subdirectory URL deployments:

```nginx
root /usr/local/searx;

location = /searx { rewrite ^ /searx/; }
        try_files $uri @searx;
}
location @searx {
        uwsgi_param SCRIPT_NAME /searx;
        include uwsgi_params;
        uwsgi_modifier1 30;
        uwsgi_pass unix:/run/uwsgi/app/searx/socket;
}
```

`try_files` causes Nginx to search for files in the server root first. If it matches a file, it is returned. Only if no file matched, the request is passed to uwsgi. The worst consequence I can think of is that  `settings.yml` can be downloaded without authentication (where secrets and configuration details are stored).

To fix this, I propose:

```nginx
location = /searx {
        rewrite ^ /searx/;
}

location /searx/static {
}

location /searx {
        uwsgi_param SCRIPT_NAME /searx;
        include uwsgi_params;
        uwsgi_pass unix:/run/uwsgi/app/searx/socket;
}
```

And add

```
route-run = fixpathinfo:
```

to `/etc/uwsgi/apps-available/searx.ini` because `uwsgi_modifier1 30` is apparently deprecated. Ref: https://uwsgi-docs.readthedocs.io/en/latest/Changelog-2.0.11.html#fixpathinfo-routing-action

I assume this issue exists because some uwsgi upstream docs also use the `try_files` construct (at least I have seen this somewhere in the docs or somewhere else on the Internet but cannot find it right now again).

https://uwsgi-docs.readthedocs.io/en/latest/Nginx.html#hosting-multiple-apps-in-the-same-process-aka-managing-script-name-and-path-info also warns about this:

> If used incorrectly a configuration like this may cause security problems. For your sanity’s sake, double-triple-quadruple check that your application files, configuration files and any other sensitive files are outside of the root of the static files.
 2019-12-31 14:24:27 +01:00
Markus Heiser
f602cb8e4d docs(admin): moved settings description from wiki to docs 
Move wiki entry https://github.com/asciimoo/searx/wiki/settings.yml
into admin section of the docs (#1785).

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-30 21:56:09 +01:00
Markus Heiser
f9be534b2a docs(dev): fix minor markup typos 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-30 21:55:15 +01:00
Markus Heiser
10997a01e0 docs(admin): add weight & disabled cols to engine table 
BTW: remove internal suspend_end_time

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-30 20:29:37 +01:00
Markus Heiser
754a10c1c1
Merge pull request #1661 from 0xhtml/fix-engine-spotify 
Fix engine spotify

As you can read here https://developer.spotify.com/documentation/web-api/#authentication all requests to the spotify api require authentication. You can not test the api without credentials.
 2019-12-30 07:44:31 +01:00
Markus Heiser
36e72a4619
Merge branch 'master' into fix-engine-spotify 2019-12-29 09:47:06 +01:00
Markus Heiser
f6d66c0f6f
Merge pull request #1776 from return42/makefile-doc 
doc: describe Makefile targets & add reST primer
 2019-12-28 13:55:20 +01:00
Markus Heiser
b91e07bbf1 docs(css): render HTML rst-example slightly more discreet 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-28 01:26:24 +01:00
Markus Heiser
d1892b2112 docs(admin): add article 'Buildhosts' with system requirements 
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
 2019-12-28 01:25:16 +01:00