From 9e147d91f041e28240e5782ba2223a18f9ddd3b1 Mon Sep 17 00:00:00 2001 From: Dalf Date: Sat, 6 Jun 2015 19:23:07 +0200 Subject: [PATCH 1/2] bing_images & www1x engines use https connections --- searx/engines/bing_images.py | 2 +- searx/engines/www1x.py | 2 +- searx/tests/engines/test_bing_images.py | 2 +- searx/tests/engines/test_www1x.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py index b06a57ed..839b8e5b 100644 --- a/searx/engines/bing_images.py +++ b/searx/engines/bing_images.py @@ -28,7 +28,7 @@ safesearch = True # search-url base_url = 'https://www.bing.com/' search_string = 'images/search?{query}&count=10&first={offset}' -thumb_url = "http://ts1.mm.bing.net/th?id={ihk}" # no https, bad certificate +thumb_url = "https://www.bing.com/th?id={ihk}" # safesearch definitions safesearch_types = {2: 'STRICT', diff --git a/searx/engines/www1x.py b/searx/engines/www1x.py index 12868ad2..2b67a8d5 100644 --- a/searx/engines/www1x.py +++ b/searx/engines/www1x.py @@ -21,7 +21,7 @@ categories = ['images'] paging = False # search-url, no HTTPS (there is a valid certificate for https://api2.1x.com/ ) -base_url = 'http://1x.com' +base_url = 'https://1x.com' search_url = base_url+'/backend/search.php?{query}' diff --git a/searx/tests/engines/test_bing_images.py b/searx/tests/engines/test_bing_images.py index a1d96b06..f869da79 100644 --- a/searx/tests/engines/test_bing_images.py +++ b/searx/tests/engines/test_bing_images.py @@ -59,7 +59,7 @@ oh:"238",tft:"0",oi:"http://www.image.url/Images/Test%2 self.assertEqual(results[0]['title'], 'Test Query') self.assertEqual(results[0]['url'], 'http://www.page.url/') self.assertEqual(results[0]['content'], '') - self.assertEqual(results[0]['thumbnail_src'], 'http://ts1.mm.bing.net/th?id=HN.608003696942779811') + self.assertEqual(results[0]['thumbnail_src'], 'https://www.bing.com/th?id=HN.608003696942779811') self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg') html = """ diff --git a/searx/tests/engines/test_www1x.py b/searx/tests/engines/test_www1x.py index ab4f282c..9df8de6b 100644 --- a/searx/tests/engines/test_www1x.py +++ b/searx/tests/engines/test_www1x.py @@ -51,7 +51,7 @@ class TestWww1xEngine(SearxTestCase): results = www1x.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) - self.assertEqual(results[0]['url'], 'http://1x.com/photo/123456') - self.assertEqual(results[0]['thumbnail_src'], 'http://1x.com/images/user/testimage-123456.jpg') + self.assertEqual(results[0]['url'], 'https://1x.com/photo/123456') + self.assertEqual(results[0]['thumbnail_src'], 'https://1x.com/images/user/testimage-123456.jpg') self.assertEqual(results[0]['content'], '') self.assertEqual(results[0]['template'], 'images.html') From ded3f98218410101c26102fd481c16363484b154 Mon Sep 17 00:00:00 2001 From: Dalf Date: Sat, 6 Jun 2015 19:44:41 +0200 Subject: [PATCH 2/2] www1x engine: remove comment about unavailable https (https is working now) --- searx/engines/www1x.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searx/engines/www1x.py b/searx/engines/www1x.py index 2b67a8d5..ddb79bfe 100644 --- a/searx/engines/www1x.py +++ b/searx/engines/www1x.py @@ -20,7 +20,7 @@ import re categories = ['images'] paging = False -# search-url, no HTTPS (there is a valid certificate for https://api2.1x.com/ ) +# search-url base_url = 'https://1x.com' search_url = base_url+'/backend/search.php?{query}'