瀏覽代碼

[fix] SSL : SNI support

Alexandre Flament 10 年之前
父節點
當前提交
201928d2b0
共有 6 個檔案被更改,包括 15 行新增11 行删除
  1. 5
    0
      requirements.txt
  2. 0
    4
      searx/engines/btdigg.py
  3. 0
    4
      searx/engines/kickass.py
  4. 0
    3
      searx/engines/photon.py
  5. 5
    0
      setup.py
  6. 5
    0
      versions.cfg

+ 5
- 0
requirements.txt 查看文件

@@ -5,3 +5,8 @@ lxml
5 5
 pyyaml
6 6
 pygments
7 7
 python-dateutil
8
+ndg-httpsclient
9
+pyopenssl
10
+pyasn1
11
+pyasn1-modules
12
+certifi

+ 0
- 4
searx/engines/btdigg.py 查看文件

@@ -29,10 +29,6 @@ def request(query, params):
29 29
     params['url'] = search_url.format(search_term=quote(query),
30 30
                                       pageno=params['pageno']-1)
31 31
 
32
-    # FIX: SSLError: hostname 'btdigg.org'
33
-    # doesn't match either of 'ssl2000.cloudflare.com', 'cloudflare.com', '*.cloudflare.com'
34
-    params['verify'] = False
35
-
36 32
     return params
37 33
 
38 34
 

+ 0
- 4
searx/engines/kickass.py 查看文件

@@ -34,10 +34,6 @@ def request(query, params):
34 34
     params['url'] = search_url.format(search_term=quote(query),
35 35
                                       pageno=params['pageno'])
36 36
 
37
-    # FIX: SSLError: hostname 'kickass.so'
38
-    # doesn't match either of '*.kickass.to', 'kickass.to'
39
-    params['verify'] = False
40
-
41 37
     return params
42 38
 
43 39
 

+ 0
- 3
searx/engines/photon.py 查看文件

@@ -41,9 +41,6 @@ def request(query, params):
41 41
     # using searx User-Agent
42 42
     params['headers']['User-Agent'] = searx_useragent()
43 43
 
44
-    # FIX: SSLError: SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
45
-    params['verify'] = False
46
-
47 44
     return params
48 45
 
49 46
 

+ 5
- 0
setup.py 查看文件

@@ -47,6 +47,11 @@ setup(
47 47
         'pygments',
48 48
         'setuptools',
49 49
         'python-dateutil',
50
+        'pyopenssl',
51
+        'ndg-httpsclient',
52
+        'pyasn1',
53
+        'pyasn1-modules',
54
+        'certifi'
50 55
     ],
51 56
     extras_require={
52 57
         'test': [

+ 5
- 0
versions.cfg 查看文件

@@ -32,6 +32,11 @@ speaklater = 1.3
32 32
 unittest2 = 0.5.1
33 33
 waitress = 0.8.8
34 34
 zc.recipe.testrunner = 2.0.0
35
+pyopenssl = 0.15.1
36
+ndg-httpsclient = 0.3.3
37
+pyasn1 = 0.1.7
38
+pyasn1-modules = 0.0.5
39
+certifi = 14.05.14
35 40
 
36 41
 # Required by:
37 42
 # WebTest==2.0.11