- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 37e128fe3e2d9ddf2867b5e875e02d7de246a387 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Aug 23 18:17:00 2020 +0000 fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 6c2cf4bce30c..8ed0f04ce76f 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 6c2cf4bce30cf21bb3cb121e940248cd3b8a164a +Subproject commit 8ed0f04ce76f0ed311975082c739823ecbbbaf80

1 0

[tor-launcher/master] Release preparations for 0.2.23
by sysrqb＠torproject.org 24 Aug '20

24 Aug '20

commit 76b474b3fc7eb2a7653f2edc264273030766256a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Aug 23 18:22:37 2020 +0000 Release preparations for 0.2.23 Translations update and version bump --- src/chrome/locale/es-AR/network-settings.dtd | 10 +++++----- src/chrome/locale/zh-HK/torlauncher.properties | 2 +- src/install.rdf | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chrome/locale/es-AR/network-settings.dtd b/src/chrome/locale/es-AR/network-settings.dtd index 1c353d2..208046a 100644 --- a/src/chrome/locale/es-AR/network-settings.dtd +++ b/src/chrome/locale/es-AR/network-settings.dtd @@ -54,8 +54,8 @@ <!ENTITY torsettings.proxyHelpTitle "Ayuda para Proxy"> <!ENTITY torsettings.proxyHelp1 "Un proxy local puede ser necesario cuando te estés conectando a través de una red de una compañía, escuela o universidad. Si no estás seguro si un proxy es necesario, mirá los ajustes de Internet en otro navegador o revisá tus ajustes de red del sistema."> -<!ENTITY torsettings.bridgeHelpTitle "Ayuda para relevo puente"> -<!ENTITY torsettings.bridgeHelp1 "Puentes son relevos no listados que hacen más dificultoso bloquear conexiones a la red de Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor."> +<!ENTITY torsettings.bridgeHelpTitle "Ayuda para Repetidor Puente"> +<!ENTITY torsettings.bridgeHelp1 "Los puentes son repetidores no listados que hacen más dificultoso bloquear conexiones a la red Tor.  Cada uno de los tipos de puente usa un método diferente para evitar censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los meek hacen que tu tráfico parezca que se está conectando a otro servicio en vez de Tor."> <!ENTITY torsettings.bridgeHelp2 "Por la manera en que ciertos países intentan bloquear a Tor, ciertos puentes funcionan en ciertos países pero no otros.  Si no estás seguro acerca de cuáles puentes funcionan en tu país, visitá torproject.org/about/contact.html#support">  @@ -64,15 +64,15 @@  <!ENTITY torPreferences.categoryTitle "Tor"> <!ENTITY torPreferences.torSettings "Configuraciones de Tor"> -<!ENTITY torPreferences.torSettingsDescription "El navegador Tor enruta tu trafico a través de la red Tor, mantenida por miles de voluntarios en todo el mundo." > +<!ENTITY torPreferences.torSettingsDescription "El navegador Tor enruta tu tráfico a través de la red Tor, mantenida por miles de voluntarios en todo el mundo." > <!ENTITY torPreferences.learnMore "Aprendé más"> <!ENTITY torPreferences.bridges "Puentes"> -<!ENTITY torPreferences.bridgesDescription "Los puentes te permiten acceder a la red Tor desde lugares donde Tor esta bloqueado. Dependiendo de donde te encuentres, algunos puentes funcionaran mejor que otros."> +<!ENTITY torPreferences.bridgesDescription "Los puentes te permiten acceder a la red Tor desde lugares donde Tor está bloqueado. Dependiendo de dónde te encuentres, algunos puentes funcionarán mejor que otros."> <!ENTITY torPreferences.useBridge "Usar un puente"> <!ENTITY torPreferences.requestNewBridge "Solicitá un nuevo puente..."> <!ENTITY torPreferences.provideBridge "Proveer un puente"> <!ENTITY torPreferences.advanced "Avanzado"> -<!ENTITY torPreferences.advancedDescription "Configurar como el Navegador Tor se conecta a internet."> +<!ENTITY torPreferences.advancedDescription "Configurar cómo se conecta a internet el Navegador Tor."> <!ENTITY torPreferences.firewallPortsPlaceholder "Valores separados por coma"> <!ENTITY torPreferences.requestBridgeDialogTitle "Solicitá un puente"> <!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contactando BridgeDB. Por favor esperá."> diff --git a/src/chrome/locale/zh-HK/torlauncher.properties b/src/chrome/locale/zh-HK/torlauncher.properties index 12ed3d5..bf53b9f 100644 --- a/src/chrome/locale/zh-HK/torlauncher.properties +++ b/src/chrome/locale/zh-HK/torlauncher.properties @@ -53,7 +53,7 @@ torlauncher.forAssistance2=如需協助，請到訪%S torlauncher.copiedNLogMessages=複製完成。%S Tor洋蔥路由日誌已準備好被貼到文字編輯器或電郵。 -torlauncher.bootstrapStatus.starting=Starting +torlauncher.bootstrapStatus.starting=啟動中 torlauncher.bootstrapStatus.conn_pt=Connecting to bridge torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy diff --git a/src/install.rdf b/src/install.rdf index 8eed6d4..b0a80cc 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.22</em:version> + <em:version>0.2.23</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL>

