January 2020 - tor-commits - lists.torproject.org

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit f0d0361bba7ef69f2a4d3f7ab22b513d5a2decea Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 21:21:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- nb-NO/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb-NO/torbutton.properties b/nb-NO/torbutton.properties index fc09dd04f3..1d3746c382 100644 --- a/nb-NO/torbutton.properties +++ b/nb-NO/torbutton.properties @@ -62,9 +62,9 @@ pageInfo_OnionEncryption=Tilkobling kryptert (Løk Tjeneste) # Onion services strings. Strings are kept here for ease of translation. # LOCALIZATION NOTE: %S will be replaced with the .onion address. onionServices.clientAuthMissing=Tor onion service missing client authorization -onionServices.authPrompt.description=%S is requesting your private key. +onionServices.authPrompt.description=%S ber om din private nøkkel. onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service onionServices.authPrompt.done=Ferdig onionServices.authPrompt.doneAccessKey=d onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key +onionServices.authPrompt.failedToSetKey=Kan ikke konfigurere Tor med nøkkelen din

1 0

[translation/tba-torbrowserstringsdtd] https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstringsdtd
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit 204a8db7f70d10c1ec6f9faaf5fdf4b5476542d5 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 21:19:58 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tba-torbrowserstrin… --- nb-NO/torbrowser_strings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nb-NO/torbrowser_strings.dtd b/nb-NO/torbrowser_strings.dtd index 9cf77f8b37..01b7fcc50f 100644 --- a/nb-NO/torbrowser_strings.dtd +++ b/nb-NO/torbrowser_strings.dtd @@ -41,7 +41,7 @@ <!ENTITY pref_tor_bridges_provide_manual_button_title "Provide a Bridge I know"> <!ENTITY pref_tor_bridges_provide_select_text_title "Velg en bro"> <!ENTITY pref_tor_bridges_provide_manual_text_title "Enter Bridge"> -<!ENTITY pref_tor_bridges_provide_manual_summary "Enter the bridge information you received from a trusted source"> +<!ENTITY pref_tor_bridges_provide_manual_summary "Skriv inn broinformasjonen du har mottatt fra en pålitelig kilde"> <!ENTITY pref_tor_bridges_provide_manual_address_port_placeholder "adresse:port"> <!ENTITY pref_tor_hint_type_one_per_line "Skriv en per linje"> @@ -55,4 +55,4 @@ <!ENTITY tor_notify_user_about_error "Det oppstod en feil. Sveip for mer informasjon."> -<!ENTITY sync_not_supported "Sync is not currently supported in Tor Browser on Android"> +<!ENTITY sync_not_supported "Synkronisering støttes ikke i Tor Browser på Android">

1 0

