diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2015-04-26 13:12:04 -0400 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2015-04-26 13:12:04 -0400 |
| commit | 18e7d6070275fbc48aef3d84a7f69811541e1fe5 (patch) | |
| tree | 0b8b649f5c504c945d787650ea947ad282ac39e4 /searx | |
| parent | ff68546c69b68c4f83eb843f3ecb5789358d2f32 (diff) | |
| parent | 187617498a0dea17e51950f1ad5e96bb4826367d (diff) | |
Merge pull request #298 from dalf/ssl
[fix] SSL : SNI support
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/engines/btdigg.py | 4 | ||||
| -rw-r--r-- | searx/engines/kickass.py | 4 | ||||
| -rw-r--r-- | searx/engines/photon.py | 3 | ||||
| -rw-r--r-- | searx/tests/engines/test_kickass.py | 1 | ||||
| -rw-r--r-- | searx/webapp.py | 10 |
5 files changed, 10 insertions, 12 deletions
diff --git a/searx/engines/btdigg.py b/searx/engines/btdigg.py index d0f05ec2d..944250628 100644 --- a/searx/engines/btdigg.py +++ b/searx/engines/btdigg.py @@ -29,10 +29,6 @@ def request(query, params): params['url'] = search_url.format(search_term=quote(query), pageno=params['pageno']-1) - # FIX: SSLError: hostname 'btdigg.org' - # doesn't match either of 'ssl2000.cloudflare.com', 'cloudflare.com', '*.cloudflare.com' - params['verify'] = False - return params diff --git a/searx/engines/kickass.py b/searx/engines/kickass.py index ea7f17c23..9c4639c32 100644 --- a/searx/engines/kickass.py +++ b/searx/engines/kickass.py @@ -34,10 +34,6 @@ def request(query, params): params['url'] = search_url.format(search_term=quote(query), pageno=params['pageno']) - # FIX: SSLError: hostname 'kickass.so' - # doesn't match either of '*.kickass.to', 'kickass.to' - params['verify'] = False - return params diff --git a/searx/engines/photon.py b/searx/engines/photon.py index a9c558c4b..869916cd4 100644 --- a/searx/engines/photon.py +++ b/searx/engines/photon.py @@ -41,9 +41,6 @@ def request(query, params): # using searx User-Agent params['headers']['User-Agent'] = searx_useragent() - # FIX: SSLError: SSL3_GET_SERVER_CERTIFICATE:certificate verify failed - params['verify'] = False - return params diff --git a/searx/tests/engines/test_kickass.py b/searx/tests/engines/test_kickass.py index 971d0847e..4cfcaa63c 100644 --- a/searx/tests/engines/test_kickass.py +++ b/searx/tests/engines/test_kickass.py @@ -15,7 +15,6 @@ class TestKickassEngine(SearxTestCase): self.assertIn('url', params) self.assertIn(query, params['url']) self.assertIn('kickass.to', params['url']) - self.assertIn('verify', params) self.assertFalse(params['verify']) def test_response(self): diff --git a/searx/webapp.py b/searx/webapp.py index 41f579551..3ef5a72c8 100644 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -65,6 +65,16 @@ from searx.query import Query from searx.autocomplete import searx_bang, backends as autocomplete_backends from searx.plugins import plugins +# check if the pyopenssl, ndg-httpsclient, pyasn1 packages are installed. +# They are needed for SSL connection without trouble, see #298 +try: + import OpenSSL.SSL # NOQA + import ndg.httpsclient # NOQA + import pyasn1 # NOQA +except ImportError: + logger.critical("The pyopenssl, ndg-httpsclient, pyasn1 packages have to be installed.\n" + "Some HTTPS connections will failed") + static_path, templates_path, themes =\ get_themes(settings['themes_path'] |