Skip to content
Snippets Groups Projects
Verified Commit 12f4ac87 authored by Mike Perry's avatar Mike Perry Committed by Pier Angelo Vendrame
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.

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

Bug 40494: Update Startpage search provider

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

Bug 40438: Add Blockchair as a search engine

Bug 33342: Avoid disconnect search addon error after removal.

We removed the addon in #32767, but it was still being loaded
from addonStartup.json.lz4 and throwing an error on startup
because its resource: location is not available anymore.
parent a1762098
No related branches found
No related tags found
1 merge request!849Bug 42276: Rebase alpha onto 115.5.0esr
Showing
with 52 additions and 309 deletions
{
"extensionName": {
"message": "Amazon.com.au"
},
"extensionDescription": {
"message": "Amazon.com.au Search"
},
"searchUrl": {
"message": "https://www.amazon.com.au/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.com.au/exec/obidos/external-search/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended"
},
"suggestUrl": {
"message": "https://completion.amazon.com.au/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=111172"
}
}
{
"extensionName": {
"message": "Amazon.ca"
},
"extensionDescription": {
"message": "Amazon.ca Search"
},
"searchUrl": {
"message": "https://www.amazon.ca/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.ca/exec/obidos/external-search/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillacanada-20&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.ca/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=7"
}
}
{
"extensionName": {
"message": "Amazon.de"
},
"extensionDescription": {
"message": "Amazon.de Suche"
},
"searchUrl": {
"message": "https://www.amazon.de/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.de/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-de-21&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.de/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=4"
}
}
{
"extensionName": {
"message": "Amazon.co.uk"
},
"extensionDescription": {
"message": "Amazon.co.uk Search"
},
"searchUrl": {
"message": "https://www.amazon.co.uk/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.co.uk/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-uk-21&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.co.uk/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=3"
}
}
{
"extensionName": {
"message": "Amazon.fr"
},
"extensionDescription": {
"message": "Recherche Amazon.fr"
},
"searchUrl": {
"message": "https://www.amazon.fr/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.fr/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefox-fr-21&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.fr/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=5"
}
}
{
"extensionName": {
"message": "Amazon.in"
},
"extensionDescription": {
"message": "Amazon.in Search"
},
"searchUrl": {
"message": "https://www.amazon.in/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.in/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.in/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=44571"
}
}
{
"extensionName": {
"message": "Amazon.it"
},
"extensionDescription": {
"message": "Ricerca Amazon.it"
},
"searchUrl": {
"message": "https://www.amazon.it/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.it/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=firefoxit-21&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.it/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=35691"
}
}
{
"extensionName": {
"message": "Amazon.co.jp"
},
"extensionDescription": {
"message": "Amazon.co.jp Search"
},
"searchUrl": {
"message": "https://www.amazon.co.jp/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.co.jp/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&mode=blended&tag=mozillajapan-fx-22&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.co.jp/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=6"
}
}
{
"extensionName": {
"message": "Amazon.nl"
},
"extensionDescription": {
"message": "Amazon.nl Search"
},
"searchUrl": {
"message": "https://www.amazon.nl/gp/search"
},
"searchForm": {
"message": "https://www.amazon.nl/"
},
"searchUrlGetParams": {
"message": "ie={inputEncoding}&tag=mozillanether-21&index=aps&keywords={searchTerms}"
},
"suggestUrl": {
"message": "https://completion.amazon.nl/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=328451"
}
}
{
"extensionName": {
"message": "Amazon.es"
},
"extensionDescription": {
"message": "Amazon.es"
},
"searchUrl": {
"message": "https://www.amazon.es/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.es/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillaspain-21&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.es/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=44551"
}
}
{
"extensionName": {
"message": "Amazon.se"
},
"extensionDescription": {
"message": "Amazon.se"
},
"searchUrl": {
"message": "https://www.amazon.se/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.se/"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozillasweede-21&sourceid=Mozilla-search"
},
"suggestUrl": {
"message": "https://completion.amazon.se/search/complete"
},
"suggestUrlGetParams": {
"message": "q={searchTerms}&search-alias=aps&mkt=704403121"
}
}
{
"searchUrl": {
"message": "https://www.amazon.cn/mn/searchApp"
},
"searchUrlGetParams": {
"message": "ix=sunray&pageletid=headsearch&searchType=&Go.x=0&Go.y=0&bestSaleNum=0&keywords={searchTerms}"
}
}
{
"searchUrl": {
"message": "https://www.amazon.cn/gp/search"
},
"searchUrlGetParams": {
"message": "ie=UTF8&camp=536&creative=3200&index=aps&linkCode=ur2&tag=mozilla&keywords={searchTerms}"
}
}
{
"extensionName": {
"message": "Amazon.com"
},
"extensionDescription": {
"message": "Amazon.com Search"
},
"searchUrl": {
"message": "https://www.amazon.com/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.com/exec/obidos/external-search/"
},
"suggestUrl": {
"message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=mozilla-20&sourceid=Mozilla-search"
}
}
{
"extensionName": {
"message": "Amazon.com"
},
"extensionDescription": {
"message": "Amazon.com Search"
},
"searchUrl": {
"message": "https://www.amazon.com/exec/obidos/external-search/"
},
"searchForm": {
"message": "https://www.amazon.com/exec/obidos/external-search/"
},
"suggestUrl": {
"message": "https://completion.amazon.com/search/complete?q={searchTerms}&search-alias=aps&mkt=1"
},
"searchUrlGetParams": {
"message": "field-keywords={searchTerms}&ie={inputEncoding}&mode=blended&tag=moz-us-20&sourceid=Mozilla-search"
}
}
browser/components/search/extensions/blockchair-onion/favicon.png

3.04 KiB

{
"name": "BlockchairOnion",
"description": "Blockchair Onion",
"manifest_version": 2,
"version": "1.0",
"applications": {
"gecko": {
"id": "blockchair-onion@search.mozilla.org"
}
},
"hidden": true,
"icons": {
"16": "favicon.png"
},
"web_accessible_resources": [
"favicon.png"
],
"chrome_settings_overrides": {
"search_provider": {
"name": "BlockchairOnion",
"search_url": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search",
"search_form": "http://blkchairbknpn73cfjhevhla7rkp4ed5gg2knctvv7it4lioy22defid.onion/search/?q={searchTerms}",
"search_url_get_params": "q={searchTerms}"
}
}
}
browser/components/search/extensions/blockchair/favicon.png

2.83 KiB

{
"name": "Blockchair",
"description": "Blockchair",
"manifest_version": 2,
"version": "1.0",
"applications": {
"gecko": {
"id": "blockchair@search.mozilla.org"
}
},
"hidden": true,
"icons": {
"16": "favicon.png"
},
"web_accessible_resources": [
"favicon.png"
],
"chrome_settings_overrides": {
"search_provider": {
"name": "Blockchair",
"search_url": "https://blockchair.com/search",
"search_form": "https://blockchair.com/search/?q={searchTerms}",
"search_url_get_params": "q={searchTerms}"
}
}
}
browser/components/search/extensions/ddg-onion/favicon.ico

973 B

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment