[Secure-testing-commits] r58046 - bin

[Paul Wise]

Author: pabs
Date: 2017-11-27 06:38:47 +0000 (Mon, 27 Nov 2017)
New Revision: 58046

Modified:
   bin/tracker_service.py
Log:
Switch web search links to DuckDuckGo

Disconnect Search just redirects to DuckDuckGo now.

Also rename the functions from disconnect to web_search
in case of future changes to the usual web search engine.

Modified: bin/tracker_service.py
===================================================================
--- bin/tracker_service.py	2017-11-27 06:38:40 UTC (rev 58045)
+++ bin/tracker_service.py	2017-11-27 06:38:47 UTC (rev 58046)
@@ -398,7 +398,7 @@
                                       "/",
                                       self.make_github_issues_ref(url, bug.name, 'issues'),
                                       ", ",
-                                      self.make_disconnect_bug_ref(url, bug.name, 'web search'),
+                                      self.make_web_search_bug_ref(url, bug.name, 'web search'),
                                       ", ",
                                       A(url.absolute('http://oss-security.openwall.org/wiki/vendors'), 'more'),
                                       ")")
@@ -1537,8 +1537,8 @@
         return url.absolute("https://github.com/search", type="Code", q='"%s"' % name)
     def url_github_issues_bug(self, url, name):
         return url.absolute("https://github.com/search", type="Issues", q='"%s"' % name)
-    def url_disconnect_bug(self, url, name):
-        return url.absolute("https://search.disconnect.me/searchTerms/search", query='"%s"' % name)
+    def url_web_search_bug(self, url, name):
+        return url.absolute("https://duckduckgo.com/html", q='"%s"' % name)
 
     def url_dsa(self, url, dsa, re_dsa=re.compile(r'^DSA-(\d+)(?:-\d+)?$')):
         match = re_dsa.match(dsa)
@@ -1674,10 +1674,10 @@
             name = cve
         return A(self.url_github_issues_bug(url, cve), name)
 
-    def make_disconnect_bug_ref(self, url, cve, name=None):
+    def make_web_search_bug_ref(self, url, cve, name=None):
         if name is None:
             name = cve
-        return A(self.url_disconnect_bug(url, cve), name)
+        return A(self.url_web_search_bug(url, cve), name)
 
     def make_dsa_ref(self, url, dsa, name=None):
         if name is None: