Unverified Commit 50473036 authored by Mike Perry's avatar Mike Perry Committed by Matthew Finkel
Browse files

Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing 

eBay and Amazon don't treat Tor users very well. Accounts often get locked and
payments reversed.

Also:
Bug 16322: Update DuckDuckGo search engine

We are replacing the clearnet URL with an onion service one (thanks to a
patch by a cypherpunk) and are removing the duplicated DDG search
engine. Duplicating DDG happend due to bug 1061736 where Mozilla
included DDG itself into Firefox. Interestingly, this caused breaking
the DDG search if JavaScript is disabled as the Mozilla engine, which
gets loaded earlier, does not use the html version of the search page.
Moreover, the Mozilla engine tracked where the users were searching from
by adding a respective parameter to the search query. We got rid of that
feature as well.

Also:
This fixes bug 20809: the DuckDuckGo team has changed its server-side
code in a way that lets users with JavaScript enabled use the default
landing page while those without JavaScript available get redirected
directly to the non-JS page. We adapt the search engine URLs
accordingly.

Also fixes bug 29798 by making sure we only specify the Google search
engine we actually ship an .xml file for.

Also regression tests.
parent c09f335a

browser/app/profile/000-tor-browser.js

+7 −2
Original line number Diff line number Diff line
@@ -299,15 +299,20 @@ pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed- 


// Putting the search engine prefs into this file to fix #11236.

// Default search engine

pref("browser.search.defaultenginename", "Search");

pref("browser.search.defaultenginename", "data:text/plain,browser.search.defaultenginename=DuckDuckGo");

// Make sure we use the same search engine regardless of locale

pref("browser.search.geoSpecificDefaults", false);



// Search engine order (order displayed in the search bar dropdown)

// Somewhat surprisingly we get some random behavior if we specify more than

// two search engines as below. See

// https://bugzilla.mozilla.org/show_bug.cgi?id=1126722 for details.

pref("browser.search.order.extra.1", "Search");

pref("browser.search.order.extra.1", "DuckDuckGo");

pref("browser.search.order.extra.2", "YouTube");



// Use old search config based on list.json

pref("browser.search.modernConfig", false);



// Enforce certificate pinning, see: https://bugs.torproject.org/16206

pref("security.cert_pinning.enforcement_level", 2);

browser/components/search/extensions/ddg-onion/favicon.ico

0 → 100644
+973 B
Loading image diff...

browser/components/search/extensions/ddg-onion/manifest.json

0 → 100644
+26 −0
Original line number Diff line number Diff line 
{

  "name": "DuckDuckGoOnion",

  "description": "Duck Duck Go Onion",

  "manifest_version": 2,

  "version": "1.0",

  "applications": {

    "gecko": {

      "id": "ddg-onion@search.mozilla.org"

    }

  },

  "hidden": true,

  "icons": {

    "16": "favicon.ico"

  },

  "web_accessible_resources": [

    "favicon.ico"

  ],

  "chrome_settings_overrides": {

    "search_provider": {

      "name": "DuckDuckGoOnion",

      "search_url": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion",

      "search_form": "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/?q={searchTerms}",

      "search_url_get_params": "q={searchTerms}"

    }

  }

}

browser/components/search/extensions/ddg/favicon.ico

deleted100644 → 0
−5.3 KiB
Loading image diff...

browser/components/search/extensions/ddg/favicon.png

0 → 100644
+1.12 KiB
Loading image diff...