1 0

[tor-launcher/master] Bug 40002: After rebasing to 80.0b2 moat is broken
by gk＠torproject.org 22 Aug '20

22 Aug '20

commit 9f77f5a02cd02b71fdb06fd934de26569d6876be Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 18 13:59:24 2020 -0400 Bug 40002: After rebasing to 80.0b2 moat is broken Mozilla renamed some of the nsILoadInfo security flags. --- src/modules/tl-bridgedb.jsm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/modules/tl-bridgedb.jsm b/src/modules/tl-bridgedb.jsm index 8cc7919..6f088e1 100644 --- a/src/modules/tl-bridgedb.jsm +++ b/src/modules/tl-bridgedb.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2019, The Tor Project, Inc. +// Copyright (c) 2020, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -546,10 +546,18 @@ _MoatRequestor.prototype = // There does not seem to be a way to directly create an nsILoadInfo from // JavaScript, so we create a throw away non-proxied channel to get one. + // In Firefox 80 the nsILoadInfo security flags were renamed. When + // backwards compatibility with older Firefox code is no longer a + // requirement we can remove the following conditional and always use + // Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL. + const secFlags = + "SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL" in Ci.nsILoadInfo + ? Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_SEC_CONTEXT_IS_NULL + : Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL; let loadInfo = Services.io.newChannelFromURI(uri, undefined, Services.scriptSecurityManager.getSystemPrincipal(), undefined, - Ci.nsILoadInfo.SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL, + secFlags, Ci.nsIContentPolicy.TYPE_OTHER).loadInfo; let httpHandler = Services.io.getProtocolHandler("http") .QueryInterface(Ci.nsIHttpProtocolHandler);

1 0

[torbutton/master] Bug 21601: Remove unused media.webaudio.enabled pref
by gk＠torproject.org 21 Aug '20

21 Aug '20

