Pier Angelo Vendrame pushed to branch mullvad-browser-140.1.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 333d60f0 by Pier Angelo Vendrame at 2025-08-11T17:04:39+02:00 fixup! MB 213: Customize the search engines list TB 43111: Remove legacy search addons. Remove legacy files that are not needed anymore. - - - - - 90a47286 by Pier Angelo Vendrame at 2025-08-11T17:06:40+02:00 fixup! MB 419: Mullvad Browser migration procedures. TB 43111: Remove legacy search addons. The upstream migration code does not allow removing the manifests. If we want to remove them, we need to add our migration. - - - - - 14 changed files: - browser/components/BrowserGlue.sys.mjs - − browser/components/search/extensions/brave/favicon.svg - − browser/components/search/extensions/brave/manifest.json - − browser/components/search/extensions/ddg-html/favicon.ico - − browser/components/search/extensions/ddg-html/manifest.json - browser/components/search/extensions/ddg/manifest.json - − browser/components/search/extensions/metager/favicon.ico - − browser/components/search/extensions/metager/manifest.json - − browser/components/search/extensions/mojeek/favicon.ico - − browser/components/search/extensions/mojeek/manifest.json - − browser/components/search/extensions/mullvad-leta/favicon.svg - − browser/components/search/extensions/mullvad-leta/manifest.json - − browser/components/search/extensions/startpage/favicon.png - − browser/components/search/extensions/startpage/manifest.json Changes: ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -1884,10 +1884,12 @@ BrowserGlue.prototype = { // Use this method for any MB migration that can be run just before showing // the UI. // Anything that critically needs to be migrated earlier should not use this. - _migrateUIMB() { + async _migrateUIMB() { // Version 1: Mullvad Browser 14.5a6: Clear home page update url preference // (mullvad-browser#411). - const MB_MIGRATION_VERSION = 1; + // Version 2: Mullvad Browser 15.0a2: Remove legacy search addons + // (tor-browser#43111). + const MB_MIGRATION_VERSION = 2; const MIGRATION_PREF = "mullvadbrowser.migration.version"; // If we decide to force updating users to pass through any version @@ -1908,6 +1910,25 @@ BrowserGlue.prototype = { if (currentVersion < 1) { Services.prefs.clearUserPref("mullvadbrowser.post_update.url"); } + const dropAddons = async list => { + for (const id of list) { + try { + const engine = await lazy.AddonManager.getAddonByID(id); + await engine?.uninstall(); + } catch {} + } + }; + if (currentVersion < 2) { + await dropAddons([ + "brave@search.mozilla.org", + "ddg@search.mozilla.org", + "ddg-html@search.mozilla.org", + "metager@search.mozilla.org", + "mojeek@search.mozilla.org", + "mullvad-leta@search.mozilla.org", + "startpage@search.mozilla.org", + ]); + } Services.prefs.setIntPref(MIGRATION_PREF, MB_MIGRATION_VERSION); }, ===================================== browser/components/search/extensions/brave/favicon.svg deleted ===================================== @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256pt" height="256pt" viewBox="0 0 256 256" version="1.1"> -<defs> -<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="-0.031" y1="44.365" x2="26.596" y2="44.365" gradientTransform="matrix(8.192708,0,0,8.192708,19.181924,-235.46158)"> -<stop offset="0" style="stop-color:rgb(94.509804%,33.72549%,16.862745%);stop-opacity:1;"/> -<stop offset="0.3" style="stop-color:rgb(94.509804%,32.941176%,16.862745%);stop-opacity:1;"/> -<stop offset="0.41" style="stop-color:rgb(94.117647%,30.196078%,16.470588%);stop-opacity:1;"/> -<stop offset="0.49" style="stop-color:rgb(93.72549%,25.882353%,16.078431%);stop-opacity:1;"/> -<stop offset="0.5" style="stop-color:rgb(93.72549%,25.098039%,16.078431%);stop-opacity:1;"/> -<stop offset="0.56" style="stop-color:rgb(90.980392%,24.313725%,15.686275%);stop-opacity:1;"/> -<stop offset="0.67" style="stop-color:rgb(88.235294%,23.529412%,14.901961%);stop-opacity:1;"/> -<stop offset="1" style="stop-color:rgb(87.45098%,23.529412%,14.901961%);stop-opacity:1;"/> -</linearGradient> -</defs> -<g id="surface1"> -<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 237.148438 82.824219 L 229.25 61.386719 L 234.742188 49.078125 C 235.445312 47.488281 235.101562 45.636719 233.878906 44.394531 L 218.953125 29.300781 C 212.414062 22.660156 202.628906 20.390625 193.835938 23.46875 L 189.738281 24.917969 L 166.9375 0.210938 L 128.003906 -0.00390625 L 89.074219 0.300781 L 66.296875 25.207031 L 62.242188 23.773438 C 53.386719 20.65625 43.53125 22.949219 36.960938 29.65625 L 21.671875 45.03125 C 20.695312 46.019531 20.425781 47.5 20.992188 48.769531 L 26.726562 61.546875 L 18.863281 82.972656 L 47.101562 190.355469 C 49.773438 200.496094 55.910156 209.386719 64.453125 215.472656 L 120.304688 253.324219 C 124.820312 256.933594 131.238281 256.933594 135.757812 253.324219 L 191.574219 215.414062 C 200.109375 209.328125 206.320312 200.441406 208.902344 190.296875 L 231.9375 102.210938 Z M 237.148438 82.824219 "/> -<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 134.378906 158.691406 C 132.902344 158.03125 131.382812 157.476562 129.824219 157.039062 L 127.078125 157.039062 C 125.523438 157.476562 124 158.03125 122.523438 158.691406 L 115.617188 161.5625 L 107.816406 165.152344 L 95.113281 171.773438 C 94.171875 172.074219 93.511719 172.925781 93.445312 173.910156 C 93.375 174.898438 93.914062 175.832031 94.804688 176.257812 L 105.832031 184 C 108.179688 185.679688 110.441406 187.476562 112.613281 189.382812 L 115.714844 192.054688 L 122.210938 197.742188 L 125.15625 200.34375 C 127.035156 201.902344 129.757812 201.902344 131.636719 200.34375 L 144.332031 189.253906 L 151.132812 183.867188 L 162.164062 175.972656 C 163.0625 175.546875 163.605469 174.613281 163.527344 173.621094 C 163.453125 172.628906 162.777344 171.789062 161.824219 171.503906 L 149.144531 165.105469 L 141.304688 161.515625 Z M 212.601562 87.613281 L 213 86.464844 C 213.019531 84.929688 212.921875 83.394531 212.710938 81.871094 C 211.644531 79.152344 210.3125 76.566406 208.621094 74.152344 L 201.445312 63.621094 L 196.332031 56.675781 L 186.714844 44.675781 C 185.835938 43.503906 184.882812 42.386719 183.863281 41.339844 L 183.664062 41.339844 L 179.390625 42.128906 L 158.257812 46.199219 C 156.117188 46.300781 153.976562 45.988281 151.960938 45.28125 L 140.351562 41.53125 L 132.042969 39.234375 C 129.605469 38.976562 127.144531 38.976562 124.707031 39.234375 L 116.398438 41.554688 L 104.792969 45.324219 C 102.769531 46.027344 100.632812 46.339844 98.496094 46.242188 L 77.382812 42.242188 L 73.113281 41.457031 L 72.910156 41.457031 C 71.886719 42.503906 70.9375 43.617188 70.058594 44.792969 L 60.460938 56.792969 C 58.671875 59.042969 56.964844 61.359375 55.347656 63.734375 L 48.171875 74.269531 L 44.78125 79.921875 C 44.164062 82.09375 43.839844 84.335938 43.8125 86.601562 L 44.210938 87.746094 C 44.382812 88.484375 44.613281 89.210938 44.875 89.921875 L 50.542969 96.433594 L 75.664062 123.128906 C 77.363281 125.109375 77.851562 127.859375 76.9375 130.304688 L 72.710938 140 C 71.777344 142.582031 71.707031 145.394531 72.515625 148.019531 L 73.339844 150.28125 C 74.6875 153.953125 77 157.191406 80.03125 159.664062 L 83.980469 162.875 C 86.058594 164.378906 88.78125 164.703125 91.15625 163.734375 L 105.1875 157.042969 C 107.765625 155.757812 110.175781 154.160156 112.363281 152.285156 L 123.597656 142.148438 C 124.5 141.332031 125.035156 140.183594 125.074219 138.96875 C 125.117188 137.75 124.667969 136.570312 123.828125 135.6875 L 98.476562 118.609375 C 96.496094 117.199219 95.839844 114.554688 96.933594 112.382812 L 106.765625 93.902344 C 107.890625 91.621094 108.066406 88.980469 107.246094 86.566406 C 106.027344 84.289062 104.054688 82.5 101.667969 81.507812 L 70.84375 69.90625 C 68.621094 69.109375 68.742188 68.109375 71.097656 67.972656 L 89.199219 66.171875 C 92.039062 65.992188 94.890625 66.246094 97.652344 66.925781 L 113.402344 71.324219 C 115.714844 72.019531 117.164062 74.324219 116.777344 76.707031 L 110.589844 110.507812 C 110.175781 112.378906 110.070312 114.308594 110.285156 116.210938 C 110.535156 117.019531 112.652344 118.011719 114.964844 118.578125 L 124.5625 120.578125 C 127.351562 121.09375 130.207031 121.09375 132.996094 120.578125 L 141.625 118.578125 C 143.945312 118.058594 146.035156 116.964844 146.304688 116.15625 C 146.511719 114.25 146.402344 112.324219 145.984375 110.453125 L 139.761719 76.652344 C 139.382812 74.265625 140.824219 71.96875 143.132812 71.269531 L 158.882812 66.855469 C 161.648438 66.175781 164.496094 65.921875 167.335938 66.105469 L 185.441406 67.792969 C 187.808594 68.007812 187.921875 68.886719 185.707031 69.726562 L 154.90625 81.40625 C 152.511719 82.386719 150.539062 84.179688 149.328125 86.46875 C 148.511719 88.878906 148.683594 91.519531 149.808594 93.804688 L 159.65625 112.285156 C 160.75 114.457031 160.09375 117.101562 158.113281 118.507812 L 132.78125 135.628906 C 131.941406 136.507812 131.492188 137.691406 131.535156 138.90625 C 131.582031 140.121094 132.113281 141.269531 133.011719 142.089844 L 144.261719 152.222656 C 146.453125 154.085938 148.859375 155.675781 151.4375 156.960938 L 165.46875 163.640625 C 167.851562 164.601562 170.5625 164.273438 172.644531 162.761719 L 176.59375 159.53125 C 179.628906 157.058594 181.941406 153.808594 183.285156 150.132812 L 184.109375 147.871094 C 184.914062 145.25 184.847656 142.433594 183.910156 139.851562 L 179.785156 130.109375 C 178.875 127.664062 179.363281 124.917969 181.054688 122.933594 L 206.175781 96.199219 L 211.828125 89.6875 C 212.128906 89 212.390625 88.289062 212.601562 87.566406 Z M 212.601562 87.613281 "/> -</g> -</svg> ===================================== browser/components/search/extensions/brave/manifest.json deleted ===================================== @@ -1,29 +0,0 @@ -{ - "name": "Brave Search", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "brave@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.svg", - "32": "favicon.svg", - "96": "favicon.svg", - "128": "favicon.svg" - }, - "web_accessible_resources": ["favicon.svg"], - "chrome_settings_overrides": { - "search_provider": { - "name": "Brave Search", - "keyword": ["@brave", "@bv"], - "search_form": "https://search.brave.com/search", - "search_url": "https://search.brave.com/search", - "search_url_get_params": "q={searchTerms}", - "suggest_url": "https://search.brave.com/api/suggest", - "suggest_url_get_params": "q={searchTerms}" - } - } -} ===================================== browser/components/search/extensions/ddg-html/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/ddg-html/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/ddg-html/manifest.json deleted ===================================== @@ -1,27 +0,0 @@ -{ - "name": "DuckDuckGo HTML", - "description": "Search DuckDuckGo HTML", - "manifest_version": 2, - "version": "1.4", - "browser_specific_settings": { - "gecko": { - "id": "ddg-html@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico" - }, - "web_accessible_resources": ["favicon.ico"], - "chrome_settings_overrides": { - "search_provider": { - "keyword": ["@duckduckgohtml", "@ddgh"], - "name": "DuckDuckGo HTML", - "search_url": "https://html.duckduckgo.com/html/", - "search_form": "https://html.duckduckgo.com/html/", - "search_url_get_params": "q={searchTerms}", - "suggest_url": "https://duckduckgo.com/ac/", - "suggest_url_get_params": "q={searchTerms}&type=list" - } - } -} ===================================== browser/components/search/extensions/ddg/manifest.json ===================================== @@ -14,7 +14,7 @@ "keyword": ["@duckduckgo", "@ddg"], "name": "DuckDuckGo", "search_url": "https://duckduckgo.com/", - "search_url_get_params": "q={searchTerms}", + "search_url_get_params": "t=ffab&q={searchTerms}", "suggest_url": "https://ac.duckduckgo.com/ac/", "suggest_url_get_params": "q={searchTerms}&type=list" } ===================================== browser/components/search/extensions/metager/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/metager/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/metager/manifest.json deleted ===================================== @@ -1,25 +0,0 @@ -{ - "name": "MetaGer (en)", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "metager@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico", - "32": "favicon.ico", - "96": "favicon.ico", - "128": "favicon.ico" - }, - "web_accessible_resources": ["favicon.ico"], - "chrome_settings_overrides": { - "search_provider": { - "name": "MetaGer", - "keyword": ["@metager", "@mg"], - "search_url": "https://metager.org/meta/meta.ger3?eingabe={searchTerms}" - } - } -} ===================================== browser/components/search/extensions/mojeek/favicon.ico deleted ===================================== Binary files a/browser/components/search/extensions/mojeek/favicon.ico and /dev/null differ ===================================== browser/components/search/extensions/mojeek/manifest.json deleted ===================================== @@ -1,24 +0,0 @@ -{ - "name": "Mojeek", - "manifest_version": 2, - "version": "1.0", - "browser_specific_settings": { - "gecko": { - "id": "mojeek@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.ico", - "32": "favicon.ico" - }, - "web_accessible_resources": ["favicon.ico"], - "chrome_settings_overrides": { - "search_provider": { - "keyword": ["@mj", "@mojeek"], - "name": "Mojeek", - "search_url": "https://www.mojeek.com/search", - "search_url_get_params": "q={searchTerms}" - } - } -} ===================================== browser/components/search/extensions/mullvad-leta/favicon.svg deleted ===================================== @@ -1,25 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" id="Mullvad_VPN_Logo_Positive" x="0" y="0" version="1.1" - viewBox="0 0 252.70001 252.6" xml:space="preserve"> - <g id="Logo" transform="translate(-566.2 -73.7)"> - <path id="bg" fill="#192e45" fill-rule="evenodd" - d="M566.2 200c0 69.8 56.6 126.3 126.3 126.3 69.7 0 126.4-56.5 126.4-126.3S762.3 73.7 692.5 73.7c-69.8 0-126.3 56.5-126.3 126.3z" - clip-rule="evenodd" /> - <path id="Mullvad_Fur" fill="#d0933a" fill-rule="evenodd" - d="M583.1 184.9l9.6-13.4c0 .1-.6 19.3-.6 19.3l2.7-14.5c8 16.2 27.6 38.6 45.5 50.6 1.9 1.3 3.5 2.7 4.6 4.1 2.3.9 4.6 1.4 6.9 1.8 1.2.2 2.5.3 3.7.4 1.2.1 2.5.1 3.7.1 1.2 0 2.4-.1 3.6-.2 1.2-.1 2.4-.3 3.6-.5 1.2-.2 2.4-.4 3.5-.8 1.2-.3 2.3-.6 3.5-1 1.1-.3 2.3-.8 3.4-1.2 1.1-.5 2.2-.9 3.3-1.5 1.1-.6 2.2-1.1 3.2-1.7 1.1-.5 2.1-1.2 3.2-1.8 1.1-.6 2.1-1.3 3.2-1.9 1.1-.6 2.1-1.3 3.1-1.9 1-.7 2.1-1.3 3.1-2s2.1-1.3 3.2-2l1-.6.5.3 7.2 4.8-7.3-1.9c-.7.8-1.4 1.6-2.2 2.4-.9.9-1.9 1.8-2.8 2.7-1 .8-2 1.7-3.1 2.4-1.1.8-2.1 1.5-3.3 2.2-2.2 1.4-4.6 2.6-7.1 3.6-1.2.5-2.5 1-3.7 1.4-1.3.4-2.5.8-3.8 1.1-1.3.3-2.6.6-3.9.8-1.3.2-2.6.3-3.9.5-2.6.1-5.3.1-7.9-.3-1.3-.2-2.6-.4-3.9-.7-1.3-.3-2.5-.7-3.7-1.1-2.1-.8-4.2-1.8-6.1-3 0 0-6.9 1-4.1 6.2 2.8 5.2 7 4.7 5 10.8-1.4 3.3-3.4 6.5-5.6 9.5-4.6 6.2-11.8 11.7-11.1 15 32.7 40.3 106.4 34.7 134.4-1.3-.4-5.2-8.6-7.7-14.3-20.4 1.6.5 4 1.2 4 1.1 0-.1-6.8-11.1-7.1-12.2l4.4.3s-5.8-7.2-6-7.9l5.9-.8s-7.4-8.5-7.5-9.2l7.5 1.2-8.2-9.9h3.9l-4.6-6.7c-.8-.3-1.6-.5-2.4-.7l-3-.9c-11.2-3.5-21.8-6.7-32-13.1-14.3-8.9-27.1-19.8-36.7-28.3l-19.3-9.4c-18.5-1.4-35.9-.9-46.5 1.2l6.8-11.6-10.4 12.5c-.7-.2-.9-.6-.9-.6l.7-15.4-3.3 13.9c-1-.5-2.2-.7-3.4-.7-4.6 0-8.3 3.7-8.3 8.3 0 4.2 3.1 7.7 7.2 8.2l-7.1 14.4z" - clip-rule="evenodd" /> - <path id="Mullvad_Nose" fill="#ffcc86" fill-rule="evenodd" - d="M594.8 154.5c-1-.4-2.2-.7-3.3-.7-4.6 0-8.3 3.7-8.3 8.3 0 4 2.9 7.4 6.7 8.2h.2c2.5-.8 7.5-7.5 6.7-11.7-.4-1.5-1-2.9-2-4.1z" - clip-rule="evenodd" /> - <path id="Mullvad_Helmet" fill="#fdd321" fill-rule="evenodd" - d="M667.6 143.8c-1.5-4.1-1.1-9.4 1-14.4 3-6.9 8.7-11.5 14.1-11.5 1.1 0 2.1.2 3.1.6 3.1-2.8 6.7-5.1 10.7-6.7 22.1-8.8 54.4 6.9 62.7 28.6 4 10.5 2.8 22-.6 32.5-2.8 8.6-13 21-9.2 30.4-1.5-.4-33.1-10.2-41.9-15.8-14.1-8.8-26.8-19.6-36.3-28l-.3-.3-32.1-15.2c-.4-.2-.8-.4-1.1-.6 4.6 0 22.1 2.1 29.9.4" - clip-rule="evenodd" /> - <g id="Helmet_Lamp"> - <path id="path113" fill="#fff" - d="M677.1 147.4c-.9 0-1.6-.2-2.3-.5-1.6-.7-2.8-2-3.6-4-1.4-3.4-1-8.1.9-12.5 2.5-5.6 7.3-9.7 11.5-9.7.8 0 1.6.2 2.4.5 2.1.9 3.6 3 4.1 6 .6 3.2.1 6.9-1.5 10.4-2.4 5.7-7.3 9.8-11.5 9.8z" /> - <g id="g117"> - <path id="path115" fill="#1d2a3a" - d="M683.6 122.3c.6 0 1.2.1 1.8.4 1.6.7 2.8 2.5 3.2 4.9.5 2.9.1 6.3-1.4 9.5-2.2 5.1-6.5 8.8-10.1 8.8-.6 0-1.2-.1-1.7-.3-1.5-.6-2.3-2-2.7-3.1-1.2-3-.9-7.4.8-11.4 2.2-5.1 6.5-8.8 10.1-8.8m0-3c-4.8 0-10.1 4.4-12.9 10.7-2.1 4.7-2.4 9.8-.9 13.7.9 2.3 2.4 3.9 4.3 4.8.9.4 1.9.6 3 .6 4.8 0 10.1-4.4 12.8-10.7 1.7-3.8 2.2-7.8 1.6-11.3-.6-3.5-2.4-6-5-7.1-.9-.5-1.9-.7-2.9-.7z" /> - </g> - </g> - </g> -</svg> ===================================== browser/components/search/extensions/mullvad-leta/manifest.json deleted ===================================== @@ -1,26 +0,0 @@ -{ - "name": "Mullvad Leta", - "manifest_version": 2, - "version": "1.0", - "browser_specific_settings": { - "gecko": { - "id": "mullvad-leta@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.svg", - "32": "favicon.svg", - "96": "favicon.svg", - "128": "favicon.svg" - }, - "web_accessible_resources": ["favicon.svg"], - "chrome_settings_overrides": { - "search_provider": { - "keyword": ["@leta", "@mullvad", "@ml"], - "name": "Mullvad Leta", - "search_url": "https://leta.mullvad.net/", - "search_url_get_params": "q={searchTerms}" - } - } -} ===================================== browser/components/search/extensions/startpage/favicon.png deleted ===================================== Binary files a/browser/components/search/extensions/startpage/favicon.png and /dev/null differ ===================================== browser/components/search/extensions/startpage/manifest.json deleted ===================================== @@ -1,25 +0,0 @@ -{ - "name": "Startpage", - "description": "Startpage", - "manifest_version": 2, - "version": "1.0", - "applications": { - "gecko": { - "id": "startpage@search.mozilla.org" - } - }, - "hidden": true, - "icons": { - "16": "favicon.png" - }, - "web_accessible_resources": ["favicon.png"], - "chrome_settings_overrides": { - "search_provider": { - "name": "Startpage", - "keyword": ["@startpage", "@sp"], - "search_url": "https://www.startpage.com/sp/search", - "search_form": "https://www.startpage.com/sp/search/", - "search_url_post_params": "q={searchTerms}" - } - } -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/542... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/542... You're receiving this email because of your account on gitlab.torproject.org.