- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27271 - Don't allow the user to install extensions from web
by gk＠torproject.org 23 Aug '18

23 Aug '18

commit a0620db9e7cd08e3d67a42d0c5b1067d5b3ed355 Author: Igor Oliveira <igt0(a)torproject.org> Date: Wed Aug 22 15:51:32 2018 -0300 Bug 27271 - Don't allow the user to install extensions from web An attacker can send a tampered torbutton extension to the user and TBA, currently, is not able to verify if the torbutton extension was built by Tor. --- mobile/android/app/000-tor-browser-android.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/app/000-tor-browser-android.js b/mobile/android/app/000-tor-browser-android.js index 399c6f07718b..04a613092e6d 100644 --- a/mobile/android/app/000-tor-browser-android.js +++ b/mobile/android/app/000-tor-browser-android.js @@ -56,3 +56,8 @@ pref("general.useragent.updates.url", ""); // Override this because Orbot uses 9050 as the default pref("network.proxy.socks_port", 9050); + +// Do not allow the user to install extensions from web +pref("xpinstall.enabled", false); +pref("extensions.enabledScopes", 1); +pref("extensions.autoDisableScopes", 1);

1 0

[tor-browser-build/master] Bump HTTPS-Everywhere version
by gk＠torproject.org 23 Aug '18

23 Aug '18

commit a848723ce2511b187a43f315f3a3315ec7e86bff Author: Georg Koppen <gk(a)torproject.org> Date: Thu Aug 23 07:12:41 2018 +0000 Bump HTTPS-Everywhere version This new versions picks up a fix for #26548. --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 739347b..03edcee 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2018.6.21 +version: 2018.8.22 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[torbutton/master] Bug 27276: Adapt to new NoScript messaging protocol
by gk＠torproject.org 23 Aug '18

23 Aug '18