commit 3b29f04cf3429724ec00506324493635614fb5bb Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 11:21:54 2020 +0000 Bug 21601: Remove unused media.webaudio.enabled pref It is gone since https://bugzilla.mozilla.org/show_bug.cgi?id=968479. --- modules/security-prefs.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index f6e397d4..c0128eea 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -2,7 +2,7 @@ // ### Utilities -let { getBoolPref, setBoolPref, getIntPref, setIntPref } = +let { getBoolPref, setBoolPref, getIntPref, setIntPref, clearUserPref } = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services.prefs; // Used for detecting the current system architecture @@ -28,7 +28,6 @@ const kSecuritySettings = { "javascript.options.ion" : [, false, false, false, true ], "javascript.options.baselinejit" : [, false, false, false, true ], "javascript.options.native_regexp" : [, false, false, false, true ], - "media.webaudio.enabled" : [, false, false, false, true ], "mathml.disabled" : [, true, true, true, false], "gfx.font_rendering.graphite.enabled" : [, false, false, false, true ], "gfx.font_rendering.opentype_svg.enabled" : [, false, false, false, true ], @@ -143,7 +142,6 @@ var initialize = function () { // If the security settings level and the prefs that we did not change // have the default value, reset to default security level. const prefNames = [ - "media.webaudio.enabled", "mathml.disabled", "gfx.font_rendering.opentype_svg.enabled", "svg.disabled" @@ -153,6 +151,7 @@ var initialize = function () { read_setting_from_prefs(prefNames) === 4) { setBoolPref(kCustomPref, false); } + clearUserPref("media.webaudio.enabled"); setIntPref(kSliderMigration, 1); } log(4, "security-prefs.js initialization complete");

1 0

[torbutton/master] Bug 40082: Let JavaScript on safest setting handled by NoScript again
by gk＠torproject.org 21 Aug '20

21 Aug '20

commit 8ed0f04ce76f0ed311975082c739823ecbbbaf80 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 18:10:34 2020 +0000 Bug 40082: Let JavaScript on safest setting handled by NoScript again --- modules/security-prefs.js | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/modules/security-prefs.js b/modules/security-prefs.js index c0128eea..d02e0d94 100644 --- a/modules/security-prefs.js +++ b/modules/security-prefs.js @@ -4,11 +4,6 @@ let { getBoolPref, setBoolPref, getIntPref, setIntPref, clearUserPref } = ChromeUtils.import("resource://gre/modules/Services.jsm", {}).Services.prefs; - -// Used for detecting the current system architecture -let { XPCOMABI } = - Cu.import("resource://gre/modules/Services.jsm", {}).Services.appinfo; - let { bindPref, bindPrefAndInit } = ChromeUtils.import("resource://torbutton/modules/utils.js", {}); let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -34,7 +29,6 @@ const kSecuritySettings = { "svg.disabled" : [, true, false, false, false], "javascript.options.asmjs" : [, false, false, false, true ], "javascript.options.wasm" : [, false, false, false, true ], - "javascript.enabled" : [, false, true, true, true ], }; // The Security Settings prefs in question. @@ -137,22 +131,16 @@ var initialize = function () { write_setting_to_prefs(2); } - // Revert #31616 and #31140 fixes - if (getIntPref(kSliderMigration, 0) < 1) { - // If the security settings level and the prefs that we did not change - // have the default value, reset to default security level. - const prefNames = [ - "mathml.disabled", - "gfx.font_rendering.opentype_svg.enabled", - "svg.disabled" - ]; - if (getBoolPref(kCustomPref) && XPCOMABI.split("-")[0] == "aarch64" && - getIntPref(kSliderPref) === 4 && - read_setting_from_prefs(prefNames) === 4) { - setBoolPref(kCustomPref, false); + // Revert #33613 fix + if (getIntPref(kSliderMigration, 0) < 2) { + // We can't differentiate between users having flipped `javascript.enabled` + // to `false` before it got governed by the security settings vs. those who + // had it flipped due to #33613. Reset the preference for everyone. + if (getIntPref(kSliderPref) === 1) { + setBoolPref("javascript.enabled", true); } clearUserPref("media.webaudio.enabled"); - setIntPref(kSliderMigration, 1); + setIntPref(kSliderMigration, 2); } log(4, "security-prefs.js initialization complete"); };

1 0

[tor-browser-build/master] Bug 40053: Also create the langpacks tarball for non-release builds.
by gk＠torproject.org 21 Aug '20

21 Aug '20

