Commit 333042e6 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

TB 42891: Set the bundled search engine for Tor Browser.

parent be9270c3

toolkit/components/search/SearchService.sys.mjs

+2 −2
Original line number Diff line number Diff line
@@ -2788,10 +2788,10 @@ export const SearchService = new (class SearchService { 
  // called in test_remove_engine_notification_box.js

  async _fetchEngineSelectorEngines() {

    let searchEngineSelectorProperties = {

      locale: Services.locale.appLocaleAsBCP47,

      locale: "en-US",

      region: lazy.Region.home || "unknown",

      channel: lazy.SearchUtils.MODIFIED_APP_CHANNEL,

      experiment: this.#lazyPrefs.experimentPrefValue,

      experiment: this._experimentPrefValue,

      distroID: lazy.SearchUtils.distroID ?? "",

      javascriptEnabled: lazy.SecurityLevelPrefs.javascriptEnabled,

    };

toolkit/components/search/content/base-browser-search-engine-icons.json

+16 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
  "ddg-noai": [

    { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 }

  ],

  "ddg-onion": [

    { "url": "chrome://global/content/search/duckduckgo.ico", "imageSize": 32 }

  ],

  "startpage": [

    {

      "url": "chrome://global/content/search/startpage-16.png",
@@ -14,5 +17,18 @@ 
      "url": "chrome://global/content/search/startpage-32.png",

      "imageSize": 32

    }

  ],

  "startpage-onion": [

    {

      "url": "chrome://global/content/search/startpage-16.png",

      "imageSize": 16

    },

    {

      "url": "chrome://global/content/search/startpage-32.png",

      "imageSize": 32

    }

  ],

  "wikipedia": [

    { "url": "chrome://global/content/search/wikipedia.ico", "imageSize": 32 }

  ]

}

toolkit/components/search/content/base-browser-search-engines.json

+62 −1
Original line number Diff line number Diff line
@@ -35,6 +35,24 @@ 
    "recordType": "engine",

    "variants": [{ "environment": { "allRegionsAndLocales": true } }]

  },

  {

    "base": {

      "aliases": ["ddgonion"],

      "classification": "general",

      "name": "DuckDuckGo (.onion)",

      "urls": {

        "search": {

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

          "params": [],

          "searchTermParamName": "q"

        }

      }

    },

    "id": "1e431da4-a60c-4411-9251-a95a841d451f",

    "identifier": "ddg-onion",

    "recordType": "engine",

    "variants": [{ "environment": { "allRegionsAndLocales": true } }]

  },

  {

    "base": {

      "aliases": ["startpage", "sp"],
@@ -53,6 +71,42 @@ 
    "recordType": "engine",

    "variants": [{ "environment": { "allRegionsAndLocales": true } }]

  },

  {

    "base": {

      "aliases": ["startpage-onion"],

      "classification": "general",

      "name": "Startpage (.onion)",

      "urls": {

        "search": {

          "base": "http://startpagel6srwcjlue4zgq3zevrujfaow726kjytqbbjyrswwmjzcqd.onion/sp/search",

          "params": [],

          "searchTermParamName": "q"

        }

      }

    },

    "id": "e7eaba8d-6b9e-43fb-a799-b01b096c03ff",

    "identifier": "startpage-onion",

    "recordType": "engine",

    "variants": [{ "environment": { "allRegionsAndLocales": true } }]

  },

  {

    "base": {

      "aliases": ["wikipedia"],

      "classification": "unknown",

      "name": "Wikipedia (en)",

      "urls": {

        "search": {

          "base": "https://en.wikipedia.org/wiki/Special:Search",

          "params": [],

          "searchTermParamName": "search"

        }

      }

    },

    "id": "7f6d23c2-191e-483e-af3a-ce6451e3a8dd",

    "identifier": "wikipedia",

    "recordType": "engine",

    "variants": [{ "environment": { "allRegionsAndLocales": true } }]

  },

  {

    "recordType": "defaultEngines",

    "globalDefault": "ddg",
@@ -63,7 +117,14 @@ 
    "orders": [

      {

        "environment": { "allRegionsAndLocales": true },

        "order": ["ddg", "ddg-noai", "startpage"]

        "order": [

          "ddg",

          "ddg-noai",

          "ddg-onion",

          "startpage",

          "startpage-onion",

          "wikipedia"

        ]

      }

    ]

  }

toolkit/components/search/content/wikipedia.ico

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

toolkit/components/search/tests/xpcshell/test_base_browser.js

+5 −0
Original line number Diff line number Diff line
@@ -17,7 +17,12 @@ const { SearchService } = ChromeUtils.importESModule( 
const expectedURLs = {

  ddg: "https://duckduckgo.com/?q=test",

  "ddg-noai": "https://noai.duckduckgo.com/?q=test",

  "ddg-onion":

    "https://duckduckgogg42xjoc72x3sjasowoarfbgcmvfimaftt6twagswzczad.onion/?q=test",

  startpage: "https://www.startpage.com/sp/search?q=test",

  "startpage-onion":

    "http://startpagel6srwcjlue4zgq3zevrujfaow726kjytqbbjyrswwmjzcqd.onion/sp/search?q=test",

  wikipedia: "https://en.wikipedia.org/wiki/Special:Search?search=test",

};

const defaultEngine = "ddg";