[translation/https_everywhere_completed] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit bd38ef9ecec5b5201289f95ea8a98daf21757331 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 21:16:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_co… --- nb/https-everywhere.dtd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index e8814a8c51..c67597b066 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -29,6 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed ""> <!ENTITY https-everywhere.options.disabledUrlsListed ""> <!ENTITY https-everywhere.options.updateChannelsWarning ""> +<!ENTITY https-everywhere.options.addDisabledSite ""> +<!ENTITY https-everywhere.options.enterDisabledSite ""> <!ENTITY https-everywhere.options.addUpdateChannel ""> <!ENTITY https-everywhere.options.enterUpdateChannelName ""> <!ENTITY https-everywhere.options.delete "">

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit f80f80bc769c175ca02ba6dbd3894972b8dc9ec3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 21:16:02 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- nb/https-everywhere.dtd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nb/https-everywhere.dtd b/nb/https-everywhere.dtd index ca395408c2..badfaa73a3 100644 --- a/nb/https-everywhere.dtd +++ b/nb/https-everywhere.dtd @@ -1,6 +1,6 @@ <!ENTITY https-everywhere.about.title "Om HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> -<!ENTITY https-everywhere.about.ext_description "Krypter nettet. Bruk HTTPS-sikkerhet automatisk på mange nettsider."> +<!ENTITY https-everywhere.about.ext_description "Krypter nettet! Bruk HTTPS-sikkerhet automatisk på mange nettsteder."> <!ENTITY https-everywhere.about.version "Versjon"> <!ENTITY https-everywhere.about.rulesets_version "Regelsett versjon for"> <!ENTITY https-everywhere.about.add_new_rule "Legg til ny regel"> @@ -29,8 +29,8 @@ <!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere Brukerregler"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Nettsteder deaktivert"> <!ENTITY https-everywhere.options.updateChannelsWarning "Advarsel: Å legge til oppdateringskanaler kan føre til at angriperne kaprer nettleseren din. Bare rediger denne delen hvis du vet hva du gjør!"> -<!ENTITY https-everywhere.options.addDisabledSite "Add Disabled Site"> -<!ENTITY https-everywhere.options.enterDisabledSite "Enter disabled site"> +<!ENTITY https-everywhere.options.addDisabledSite "Legg til deaktivert nettsted"> +<!ENTITY https-everywhere.options.enterDisabledSite "Gå inn på deaktivert nettsted"> <!ENTITY https-everywhere.options.addUpdateChannel "Legg til oppdateringskanal"> <!ENTITY https-everywhere.options.enterUpdateChannelName "Skriv inn oppdateringskanalnavn"> <!ENTITY https-everywhere.options.delete "Slett"> @@ -53,11 +53,11 @@ <!ENTITY https-everywhere.chrome.settings_for_this_site_subheader "Endre dine preferanser for krypterte tilkoblinger"> <!ENTITY https-everywhere.chrome.settings_for_this_site_explained "Når du surfer på forskjellige nettsteder, kan du endre dine preferanser for hvert nettsted"> <!ENTITY https-everywhere.chrome.stable_rules "Stabile regler"> -<!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte forbindelser til disse nettstedene:"> +<!ENTITY https-everywhere.chrome.stable_rules_description "Tving krypterte tilkoblinger til disse nettstedene:"> <!ENTITY https-everywhere.chrome.experimental_rules "Eksperimentelle regler"> -<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan føre til advarsler eller brekkasje. Avskrudd som forvalg."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Deaktiver HTTPS Everywhere på denne nettside"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Aktiver HTTPS Everywhere på denne nettside"> +<!ENTITY https-everywhere.chrome.experimental_rules_description "Kan forårsake advarsler eller brudd. Deaktivert som standard."> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Deaktiver HTTPS Everywhere på dette nettstedet"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Aktiver HTTPS Everywhere på dette nettstedet"> <!ENTITY https-everywhere.chrome.add_rule "Legg til en regel for dette nettstedet"> <!ENTITY https-everywhere.chrome.add_new_rule "Legg til en ny regel for dette nettstedet"> <!ENTITY https-everywhere.chrome.always_https_for_host "Bruk alltid https for denne verten">

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit 85edb155a08b0815767b046cae020204f2e6f8c6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 19:20:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+pt-BR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 5399bf5ec9..775f1deb9f 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -9,8 +9,8 @@ # m tk, 2019 # Caio Volpato <caio.volpato(a)riseup.net>, 2019 # Gus, 2019 -# Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Emma Peel, 2020 +# Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2020 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-15 15:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2020\n" +"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 28 Jan '20

28 Jan '20