commit 3a845c42c631e0a746bc0cd702c54fdf7e8c08d3 Author: anonym <anonym(a)riseup.net> Date: Mon Aug 17 12:52:38 2020 +0200 Bug 40053: Also create the langpacks tarball for non-release builds. This is useful for Tails' QA when integrating new Tor Browser major releases. --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 24c8265..2763ce4 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -301,7 +301,7 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ [% END -%] # Create a tarball with all Linux x86_64 language packs (Bug 32676) -[% IF c("var/release") && c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] +[% IF c("var/linux-x86_64") && ! c("var/multi_lingual") && ! c("var/testbuild") -%] pushd $rootdir/[% c('input_files_by_name/firefox-langpacks') %] [% c('tar', { tar_src => [ '.' ],

1 0

[tor-browser/tor-browser-80.0b2-10.0-1] Bug 40090: Disable v3 add-on blocklist for now
by gk＠torproject.org 21 Aug '20

21 Aug '20

commit 6fad1d01f4df635defa7254d7390fc401f522744 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 19 10:38:48 2020 +0000 Bug 40090: Disable v3 add-on blocklist for now That's desktop-only as the v3 blocklist is not enabled on mobile yet, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1639050. --- browser/app/profile/firefox.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 6017d524bc8c..80652220eb05 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -42,9 +42,9 @@ pref("extensions.getAddons.link.url", "https://addons.mozilla.org/%LOCALE%/firef pref("extensions.getAddons.langpacks.url", "https://services.addons.mozilla.org/api/v3/addons/language-tools/?app=firef…"); pref("extensions.getAddons.discovery.api_url", "https://services.addons.mozilla.org/api/v4/discovery/?lang=%LOCALE%&edition…"); -// Use bloomfilters for the addons blocklist, instead of JSON only. -pref("extensions.blocklist.useMLBF", true); -pref("extensions.blocklist.useMLBF.stashes", true); +// No bloomfilters for the addons blocklist for now, but JSON only. +pref("extensions.blocklist.useMLBF", false); +pref("extensions.blocklist.useMLBF.stashes", false); // The URL for the privacy policy related to recommended extensions. pref("extensions.recommendations.privacyPolicyUrl", "https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_med…");

1 0

