searx

commit: 201928d2b0d9f7a3a3c3033f7e20838f67a05457
parent 7cc5146c146d4c20c23b1fc379949cb0ef8dd77b
Author: Alexandre Flament <alex@al-f.net>
Date:   Sun, 26 Apr 2015 12:04:29 +0200

[fix] SSL : SNI support

Diffstat:
M
requirements.txt
5
+++++
M
searx/engines/btdigg.py
4
----
M
searx/engines/kickass.py
4
----
M
searx/engines/photon.py
3
---
M
setup.py
5
+++++
M
versions.cfg
5
+++++

6 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,8 @@ lxml
 pyyaml
 pygments
 python-dateutil
+ndg-httpsclient
+pyopenssl
+pyasn1
+pyasn1-modules
+certifi
diff --git 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
@@ -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
@@ -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/setup.py b/setup.py
@@ -47,6 +47,11 @@ setup(
         'pygments',
         'setuptools',
         'python-dateutil',
+        'pyopenssl',
+        'ndg-httpsclient',
+        'pyasn1',
+        'pyasn1-modules',
+        'certifi'
     ],
     extras_require={
         'test': [
diff --git a/versions.cfg b/versions.cfg
@@ -32,6 +32,11 @@ speaklater = 1.3
 unittest2 = 0.5.1
 waitress = 0.8.8
 zc.recipe.testrunner = 2.0.0
+pyopenssl = 0.15.1
+ndg-httpsclient = 0.3.3
+pyasn1 = 0.1.7
+pyasn1-modules = 0.0.5
+certifi = 14.05.14
 
 # Required by:
 # WebTest==2.0.11