commit aa379dcc5c06ee542a1c63adc769678700e32eaa Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 22 17:06:44 2018 -0700 Bug 27276: Adapt to new NoScript messaging protocol Also, fix a bug in noscript-control.js where initialized was never set to true. --- src/modules/noscript-control.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 6270efe5..196d14c2 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -48,7 +48,8 @@ const default_caps = [ // capabilities. Most things are blocked. let noscriptSettings = safetyLevel => ( { - "type": "NoScript.updateSettings", + "type": "NoScript.updateSettings", // backwards compatibility + "_messageName": "updateSettings", "policy": { "DEFAULT": { "capabilities": default_caps[safetyLevel], @@ -117,6 +118,7 @@ var initialize = () => { if (initialized) { return; } + initialized = true; bindPrefAndInit( "extensions.torbutton.security_slider", sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState)));

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 23 Aug '18

23 Aug '18

commit 703c18896354c159a2fc132f468289282104a235 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 22 14:47:41 2018 -0700 squash! TB4: Tor Browser's Firefox preference overrides. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites --- browser/app/profile/000-tor-browser.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b701dcce812b..bddbe05c92bb 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -153,6 +153,7 @@ pref("device.sensors.enabled", false); pref("dom.enable_resource_timing", false); // Bug 13024: To hell with this API pref("dom.enable_user_timing", false); // Bug 16336: To hell with this API pref("privacy.resistFingerprinting", true); +pref("privacy.resistFingerprinting.block_mozAddonManager", true); // Bug 26114 pref("dom.event.highrestimestamp.enabled", true); // Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks pref("privacy.suppressModifierKeyEvents", true); // Bug #17009: Suppress ALT and SHIFT events" pref("ui.use_standins_for_native_colors", true); // https://bugzilla.mozilla.org/232227 @@ -284,6 +285,8 @@ pref("extensions.getAddons.showPane", false); // Show our legacy extensions directly on about:addons and get rid of the // warning for the default theme. pref("extensions.legacy.exceptions", "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton@torproject.org,tor-launcher@torproject.org"); +// Bug 26114: Allow NoScript to access addons.mozilla.org etc. +pref("extensions.webextensions.restrictedDomains", ""); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[],\"nav-bar\":[\"torbutton-button\",\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"https-everywhere-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"cur rentVersion\":14,\"newElementCount\":1}");

1 0

[torbutton/master] Bug 27097: Text for Tor News signup widget
by gk＠torproject.org 22 Aug '18

22 Aug '18

commit 3e7502789eca79d2e73c82b65770fc0d08527584 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Aug 22 10:19:15 2018 -0700 Bug 27097: Text for Tor News signup widget --- src/chrome/locale/en/aboutTor.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index 375c0da1..c039f4cd 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -12,3 +12,6 @@ aboutTor.donationBanner.tagline2=Networking Freedom Worldwide aboutTor.donationBanner.tagline3=Freedom Online aboutTor.donationBanner.tagline4=Fostering Free Expression Worldwide aboutTor.donationBanner.tagline5=Protecting the Privacy of Millions Every Day + +aboutTor.newsletter.tagline=Get the latest news from Tor straight to your inbox. +aboutTor.newsletter.link_text=Sign up for Tor News.

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27220 - Don't verify signature for Tor Button
by gk＠torproject.org 22 Aug '18

22 Aug '18

commit b9aecf44142c7874de51bd29abdcd40dcf3e6cb2 Author: Igor Oliveira <igt0(a)torproject.org> Date: Mon Aug 20 16:33:16 2018 -0300 Bug 27220 - Don't verify signature for Tor Button Tor Browser for Desktop has a similar logic. --- toolkit/mozapps/extensions/internal/XPIInstall.jsm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolkit/mozapps/extensions/internal/XPIInstall.jsm b/toolkit/mozapps/extensions/internal/XPIInstall.jsm index 659d97616dc6..17fa45514063 100644 --- a/toolkit/mozapps/extensions/internal/XPIInstall.jsm +++ b/toolkit/mozapps/extensions/internal/XPIInstall.jsm @@ -1029,6 +1029,10 @@ function getSignedStatus(aRv, aCert, aAddonID) { } function shouldVerifySignedState(aAddon) { + if (aAddon.id === "torbutton(a)torproject.org") { + return false; + } + // Updated system add-ons should always have their signature checked if (aAddon._installLocation.name == KEY_APP_SYSTEM_ADDONS) return true;

1 0

[torbutton/master] Bug 26884 - Part 1: Move show_torbrowser_manual and
by gk＠torproject.org 22 Aug '18

22 Aug '18

commit 5b5931efdf9d8d8bc018d5c02abb14d4e379e160 Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Jul 31 17:03:02 2018 -0300 Bug 26884 - Part 1: Move show_torbrowser_manual and get_general_useragent_locale to utils On Desktop, show_torbrowser_manual is a torbutton.js method and it is called by other components using the window.opener. However, on mobile, the security settings is opened in a tab instead of a modal. Thus the window.opener is nil. This patch moves the show_torbrowser_manual to util.js allowing it to be accessible from anywhere. --- src/chrome/content/aboutTor/aboutTor-content.js | 4 +-- src/chrome/content/preferences.js | 4 +-- src/chrome/content/tor-circuit-display.js | 4 +-- src/chrome/content/torbutton.js | 33 ++++--------------------- src/modules/utils.js | 10 +++++++- 5 files changed, 20 insertions(+), 35 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index c2e26c8c..ae20505e 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -18,7 +18,7 @@ var {classes: Cc, interfaces: Ci, utils: Cu} = Components; Cu.import("resource://gre/modules/Services.jsm"); -let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); var AboutTorListener = { @@ -89,7 +89,7 @@ var AboutTorListener = { else body.removeAttribute("toron"); - if (aData.showManual) + if (show_torbrowser_manual()) body.setAttribute("showmanual", "yes"); else body.removeAttribute("showmanual"); diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index 36c8818c..81668d6e 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -5,7 +5,7 @@ let { utils: Cu } = Components; let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; -let { getLocale } = +let { getLocale, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); // Description elements have the follow names. @@ -67,7 +67,7 @@ function torbutton_save_security_settings() { // Help Menu and on about:tor: if we have the manual available for a locale, // let's show the "Learn more"-link, otherwise hide it. function torbutton_set_learn_more_links() { - let show_manual = window.opener.torbutton_show_torbrowser_manual(); + let show_manual = show_torbrowser_manual(); let locale = "" if (show_manual) { locale = getLocale(); diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 7b12db08..fe6b51c1 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -33,7 +33,7 @@ Cu.import("resource://gre/modules/Services.jsm"); let { controller } = Cu.import("resource://torbutton/modules/tor-control-port.js", {}); // Utility functions -let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { bindPrefAndInit, observe, getLocale } = Cu.import("resource://torbutton/modules/utils.js", {}); // Make the TorButton logger available. let logger = Cc["@torproject.org/torbutton-logger;1"] @@ -381,7 +381,7 @@ let setupGuardNote = function () { let guardNoteString = uiString("guard_note"); let learnMoreString = uiString("learn_more"); let [noteBefore, name, noteAfter] = guardNoteString.split(/[\[\]]/); - let localeCode = torbutton_get_general_useragent_locale(); + let localeCode = getLocale(); appendHtml(guardNote, ["div", {}, noteBefore, ["span", {class: "circuit-guard-name"}, name], diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 134f10da..b4e6ed18 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -8,8 +8,8 @@ // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); -let { showDialog } = Cu.import("resource://torbutton/modules/utils.js", {}); -let { getLocale, unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); +let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); @@ -435,8 +435,7 @@ var torbutton_abouttor_message_handler = { // not working. get chromeData() { return { - torOn: torbutton_tor_check_ok(), - showManual: torbutton_show_torbrowser_manual() + torOn: torbutton_tor_check_ok() }; } }; @@ -730,21 +729,6 @@ function torbutton_update_toolbutton() torbutton_get_property_string(tooltipKey)); } -// Bug 1506 P3: Support code for language+uagent spoofing -function torbutton_get_general_useragent_locale() { - try { - const locale = getLocale(); - if (/chrome:\/\//.test(locale)) { - return m_tb_prefs.getComplexValue("intl.locale.requested", - Components.interfaces.nsIPrefLocalizedString).data; - } - return locale; - } catch(err) { - torbutton_log(4, "Error while getting locale" + err); - return 'en-US'; - } -} - // Bug 1506 P4: Control port interaction. Needed for New Identity. function torbutton_socket_readline(input) { var str = ""; @@ -2213,20 +2197,13 @@ function torbutton_update_noscript_button() }, 0); } -// Returns true if we should show the tor browser manual. -function torbutton_show_torbrowser_manual() { - let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"]; - let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2); - return availableLocales.indexOf(shortLocale) >= 0; -} - // Makes sure the item in the Help Menu and the link in about:tor // for the Tor Browser User Manual are only visible when -// torbutton_show_torbrowser_manual() returns true. +// show_torbrowser_manual() returns true. function torbutton_init_user_manual_links() { let menuitem = document.getElementById("torBrowserUserManual"); bindPrefAndInit("intl.locale.requested", val => { - menuitem.hidden = !torbutton_show_torbrowser_manual(); + menuitem.hidden = !show_torbrowser_manual(); torbutton_abouttor_message_handler.updateAllOpenPages(); }); } diff --git a/src/modules/utils.js b/src/modules/utils.js index 0a2649dd..5af071ec 100644 --- a/src/modules/utils.js +++ b/src/modules/utils.js @@ -205,6 +205,14 @@ var unescapeTorString = function(str) { return _torControl._strUnescape(str); }; +// Returns true if we should show the tor browser manual. +var show_torbrowser_manual = () => { + let availableLocales = ["de", "en", "es", "fr", "nl", "pt", "tr", "vi", "zh"]; + let shortLocale = getLocale().substring(0, 2); + return availableLocales.indexOf(shortLocale) >= 0; +} + + // Export utility functions for external use. let EXPORTED_SYMBOLS = ["bindPref", "bindPrefAndInit", "getEnv", "getLocale", - "getPrefValue", "observe", "showDialog", "unescapeTorString"]; + "getPrefValue", "observe", "showDialog", "show_torbrowser_manual", "unescapeTorString"];

1 0

[torbutton/master] Release preparations for 2.0.3
by gk＠torproject.org 22 Aug '18

22 Aug '18

commit a9fccda42ca553100051861ce88789d99b4b4d46 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 22 09:19:13 2018 +0000 Release preparations for 2.0.3 --- src/CHANGELOG | 4 ++++ src/install.rdf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 131bb2d4..58fa5ff4 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,7 @@ +2.0.3 + * Bug 26884: Use Torbutton to provide security slider on mobile + * Translations update + 2.0.2 * Bug 26960: Implement new about:tor start page * Bug 26961: Implement new user onboarding diff --git a/src/install.rdf b/src/install.rdf index dad18434..985d3900 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>2.0.2</em:version> + <em:version>2.0.3</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Bug 26884 - Part 2: Create mobile security slider
by gk＠torproject.org 22 Aug '18

22 Aug '18

commit 690a3836779975202fd722579dfa5997953af61d Author: Igor Oliveira <igt0(a)torproject.org> Date: Tue Jul 31 18:28:49 2018 -0300 Bug 26884 - Part 2: Create mobile security slider Create a responsive security slider, it can be used on mobile and tablet. --- src/chrome/content/preferences-mobile.js | 76 +++++++++++++++++++++++++++ src/chrome/content/preferences.xhtml | 85 +++++++++++++++++++++++++++++++ src/chrome/content/torbutton.js | 45 ++++++++++++++++ src/chrome/locale/en/torbutton.properties | 1 + src/chrome/skin/preferences-mobile.css | 47 +++++++++++++++++ 5 files changed, 254 insertions(+) diff --git a/src/chrome/content/preferences-mobile.js b/src/chrome/content/preferences-mobile.js new file mode 100644 index 00000000..e2da9b88 --- /dev/null +++ b/src/chrome/content/preferences-mobile.js @@ -0,0 +1,76 @@ +// # Security Settings User Interface for Mobile + +// Utilities +let { utils: Cu } = Components; +let { getBoolPref, getIntPref, setBoolPref, setIntPref, getCharPref } = + Cu.import("resource://gre/modules/Services.jsm", {}).Services.prefs; + +let { getLocale, show_torbrowser_manual } = + Cu.import("resource://torbutton/modules/utils.js", {}); + +// Description elements have the follow names. +const descNames = + [, "desc_standard", "desc_safer", "desc_safest"]; +// "Learn-more"-elements have the follow names. +const linkNames = + [, "link_standard", "link_safer", "link_safest"]; +// A single `state` object that reflects the user settings in this UI. + +let state = { slider : 0, custom : false}; + +// Utility functions to convert between the legacy 4-value pref index +// and the 3-valued security slider. +let sliderPositionToPrefSetting = pos => [, 4, 2, 1][pos]; +let prefSettingToSliderPosition = pref => [, 3, 2, 2, 1][pref]; + +// Set the desired slider value and update UI. +function torbutton_set_slider(sliderValue) { + state.slider = sliderValue; + let slider = document.getElementById("torbutton_sec_slider"); + slider.value = sliderValue.toString(); + let descs = descNames.map(name => document.getElementById(name)); + descs.forEach((desc, i) => { + if (state.slider !== i) { + desc.style.display = 'none'; + } else { + desc.style.display = 'block'; + } + }); + torbutton_save_security_settings(); +} + +// Read prefs 'extensions.torbutton.security_slider' and +// 'extensions.torbutton.security_custom', and initialize the UI. +function torbutton_init_security_ui() { + torbutton_set_slider(prefSettingToSliderPosition( + getIntPref("extensions.torbutton.security_slider"))); + torbutton_set_learn_more_links(); +} + +// Write the two prefs from the current settings. +function torbutton_save_security_settings() { + setIntPref("extensions.torbutton.security_slider", + sliderPositionToPrefSetting(state.slider)); + setBoolPref("extensions.torbutton.security_custom", state.custom); +} + +// We follow the way we treat the links to the Tor Browser User Manual on the +// Help Menu and on about:tor: if we have the manual available for a locale, +// let's show the "Learn more"-link, otherwise hide it. +function torbutton_set_learn_more_links() { + let show_manual = show_torbrowser_manual(); + let locale = "" + if (show_manual) { + locale = getLocale(); + } + let links = linkNames.map(name => document.getElementById(name)); + links.forEach(link => {; + if (show_manual && locale != "") { + link.href= "https:/tb-manual.torproject.org/" + locale + + "/security-slider.html"; + link.hidden = false; + } else { + link.hidden = true; + } + }); +} diff --git a/src/chrome/content/preferences.xhtml b/src/chrome/content/preferences.xhtml new file mode 100644 index 00000000..6f662f5f --- /dev/null +++ b/src/chrome/content/preferences.xhtml @@ -0,0 +1,85 @@ +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <meta charset="UTF-8"/> + <meta name="viewport" content="width=device-width, initial-scale=1"/> + <head> + <title>&torbutton.prefs.security_settings;</title> + <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/> + <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/> + <script type="text/javascript" src="torbutton_util.js"></script> + <script type="text/javascript" src="preferences-mobile.js"></script> + <style> + </style> + </head> + <body onload="torbutton_init_security_ui()"> + <div class="wrapper outer-wrapper"> + <div class="title"> + &torbutton.prefs.sec_caption; + </div> + <div class="wrapper inner-wrapper"> + <input id="torbutton_sec_slider" type="range" min="1" max="3" list="datalist" onchange="torbutton_set_slider(parseInt(this.value, 10))"/> + <datalist id="datalist"> + <option onclick="torbutton_set_slider(1)"> + &torbutton.prefs.sec_standard_label; + </option> + <option onclick="torbutton_set_slider(2)"> + &torbutton.prefs.sec_safer_label; + </option> + <option onclick="torbutton_set_slider(3)"> + &torbutton.prefs.sec_safest_label; + </option> + </datalist> + <div class="description-wrapper"> + <div id="desc_safest" class="description"> + <p class="slider-text-size slider-text-weight"> + &torbutton.prefs.sec_safest_description; + </p> + <p class="slider-text-size slider-text-weight"> + &torbutton.prefs.sec_safest_list_label; + </p> + <p class="slider-text-size"> + &torbutton.prefs.sec_js_disabled; + </p> + <p class="slider-text-size"> + &torbutton.prefs.sec_limit_graphics_and_typography; + </p> + <p class="slider-text-size"> + &torbutton.prefs.sec_click_to_play_media; + </p> + <a id="link_safest" class="text-link"> + &torbutton.prefs.sec_learn_more_label; + </a> + </div> + <div id="desc_safer" class="description"> + <p class="slider-text-size slider-text-weight"> + &torbutton.prefs.sec_safer_description; + </p> + <p class="slider-text-size slider-text-weight"> + &torbutton.prefs.sec_safer_list_label; + </p> + <p class="slider-text-size"> + &torbutton.prefs.sec_js_on_https_sites_only; + </p> + <p class="slider-text-size"> + &torbutton.prefs.sec_limit_typography; + </p> + <p class="slider-text-size"> + &torbutton.prefs.sec_click_to_play_media; + </p> + <a id="link_safer" class="text-link"> + &torbutton.prefs.sec_learn_more_label; + </a> + </div> + <div id="desc_standard" class="description"> + <p class="slider-text-size slider-text-weight"> + &torbutton.prefs.sec_standard_description; + </p> + <a id="link_standard" class="text-link"> + &torbutton.prefs.sec_learn_more_label; + </a> + </div> + </div> + </div> + </div> + </body> +</html> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index b4e6ed18..47621835 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -342,6 +342,8 @@ function torbutton_init() { window.messageManager.addMessageListener("AboutTor:Loaded", torbutton_abouttor_message_handler); + setupPreferencesForMobile(); + // XXX: Get rid of the cached asmjs (or IndexedDB) files on disk in case we // don't allow things saved to disk. This is an ad-hoc fix to work around // #19417. Once this is properly solved we should remove this code again. @@ -1906,6 +1908,49 @@ function torbutton_is_windowed(wind) { let stopOpenSecuritySettingsObserver; +function showSecurityPreferencesPanel(chromeWindow) { + const tabBrowser = chromeWindow.BrowserApp; + let settingsTab = null; + + const SECURITY_PREFERENCES_URI = 'chrome://torbutton/content/preferences.xhtml'; + + tabBrowser.tabs.some(function (tab) { + // If the security prefs tab is opened, send the user to it + if (tab.browser.currentURI.spec === SECURITY_PREFERENCES_URI) { + settingsTab = tab; + return true; + } + return false; + }); + + if (settingsTab === null) { + // Open up the settings panel in a new tab. + tabBrowser.addTab(SECURITY_PREFERENCES_URI, { + 'selected': true, + 'parentId': tabBrowser.selectedTab.id + }); + } else { + // Activate an existing settings panel tab. + tabBrowser.selectTab(settingsTab); + } +} + +function setupPreferencesForMobile() { + if (Services.appinfo.OS !== "Android") { + return; + } + + torbutton_log(4, "Setting up settings preferences for Android."); + + const chromeWindow = Services.wm.getMostRecentWindow('navigator:browser'); + + // Add the extension's chrome menu item to the main browser menu. + chromeWindow.NativeWindow.menu.add({ + 'name': torbutton_get_property_string("torbutton.security_settings.menu.title"), + 'callback': showSecurityPreferencesPanel.bind(this, chromeWindow) + }); +} + // Bug 1506 P3: This is needed pretty much only for the version check // and the window resizing. See comments for individual functions for // details diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 53573df0..60154dbe 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -22,6 +22,7 @@ torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? +torbutton.security_settings.menu.title = Security Settings torbutton.title.prompt_torbrowser = Important Torbutton Information torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. diff --git a/src/chrome/skin/preferences-mobile.css b/src/chrome/skin/preferences-mobile.css new file mode 100644 index 00000000..b6d54e8d --- /dev/null +++ b/src/chrome/skin/preferences-mobile.css @@ -0,0 +1,47 @@ +.wrapper { + display: flex; +} + +.outer-wrapper { + display: flex; + flex-direction: column; + align-items: center; +} + +.inner-wrapper { + height: 350px; + width: 100%; + max-width: 600px; + flex-direction: column; + align-items: center; +} + +#torbutton_sec_slider { + align-self: stretch; + width: auto; + height: auto; +} + +datalist { + display: flex; + flex-direction: row; + justify-content: space-between; + align-self: stretch; +} + +p { + text-align: justify; +} + +div > p { + margin-top: 0px; +} + +.title { + font-weight: bold; + line-height: 30px; +} + +.wrapper .inner-wrapper * { + margin-top: 10px; +}

1 0

[torbutton/master] Translations update
by gk＠torproject.org 22 Aug '18

22 Aug '18

commit e49c122c0816589e87ff5f5c5102ec4507f9ec6f Author: Georg Koppen <gk(a)torproject.org> Date: Wed Aug 22 07:05:40 2018 +0000 Translations update --- src/chrome/locale/ga/aboutTor.dtd | 14 +++++++------- src/chrome/locale/pt-BR/aboutTor.dtd | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/chrome/locale/ga/aboutTor.dtd b/src/chrome/locale/ga/aboutTor.dtd index fd31fd4a..62fbbf6c 100644 --- a/src/chrome/locale/ga/aboutTor.dtd +++ b/src/chrome/locale/ga/aboutTor.dtd @@ -6,20 +6,20 @@ <!ENTITY aboutTor.title "Maidir le Tor"> -<!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready.label "Brabhsáil. Príobháideachas."> +<!ENTITY aboutTor.ready2.label "Tá tú réidh don bhrabhsálaí is príobháidí ar domhan."> <!ENTITY aboutTor.failure.label "Chuaigh rud éigin ar strae!"> <!ENTITY aboutTor.failure2.label "Níl Tor ag obair sa bhrabhsálaí seo."> -<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> +<!ENTITY aboutTor.search.label "Cuardach DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> <!ENTITY aboutTor.torbrowser_user_manual_questions.label "Ceisteanna?"> -<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Féach ar Lámhleabhar Bhrabhsálaí Tor »">  <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Lámhleabhar Bhrabhsálaí Tor"> -<!ENTITY aboutTor.tor_mission.label "The Tor Project is a US 501(c)(3) non-profit organization advancing human rights and freedoms by creating and deploying free and open source anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding."> -<!ENTITY aboutTor.getInvolved.label "Get Involved »"> +<!ENTITY aboutTor.tor_mission.label "Eagraíocht neamhbhrabúis 501(c)(3) sna Stáit Aontaithe is ea Tionscadal Tor. An phríomhaidhm atá againn ná cearta daonna agus an tsaoirse a chur chun cinn trí theicneolaíochtaí oscailte agus saor in aisce a thacaíonn leis an bpríobháideachas ar líne a fhorbairt, na teicneolaíochtaí seo a scaipeadh gan srian agus a n-úsáid a spreagadh, agus tuiscint níos fearr ar chúrsaí príobháideachais a fhorbairt i measc an phobail."> +<!ENTITY aboutTor.getInvolved.label "Glac Páirt »"> <!ENTITY aboutTor.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 97e5e0f8..80c6f8bc 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -7,7 +7,7 @@ <!ENTITY aboutTor.title "Sobre Tor"> <!ENTITY aboutTor.ready.label "Explore. Privately."> -<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> +<!ENTITY aboutTor.ready2.label "Você está pronto para a maior experiência de navegação privada do mundo."> <!ENTITY aboutTor.failure.label "Alguma coisa deu errado!"> <!ENTITY aboutTor.failure2.label "Tor não está funcionando neste navegador. ">

1 0