[tor-browser/tor-browser-80.0b2-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit c2228fa0593281dba61a9f4bad0014943a88d634 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 19 19:20:43 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 027e6a152655..45419d001a7b 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -8,12 +8,10 @@ const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); class RequestBridgeDialog { constructor() { this._dialog = null; - this._submitCommand = null; this._submitButton = null; this._dialogDescription = null; this._captchaImage = null; this._captchaEntryTextbox = null; - this._captchaRefreshCommand = null; this._captchaRefreshButton = null; this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; @@ -26,12 +24,8 @@ class RequestBridgeDialog { submitButton: "accept" /* not really a selector but a key for dialog's getButton */, dialogDescription: "description#torPreferences-requestBridge-description", - submitCommand: "command#torPreferences-requestBridge-submitCommand", captchaImage: "image#torPreferences-requestBridge-captchaImage", - captchaEntryTextbox: - "input#torPreferences-requestBridge-captchaTextbox", - refreshCaptchaCommand: - "command#torPreferences-requestBridge-refreshCaptchaCommand", + captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox", refreshCaptchaButton: "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: @@ -45,7 +39,8 @@ class RequestBridgeDialog { const selectors = RequestBridgeDialog.selectors; this._dialog = dialog; - this._dialog.setAttribute( + const dialogWin = dialog.parentElement; + dialogWin.setAttribute( "title", TorStrings.settings.requestBridgeDialogTitle ); @@ -61,16 +56,17 @@ class RequestBridgeDialog { } else if (bridges) { this._bridges = bridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + this._dialog.cancelDialog(); } }); - this._submitCommand = this._dialog.querySelector(selectors.submitCommand); - this._submitButton = this._dialog.getButton(selectors.submitButton); this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha); - this._submitButton.setAttribute("command", this._submitCommand.id); this._submitButton.disabled = true; + this._dialog.addEventListener("dialogaccept", e => { + e.preventDefault(); + this.onSubmitCaptcha(); + }); this._dialogDescription = this._dialog.querySelector( selectors.dialogDescription @@ -93,30 +89,14 @@ class RequestBridgeDialog { TorStrings.settings.captchaTextboxPlaceholder ); this._captchaEntryTextbox.disabled = true; - this._captchaEntryTextbox.onkeypress = evt => { - const ENTER_KEY = 13; - if (evt.keyCode == ENTER_KEY) { - // logically same as pressing the 'submit' button of the parent dialog - this.onSubmitCaptcha(); - return false; - } - return true; - }; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { this._submitButton.disabled = this._captchaEntryTextbox.value == ""; }; - this._captchaRefreshCommand = this._dialog.querySelector( - selectors.refreshCaptchaCommand - ); this._captchaRefreshButton = this._dialog.querySelector( selectors.refreshCaptchaButton ); - this._captchaRefreshButton.setAttribute( - "command", - this._captchaRefreshCommand.id - ); this._captchaRefreshButton.disabled = true; this._incorrectCaptchaHbox = this._dialog.querySelector( @@ -183,7 +163,9 @@ class RequestBridgeDialog { this._bridges = aBridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); }) .catch(aError => { this._bridges = []; diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml index 1081194caf50..64c4507807fb 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml @@ -3,13 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-requestBridge-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="Request Bridge" - buttons="cancel,accept" - role="dialog"> - <command id="torPreferences-requestBridge-submitCommand" oncommand="requestBridgeDialog.onSubmitCaptcha();"/> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-requestBridge-dialog" + buttons="accept,cancel">  @@ -18,8 +16,9 @@ <image id="torPreferences-requestBridge-captchaImage" flex="1"/> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/> - <command id="torPreferences-requestBridge-refreshCaptchaCommand" oncommand="requestBridgeDialog.onRefreshCaptcha();"/> - <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://browser/skin/reload.svg"/> + <button id="torPreferences-requestBridge-refreshCaptchaButton" + image="chrome://browser/skin/reload.svg" + oncommand="requestBridgeDialog.onRefreshCaptcha();"/> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> @@ -32,4 +31,5 @@ let dialog = document.getElementById("torPreferences-requestBridge-dialog"); requestBridgeDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm index 70e49ac048f8..ba4b76738447 100644 --- a/browser/components/torpreferences/content/torLogDialog.jsm +++ b/browser/components/torpreferences/content/torLogDialog.jsm @@ -23,7 +23,8 @@ class TorLogDialog { _populateXUL(aDialog) { this._dialog = aDialog; - this._dialog.setAttribute("title", TorStrings.settings.torLogDialogTitle); + const dialogWin = this._dialog.parentElement; + dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle); this._logTextarea = this._dialog.querySelector( TorLogDialog.selectors.logTextarea diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml index ae0f4b294204..9c17f8132978 100644 --- a/browser/components/torpreferences/content/torLogDialog.xhtml +++ b/browser/components/torpreferences/content/torLogDialog.xhtml @@ -3,11 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-torLog-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - buttons="accept,extra1" - role="dialog"> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-torLog-dialog" + buttons="accept,extra1"> <html:textarea id="torPreferences-torDialog-textarea" multiline="true" @@ -19,4 +19,5 @@ let dialog = document.getElementById("torPreferences-torLog-dialog"); torLogDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 76ee81e0323d2416848b4e03aceebd722f752da3 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Aug 19 19:20:43 2020 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor --- .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-) diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index 027e6a152655..45419d001a7b 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -8,12 +8,10 @@ const { TorStrings } = ChromeUtils.import("resource:///modules/TorStrings.jsm"); class RequestBridgeDialog { constructor() { this._dialog = null; - this._submitCommand = null; this._submitButton = null; this._dialogDescription = null; this._captchaImage = null; this._captchaEntryTextbox = null; - this._captchaRefreshCommand = null; this._captchaRefreshButton = null; this._incorrectCaptchaHbox = null; this._incorrectCaptchaLabel = null; @@ -26,12 +24,8 @@ class RequestBridgeDialog { submitButton: "accept" /* not really a selector but a key for dialog's getButton */, dialogDescription: "description#torPreferences-requestBridge-description", - submitCommand: "command#torPreferences-requestBridge-submitCommand", captchaImage: "image#torPreferences-requestBridge-captchaImage", - captchaEntryTextbox: - "input#torPreferences-requestBridge-captchaTextbox", - refreshCaptchaCommand: - "command#torPreferences-requestBridge-refreshCaptchaCommand", + captchaEntryTextbox: "input#torPreferences-requestBridge-captchaTextbox", refreshCaptchaButton: "button#torPreferences-requestBridge-refreshCaptchaButton", incorrectCaptchaHbox: @@ -45,7 +39,8 @@ class RequestBridgeDialog { const selectors = RequestBridgeDialog.selectors; this._dialog = dialog; - this._dialog.setAttribute( + const dialogWin = dialog.parentElement; + dialogWin.setAttribute( "title", TorStrings.settings.requestBridgeDialogTitle ); @@ -61,16 +56,17 @@ class RequestBridgeDialog { } else if (bridges) { this._bridges = bridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + this._dialog.cancelDialog(); } }); - this._submitCommand = this._dialog.querySelector(selectors.submitCommand); - this._submitButton = this._dialog.getButton(selectors.submitButton); this._submitButton.setAttribute("label", TorStrings.settings.submitCaptcha); - this._submitButton.setAttribute("command", this._submitCommand.id); this._submitButton.disabled = true; + this._dialog.addEventListener("dialogaccept", e => { + e.preventDefault(); + this.onSubmitCaptcha(); + }); this._dialogDescription = this._dialog.querySelector( selectors.dialogDescription @@ -93,30 +89,14 @@ class RequestBridgeDialog { TorStrings.settings.captchaTextboxPlaceholder ); this._captchaEntryTextbox.disabled = true; - this._captchaEntryTextbox.onkeypress = evt => { - const ENTER_KEY = 13; - if (evt.keyCode == ENTER_KEY) { - // logically same as pressing the 'submit' button of the parent dialog - this.onSubmitCaptcha(); - return false; - } - return true; - }; // disable submit if entry textbox is empty this._captchaEntryTextbox.oninput = () => { this._submitButton.disabled = this._captchaEntryTextbox.value == ""; }; - this._captchaRefreshCommand = this._dialog.querySelector( - selectors.refreshCaptchaCommand - ); this._captchaRefreshButton = this._dialog.querySelector( selectors.refreshCaptchaButton ); - this._captchaRefreshButton.setAttribute( - "command", - this._captchaRefreshCommand.id - ); this._captchaRefreshButton.disabled = true; this._incorrectCaptchaHbox = this._dialog.querySelector( @@ -183,7 +163,9 @@ class RequestBridgeDialog { this._bridges = aBridges; this._submitButton.disabled = false; - this._dialog.acceptDialog(); + // This was successful, but use cancelDialog() to close, since + // we intercept the `dialogaccept` event. + this._dialog.cancelDialog(); }) .catch(aError => { this._bridges = []; diff --git a/browser/components/torpreferences/content/requestBridgeDialog.xhtml b/browser/components/torpreferences/content/requestBridgeDialog.xhtml index 1081194caf50..64c4507807fb 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/requestBridgeDialog.xhtml @@ -3,13 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-requestBridge-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - title="Request Bridge" - buttons="cancel,accept" - role="dialog"> - <command id="torPreferences-requestBridge-submitCommand" oncommand="requestBridgeDialog.onSubmitCaptcha();"/> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-requestBridge-dialog" + buttons="accept,cancel">  @@ -18,8 +16,9 @@ <image id="torPreferences-requestBridge-captchaImage" flex="1"/> <hbox id="torPreferences-requestBridge-inputHbox"> <html:input id="torPreferences-requestBridge-captchaTextbox" type="text" style="-moz-box-flex: 1;"/> - <command id="torPreferences-requestBridge-refreshCaptchaCommand" oncommand="requestBridgeDialog.onRefreshCaptcha();"/> - <button id="torPreferences-requestBridge-refreshCaptchaButton" image="chrome://browser/skin/reload.svg"/> + <button id="torPreferences-requestBridge-refreshCaptchaButton" + image="chrome://browser/skin/reload.svg" + oncommand="requestBridgeDialog.onRefreshCaptcha();"/> </hbox> <hbox id="torPreferences-requestBridge-incorrectCaptchaHbox" align="center"> <image id="torPreferences-requestBridge-errorIcon" /> @@ -32,4 +31,5 @@ let dialog = document.getElementById("torPreferences-requestBridge-dialog"); requestBridgeDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file diff --git a/browser/components/torpreferences/content/torLogDialog.jsm b/browser/components/torpreferences/content/torLogDialog.jsm index 70e49ac048f8..ba4b76738447 100644 --- a/browser/components/torpreferences/content/torLogDialog.jsm +++ b/browser/components/torpreferences/content/torLogDialog.jsm @@ -23,7 +23,8 @@ class TorLogDialog { _populateXUL(aDialog) { this._dialog = aDialog; - this._dialog.setAttribute("title", TorStrings.settings.torLogDialogTitle); + const dialogWin = this._dialog.parentElement; + dialogWin.setAttribute("title", TorStrings.settings.torLogDialogTitle); this._logTextarea = this._dialog.querySelector( TorLogDialog.selectors.logTextarea diff --git a/browser/components/torpreferences/content/torLogDialog.xhtml b/browser/components/torpreferences/content/torLogDialog.xhtml index ae0f4b294204..9c17f8132978 100644 --- a/browser/components/torpreferences/content/torLogDialog.xhtml +++ b/browser/components/torpreferences/content/torLogDialog.xhtml @@ -3,11 +3,11 @@ <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?> <?xml-stylesheet href="chrome://browser/content/torpreferences/torPreferences.css"?> -<dialog id="torPreferences-torLog-dialog" type="child" class="prefwindow" - xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" - xmlns:html="http://www.w3.org/1999/xhtml" - buttons="accept,extra1" - role="dialog"> +<window type="child" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + xmlns:html="http://www.w3.org/1999/xhtml"> +<dialog id="torPreferences-torLog-dialog" + buttons="accept,extra1"> <html:textarea id="torPreferences-torDialog-textarea" multiline="true" @@ -19,4 +19,5 @@ let dialog = document.getElementById("torPreferences-torLog-dialog"); torLogDialog.init(window, dialog); ]]></script> -</dialog> \ No newline at end of file +</dialog> +</window> \ No newline at end of file

1 0

[tor-browser/tor-browser-78.2.0esr-10.0-1] Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1
by gk＠torproject.org 20 Aug '20

20 Aug '20

commit 4e14e8b6d6bb1bb3a9a43a9ff5af1a6edcdbcc0b Merge: ee9af3088c44 76ee81e0323d Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 20 13:21:14 2020 +0000 Merge remote-tracking branch 'gitlab/merge-requests/38' into tor-browser-78.2.0esr-10.0-1 .../torpreferences/content/requestBridgeDialog.jsm | 40 ++++++---------------- .../content/requestBridgeDialog.xhtml | 20 +++++------ .../torpreferences/content/torLogDialog.jsm | 3 +- .../torpreferences/content/torLogDialog.xhtml | 13 +++---- 4 files changed, 30 insertions(+), 46 deletions(-)

1 0