commit fc75efc8a54f8bd9d20ec61c27211d46f152c586 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jan 28 19:20:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+pt-BR.po | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contents+pt-BR.po b/contents+pt-BR.po index 6ab388e74d..d17f3dc263 100644 --- a/contents+pt-BR.po +++ b/contents+pt-BR.po @@ -9,8 +9,8 @@ # m tk, 2019 # Caio Volpato <caio.volpato(a)riseup.net>, 2019 # Gus, 2019 -# Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2019 # Emma Peel, 2020 +# Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2020 # msgid "" msgstr "" @@ -18,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-15 15:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2020\n" +"Last-Translator: Eduardo Addad de Oliveira <eduardoaddad(a)hotmail.com>, 2020\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/otf/teams/1519/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1533,6 +1533,8 @@ msgid "" "You can do this by increasing Tor Browser's Security Levels in the shield " "menu." msgstr "" +"Você pode fazer isso aumentando os níveis de segurança do navegador Tor no " +"menu de escudo." #: https//tb-manual.torproject.org/security-settings/ #: (content/security-settings/contents+en.lrtopic.body)

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit 77970cdee3ba6c294a7acfe9d9b5a2ae9511e579 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 8 15:30:20 2020 +0000 fixup! Regression tests for TB4: Tor Browser's Firefox preference overrides. --- tbb-tests/browser_tor_TB4.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/tbb-tests/browser_tor_TB4.js b/tbb-tests/browser_tor_TB4.js index c1f748a3338f..032386e22ae1 100644 --- a/tbb-tests/browser_tor_TB4.js +++ b/tbb-tests/browser_tor_TB4.js @@ -64,18 +64,7 @@ let expectedPrefs = [ ["browser.display.max_font_attempts",10], ["browser.display.max_font_count",10], ["gfx.downloadable_fonts.fallback_delay", -1], - ["general.appname.override", "Netscape"], - ["general.appversion.override", "5.0 (Windows)"], - ["general.oscpu.override", "Windows NT 6.1"], - ["general.platform.override", "Win32"], - ["general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Firefox/24.0"], - ["general.productSub.override", "20100101"], - ["general.buildID.override", "20100101"], ["browser.startup.homepage_override.buildID", "20100101"], - ["general.useragent.vendor", ""], - ["general.useragent.vendorSub", ""], - ["dom.enable_performance", false], - ["browser.zoom.siteSpecific", false], // Third party stuff ["network.cookie.cookieBehavior", 1],

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit da7e8b35800a41249b5c2a847c4f931c4bf6582a Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 9 10:13:29 2020 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Remaining clean-up done in #27268. --- browser/app/profile/000-tor-browser.js | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index fb99eb6ed7d1..1e054bf4a0c9 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -114,34 +114,14 @@ pref("webgl.disable-extensions", true); pref("webgl.disable-fail-if-major-performance-caveat", true); pref("webgl.enable-webgl2", false); pref("gfx.downloadable_fonts.fallback_delay", -1); -pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "5.0 (Windows)"); -pref("general.oscpu.override", "Windows NT 6.1"); -pref("general.platform.override", "Win32"); -pref("general.productSub.override", "20100101"); -pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); -pref("general.useragent.vendor", ""); -pref("general.useragent.vendorSub", ""); -pref("dom.enable_performance", false); -pref("browser.zoom.siteSpecific", false); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) -pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 -// Disable video statistics fingerprinting vector (bug 15757) -pref("media.video_stats.enabled", false); // Set video VP9 to 0 for everyone (bug 22548) pref("media.benchmark.vp9.threshold", 0); -// Disable device sensors as possible fingerprinting vector (bug 15758) -pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("privacy.resistFingerprinting", true); pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 -pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" -pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 -pref("privacy.use_utc_timezone", true); -pref("media.webspeech.synth.enabled", false); // Bug 10283: Disable SpeechSynthesis API pref("dom.webaudio.enabled", false); // Bug 13017: Disable Web Audio API -pref("dom.maxHardwareConcurrency", 1); // Bug 21675: Spoof single-core cpu pref("dom.w3c_touch_events.enabled", 0); // Bug 10286: Always disable Touch API pref("dom.w3c_pointer_events.enabled", false); pref("dom.vr.enabled", false); // Bug 21607: Disable WebVR for now @@ -152,6 +132,11 @@ pref("browser.cache.frecency_experiment", -1); pref("dom.use_components_shim", false); // Enable letterboxing pref("privacy.resistFingerprinting.letterboxing", true); +// Disable network information API everywhere. It gets spoofed in bug 1372072 +// but, alas, the behavior is inconsistent across platforms, see: +// https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should +// not leak that difference if possible. +pref("dom.netinfo.enabled", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation @@ -207,8 +192,7 @@ pref("media.eme.enabled", false); pref("media.mediadrm-widevinecdm.visible", false); // WebIDE can bypass proxy settings for remote debugging. It also downloads // some additional addons that we have not reviewed. Turn all that off. -pref("devtools.webide.autoinstallADBHelper", false); -pref("devtools.webide.autoinstallFxdtAdapters", false); +pref("devtools.webide.autoinstallADBExtension", false); pref("devtools.webide.enabled", false); // The in-browser debugger for debugging chrome code is not coping with our // restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as

