on master help sign in
Merge pull request #361 from asciimoo/https
96dfb86Adam Tauber
searx/engines/bing_images.py+1−1
@@ -28,7 +28,7 @@ safesearch = True
28# search-url
28# search-url
29base_url = 'https://www.bing.com/'
29base_url = 'https://www.bing.com/'
30search_string = 'images/search?{query}&count=10&first={offset}'
30search_string = 'images/search?{query}&count=10&first={offset}'
31−thumb_url = "http://ts1.mm.bing.net/th?id={ihk}" # no https, bad certificate
31+thumb_url = "https://www.bing.com/th?id={ihk}"
32
32
33# safesearch definitions
33# safesearch definitions
34safesearch_types = {2: 'STRICT',
34safesearch_types = {2: 'STRICT',
searx/engines/www1x.py+2−2
@@ -20,8 +20,8 @@ import re
20categories = ['images']
20categories = ['images']
21paging = False
21paging = False
22
22
23−# search-url, no HTTPS (there is a valid certificate for https://api2.1x.com/ )
23+# search-url
24−base_url = 'http://1x.com'
24+base_url = 'https://1x.com'
25search_url = base_url+'/backend/search.php?{query}'
25search_url = base_url+'/backend/search.php?{query}'
26
26
27
27
searx/tests/engines/test_bing_images.py+1−1
@@ -59,7 +59,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2
59 self.assertEqual(results[0]['title'], 'Test Query')
59 self.assertEqual(results[0]['title'], 'Test Query')
60 self.assertEqual(results[0]['url'], 'http://www.page.url/')
60 self.assertEqual(results[0]['url'], 'http://www.page.url/')
61 self.assertEqual(results[0]['content'], '')
61 self.assertEqual(results[0]['content'], '')
62− self.assertEqual(results[0]['thumbnail_src'], 'http://ts1.mm.bing.net/th?id=HN.608003696942779811')
62+ self.assertEqual(results[0]['thumbnail_src'], 'https://www.bing.com/th?id=HN.608003696942779811')
63 self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg')
63 self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg')
64
64
65 html = """
65 html = """
searx/tests/engines/test_www1x.py+2−2
@@ -51,7 +51,7 @@ class TestWww1xEngine(SearxTestCase):
51 results = www1x.response(response)
51 results = www1x.response(response)
52 self.assertEqual(type(results), list)
52 self.assertEqual(type(results), list)
53 self.assertEqual(len(results), 1)
53 self.assertEqual(len(results), 1)
54− self.assertEqual(results[0]['url'], 'http://1x.com/photo/123456')
54+ self.assertEqual(results[0]['url'], 'https://1x.com/photo/123456')
55− self.assertEqual(results[0]['thumbnail_src'], 'http://1x.com/images/user/testimage-123456.jpg')
55+ self.assertEqual(results[0]['thumbnail_src'], 'https://1x.com/images/user/testimage-123456.jpg')
56 self.assertEqual(results[0]['content'], '')
56 self.assertEqual(results[0]['content'], '')
57 self.assertEqual(results[0]['template'], 'images.html')
57 self.assertEqual(results[0]['template'], 'images.html')