1 0

[tor-browser/tor-browser-68.4.1esr-9.5-1] Bug 32414: Make Services.search.addEngine obey FPI
by boklm＠torproject.org 28 Jan '20

28 Jan '20

commit 2197dad64e5c3752b1daeab0c676fda07880144c Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Jan 10 17:54:18 2020 +0100 Bug 32414: Make Services.search.addEngine obey FPI --- browser/base/content/browser-pageActions.js | 70 ++++++++++++---------- mobile/android/chrome/content/browser.js | 15 ++++- .../processsingleton/MainProcessSingleton.jsm | 8 ++- toolkit/components/search/SearchEngine.jsm | 6 +- toolkit/components/search/SearchService.jsm | 5 +- toolkit/components/search/SearchUtils.jsm | 4 +- toolkit/components/search/nsISearchService.idl | 7 ++- 7 files changed, 74 insertions(+), 41 deletions(-) diff --git a/browser/base/content/browser-pageActions.js b/browser/base/content/browser-pageActions.js index 33680b2b4c1a..b2aefba866dd 100644 --- a/browser/base/content/browser-pageActions.js +++ b/browser/base/content/browser-pageActions.js @@ -1248,38 +1248,46 @@ BrowserPageActions.addSearchEngine = { }, _installEngine(uri, image) { - Services.search.addEngine(uri, image, false).then( - engine => { - showBrowserPageActionFeedback(this.action); - }, - errorCode => { - if (errorCode != Ci.nsISearchService.ERROR_DUPLICATE_ENGINE) { - // Download error is shown by the search service - return; + Services.search + .addEngine( + uri, + image, + false, + null, + gBrowser.selectedBrowser.contentPrincipal + ) + .then( + engine => { + showBrowserPageActionFeedback(this.action); + }, + errorCode => { + if (errorCode != Ci.nsISearchService.ERROR_DUPLICATE_ENGINE) { + // Download error is shown by the search service + return; + } + const kSearchBundleURI = + "chrome://global/locale/search/search.properties"; + let searchBundle = Services.strings.createBundle(kSearchBundleURI); + let brandBundle = document.getElementById("bundle_brand"); + let brandName = brandBundle.getString("brandShortName"); + let title = searchBundle.GetStringFromName( + "error_invalid_engine_title" + ); + let text = searchBundle.formatStringFromName( + "error_duplicate_engine_msg", + [brandName, uri], + 2 + ); + Services.prompt.QueryInterface(Ci.nsIPromptFactory); + let prompt = Services.prompt.getPrompt( + gBrowser.contentWindow, + Ci.nsIPrompt + ); + prompt.QueryInterface(Ci.nsIWritablePropertyBag2); + prompt.setPropertyAsBool("allowTabModal", true); + prompt.alert(title, text); } - const kSearchBundleURI = - "chrome://global/locale/search/search.properties"; - let searchBundle = Services.strings.createBundle(kSearchBundleURI); - let brandBundle = document.getElementById("bundle_brand"); - let brandName = brandBundle.getString("brandShortName"); - let title = searchBundle.GetStringFromName( - "error_invalid_engine_title" - ); - let text = searchBundle.formatStringFromName( - "error_duplicate_engine_msg", - [brandName, uri], - 2 - ); - Services.prompt.QueryInterface(Ci.nsIPromptFactory); - let prompt = Services.prompt.getPrompt( - gBrowser.contentWindow, - Ci.nsIPrompt - ); - prompt.QueryInterface(Ci.nsIWritablePropertyBag2); - prompt.setPropertyAsBool("allowTabModal", true); - prompt.alert(title, text); - } - ); + ); }, }; diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 5f5ac123835c..cacf26587091 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -7253,7 +7253,10 @@ var SearchEngines = { return; } - this.addOpenSearchEngine(engines[data.button]); + this.addOpenSearchEngine( + engines[data.button], + browser.contentPrincipal + ); engines.splice(data.button, 1); if (engines.length < 1) { @@ -7269,9 +7272,15 @@ var SearchEngines = { }); }, - addOpenSearchEngine: async function addOpenSearchEngine(engine) { + addOpenSearchEngine: async function addOpenSearchEngine(engine, principal) { try { - await Services.search.addEngine(engine.url, engine.iconURL, false); + await Services.search.addEngine( + engine.url, + engine.iconURL, + false, + null, + principal + ); // Display a toast confirming addition of new search engine. Snackbars.show( Strings.browser.formatStringFromName( diff --git a/toolkit/components/processsingleton/MainProcessSingleton.jsm b/toolkit/components/processsingleton/MainProcessSingleton.jsm index 1e8caebd6ebc..69372bef1742 100644 --- a/toolkit/components/processsingleton/MainProcessSingleton.jsm +++ b/toolkit/components/processsingleton/MainProcessSingleton.jsm @@ -69,7 +69,13 @@ MainProcessSingleton.prototype = { } Services.search - .addEngine(engineURL.spec, iconURL ? iconURL.spec : null, true) + .addEngine( + engineURL.spec, + iconURL ? iconURL.spec : null, + true, + null, + browser.contentPrincipal + ) .catch(ex => Cu.reportError( "Unable to add search engine to the search service: " + ex diff --git a/toolkit/components/search/SearchEngine.jsm b/toolkit/components/search/SearchEngine.jsm index d84a3a23516c..c4b5b1ce556e 100644 --- a/toolkit/components/search/SearchEngine.jsm +++ b/toolkit/components/search/SearchEngine.jsm @@ -806,6 +806,8 @@ SearchEngine.prototype = { _iconUpdateURL: null, /* The extension ID if added by an extension. */ _extensionID: null, + /* The principal from which the engine was added. */ + _contentPrincipal: null, // Built in search engine extensions. _isBuiltin: false, @@ -851,7 +853,7 @@ SearchEngine.prototype = { '_initFromURIAndLoad: Downloading engine from: "' + loadURI.spec + '".' ); - var chan = SearchUtils.makeChannel(loadURI); + var chan = SearchUtils.makeChannel(loadURI, this._contentPrincipal); if (this._engineToUpdate && chan instanceof Ci.nsIHttpChannel) { var lastModified = this._engineToUpdate.getAttr("updatelastmodified"); @@ -1231,7 +1233,7 @@ SearchEngine.prototype = { this.name + '"' ); - var chan = SearchUtils.makeChannel(uri); + var chan = SearchUtils.makeChannel(uri, this._contentPrincipal); let iconLoadCallback = function(byteArray, engine) { // This callback may run after we've already set a preferred icon, diff --git a/toolkit/components/search/SearchService.jsm b/toolkit/components/search/SearchService.jsm index e869be458c7d..772edada7bfd 100644 --- a/toolkit/components/search/SearchService.jsm +++ b/toolkit/components/search/SearchService.jsm @@ -2311,7 +2311,7 @@ SearchService.prototype = { return this.addEngineWithDetails(params.name, params, isReload); }, - async addEngine(engineURL, iconURL, confirm, extensionID) { + async addEngine(engineURL, iconURL, confirm, extensionID, contentPrincipal) { SearchUtils.log('addEngine: Adding "' + engineURL + '".'); await this.init(true); let errCode; @@ -2325,6 +2325,9 @@ SearchService.prototype = { if (extensionID) { engine._extensionID = extensionID; } + if (contentPrincipal) { + engine._contentPrincipal = contentPrincipal; + } errCode = await new Promise(resolve => { engine._installCallback = function(errorCode) { resolve(errorCode); diff --git a/toolkit/components/search/SearchUtils.jsm b/toolkit/components/search/SearchUtils.jsm index f9550307e875..8b630afbdd6e 100644 --- a/toolkit/components/search/SearchUtils.jsm +++ b/toolkit/components/search/SearchUtils.jsm @@ -133,13 +133,13 @@ var SearchUtils = { * The URL string from which to create an nsIChannel. * @returns an nsIChannel object, or null if the url is invalid. */ - makeChannel(url) { + makeChannel(url, principal) { try { let uri = typeof url == "string" ? Services.io.newURI(url) : url; return Services.io.newChannelFromURI( uri, null /* loadingNode */, - Services.scriptSecurityManager.getSystemPrincipal(), + principal || Services.scriptSecurityManager.getSystemPrincipal(), null /* triggeringPrincipal */, Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, Ci.nsIContentPolicy.TYPE_OTHER diff --git a/toolkit/components/search/nsISearchService.idl b/toolkit/components/search/nsISearchService.idl index 2e085985a976..4a8f4015fb28 100644 --- a/toolkit/components/search/nsISearchService.idl +++ b/toolkit/components/search/nsISearchService.idl @@ -3,6 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsISupports.idl" +#include "nsIPrincipal.idl" interface nsIURI; interface nsIInputStream; @@ -288,11 +289,15 @@ interface nsISearchService : nsISupports * @param extensionID [optional] * Optional: The correct extensionID if called by an add-on. * + * @param principal [optional] + * Optional: The principal from which the search engine was added. + * * @throws NS_ERROR_FAILURE if the description file cannot be successfully * loaded. */ Promise addEngine(in AString engineURL, in AString iconURL, in boolean confirm, - [optional] in AString extensionID); + [optional] in AString extensionID, + [optional] in nsIPrincipal principal); /** * Adds a new search engine, without asking the user for confirmation and

1 0

[depictor/master] Correct a couple typos/comments
by tom＠torproject.org 28 Jan '20

28 Jan '20

commit 0f0dccd2ed5152fd26df3a38d09a04810fd70ae8 Author: Tom Ritter <tom(a)ritter.vg> Date: Tue Jan 28 14:26:16 2020 +0100 Correct a couple typos/comments --- graphs.py | 2 +- write_website.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graphs.py b/graphs.py index 5d60074..482fd20 100755 --- a/graphs.py +++ b/graphs.py @@ -2,7 +2,7 @@ # See LICENSE for licensing information """ -processoduces an HTML file for easily viewing voting and consensus differences +Produces an HTML file for easily viewing voting and consensus differences Ported from Java version Doctor """ diff --git a/write_website.py b/write_website.py index 4f6224e..6ca9d3c 100755 --- a/write_website.py +++ b/write_website.py @@ -34,7 +34,7 @@ from graphs import GraphWriter #Also make sure to define the list of bwauths in the consensus.cfg file -#stem.descriptor.remote.DIRECTORY_AUTHORITIES = { +#stem.directory.DIRECTORY_AUTHORITIES = { #'Faravahar': DirectoryAuthority( # nickname = 'Faravahar', # address = '154.35.175.225',

1 0