- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 29 Aug '18

29 Aug '18

commit 7b269d1c44ba383444a1bfed3acb67ab3cac5071 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Aug 22 13:51:29 2018 -0400 squash! Bug 4234: Use the Firefox Update Process for Tor Browser. Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. --- toolkit/xre/nsAppRunner.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index d036bc915c80..1000014aedd0 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -3208,6 +3208,13 @@ CheckCompatibility(nsIFile* aProfileDir, const nsCString& aVersion, if (NS_FAILED(rv) || !aVersion.Equals(buf)) return false; +#ifdef TOR_BROWSER_VERSION + nsAutoCString tbVersion(TOR_BROWSER_VERSION); + rv = parser.GetString("Compatibility", "LastTorBrowserVersion", buf); + if (NS_FAILED(rv) || !tbVersion.Equals(buf)) + return false; +#endif + rv = parser.GetString("Compatibility", "LastOSABI", buf); if (NS_FAILED(rv) || !aOSABI.Equals(buf)) return false; @@ -3304,6 +3311,13 @@ WriteVersion(nsIFile* aProfileDir, const nsCString& aVersion, PR_Write(fd, kHeader, sizeof(kHeader) - 1); PR_Write(fd, aVersion.get(), aVersion.Length()); +#ifdef TOR_BROWSER_VERSION + nsAutoCString tbVersion(TOR_BROWSER_VERSION); + static const char kTorBrowserVersionHeader[] = NS_LINEBREAK "LastTorBrowserVersion="; + PR_Write(fd, kTorBrowserVersionHeader, sizeof(kTorBrowserVersionHeader) - 1); + PR_Write(fd, tbVersion.get(), tbVersion.Length()); +#endif + static const char kOSABIHeader[] = NS_LINEBREAK "LastOSABI="; PR_Write(fd, kOSABIHeader, sizeof(kOSABIHeader) - 1); PR_Write(fd, aOSABI.get(), aOSABI.Length());

1 0

[torbutton/master] Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1
by gk＠torproject.org 29 Aug '18

29 Aug '18

commit 931f0659c42fe317fd8ccae0d9210f8814dcf8ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Jul 16 17:58:33 2018 -0700 Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1 We need to wait for NoScript to have launched before we send the first settings message from the security slider. So wait for NoScript to send us a message first. --- src/modules/noscript-control.js | 75 ++++++++++++++++++++++++----------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 196d14c2..14f78c49 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -9,6 +9,9 @@ const { LegacyExtensionContext } = Cu.import("resource://gre/modules/LegacyExtensionsUtils.jsm", {}); const { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}); +let logger = Components.classes["@torproject.org/torbutton-logger;1"] + .getService(Components.interfaces.nsISupports).wrappedJSObject; +let log = (level, msg) => logger.log(level, msg); // ## NoScript settings @@ -80,34 +83,6 @@ let noscriptSettings = safetyLevel => ( // The extension ID for NoScript (WebExtension) const noscriptID = "{73a6fe31-595d-460b-a920-fcc0f8843232}"; -// A mock extension object that can communicate with another extension -// via the WebExtensions sendMessage/onMessage mechanism. -let extensionContext = new LegacyExtensionContext({ id : noscriptID }); - -// The component that handles WebExtensions' sendMessage. -let messageManager = extensionContext.messenger.messageManagers[0]; - -// __setNoScriptSettings(settings)__. -// NoScript listens for internal settings with onMessage. We can send -// a new settings JSON object according to NoScript's -// protocol and these are accepted! See the use of -// `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js. -let sendNoScriptSettings = settings => - extensionContext.messenger.sendMessage(messageManager, settings, noscriptID); - -// __setNoScriptSafetyLevel(safetyLevel)__. -// Set NoScript settings according to a particular safety level -// (security slider level): 0 = Standard, 1 = Safer, 2 = Safest -let setNoScriptSafetyLevel = safetyLevel => - sendNoScriptSettings(noscriptSettings(safetyLevel)); - -// ## Slider binding - -// __securitySliderToSafetyLevel(sliderState)__. -// Converts the "extensions.torbutton.security_slider" pref value -// to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest -let securitySliderToSafetyLevel = sliderState => [undefined, 2, 1, 1, 0][sliderState]; - // Ensure binding only occurs once. let initialized = false; @@ -119,9 +94,47 @@ var initialize = () => { return; } initialized = true; - bindPrefAndInit( - "extensions.torbutton.security_slider", - sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState))); + + try { + // A mock extension object that can communicate with another extension + // via the WebExtensions sendMessage/onMessage mechanism. + let extensionContext = new LegacyExtensionContext({ id : noscriptID }); + + // The component that handles WebExtensions' sendMessage. + let messageManager = extensionContext.messenger.messageManagers[0]; + + // __setNoScriptSettings(settings)__. + // NoScript listens for internal settings with onMessage. We can send + // a new settings JSON object according to NoScript's + // protocol and these are accepted! See the use of + // `browser.runtime.onMessage.addListener(...)` in NoScript's bg/main.js. + let sendNoScriptSettings = settings => + extensionContext.messenger.sendMessage(messageManager, settings, noscriptID); + + // __setNoScriptSafetyLevel(safetyLevel)__. + // Set NoScript settings according to a particular safety level + // (security slider level): 0 = Standard, 1 = Safer, 2 = Safest + let setNoScriptSafetyLevel = safetyLevel => + sendNoScriptSettings(noscriptSettings(safetyLevel)); + + // __securitySliderToSafetyLevel(sliderState)__. + // Converts the "extensions.torbutton.security_slider" pref value + // to a "safety level" value: 0 = Standard, 1 = Safer, 2 = Safest + let securitySliderToSafetyLevel = sliderState => + [undefined, 2, 1, 1, 0][sliderState]; + + // Wait for the first message from NoScript to arrive, and then + // bind the security_slider pref to the NoScript settings. + let messageListener = (a,b,c) => { + extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); + bindPrefAndInit( + "extensions.torbutton.security_slider", + sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState))); + }; + extensionContext.api.browser.runtime.onMessage.addListener(messageListener); + } catch (e) { + log(5, e.message); + } }; // Export initialize() function for external use.

1 0

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

29 Aug '18

commit 6417fe352cdd2275664870ce0003fe3dfd2561eb Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 28 22:23:19 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. Disable the Web Authentication API for now until we have it evaluated in #26614. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 7a0d26aa53cf..46c56ea0cede 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -152,6 +152,7 @@ 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 // Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575) +pref("security.webauth.webauthn", false); // Bug 26614: Disable Web Authentication API for now pref("browser.cache.frecency_experiment", -1); // Third party stuff

1 0

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

29 Aug '18

commit cc1c7ef7e3c4767e5a505fe791a9026855384bb4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Aug 28 22:32:00 2018 +0000 squash! TB4: Tor Browser's Firefox preference overrides. Enable ReaderView mode again (#27281). --- browser/app/profile/000-tor-browser.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 082b69a11ffe..7a0d26aa53cf 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -146,10 +146,6 @@ 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 -// Make Reader View users uniform if they really want to use that feature. See -// bug 18950 for more details. -pref("browser.reader.detectedFirstArticle", true); -pref("reader.parse-on-load.enabled", false); 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

1 0

[torbutton/master] Bug 26490: Remove the security slider notification
by gk＠torproject.org 28 Aug '18

28 Aug '18

commit 1eb701f4701340c89c9f76ad2eb6ae86ca051e61 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Aug 27 23:05:08 2018 +0000 Bug 26490: Remove the security slider notification We now have the onboarding to show users our security slider. We remove the notification bar on first start as it was a workaround for that onboarding feature which on some system causes problems with window size rounding. --- src/chrome/content/torbutton.js | 29 ----------------------------- src/chrome/locale/en/torbutton.properties | 3 --- src/defaults/preferences/preferences.js | 1 - 3 files changed, 33 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 47621835..3f38830b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -417,7 +417,6 @@ var torbutton_abouttor_message_handler = { receiveMessage: function(aMessage) { switch(aMessage.name) { case "AboutTor:Loaded": - torbutton_show_sec_slider_notification(); aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; @@ -598,34 +597,6 @@ function torbutton_check_for_update() { prompter.checkForUpdates(); } -function torbutton_show_sec_slider_notification() { - // Show the notification about the new security slider. - if (m_tb_prefs. - getBoolPref("extensions.torbutton.show_slider_notification")) { - let sb = torbutton_get_stringbundle(); - let button_label = - torbutton_get_property_string("torbutton.slider_notification_button"); - let box = gBrowser.getNotificationBox(); - - let buttons = [{ - label: button_label, - accessKey: 'S', - popup: null, - callback: torbutton_open_prefs_dialog, - }]; - - let priority = box.PRIORITY_INFO_LOW; - let message = - torbutton_get_property_string("torbutton.slider_notification"); - - box.appendNotification(message, 'new-menu-notification', - "chrome://torbutton/skin/tor-enabled-16.png", - priority, buttons); - m_tb_prefs. - setBoolPref("extensions.torbutton.show_slider_notification", false); - } -} - // Bug 1506 P4: Checking for Tor Browser updates is pretty important, // probably even as a fallback if we ever do get a working updater. function torbutton_do_async_versioncheck() { diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 60154dbe..f11fb5bf 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -31,9 +31,6 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Never ask me again torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.slider_notification = The green onion menu now has a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings - torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. # Canvas permission prompt. Strings are kept here for ease of translation. diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 428e70bc..92d1c106 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -42,7 +42,6 @@ pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false); // Security Slider pref("extensions.torbutton.security_slider", 4); pref("extensions.torbutton.security_custom", false); -pref("extensions.torbutton.show_slider_notification", true); pref("extensions.torbutton.prompt_torbrowser", true); pref("extensions.torbutton.confirm_plugins", true);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26048: potentially confusing "restart to update" message
by gk＠torproject.org 28 Aug '18

28 Aug '18

commit 5e9fd4fcc131a2f7d17440c739db26f8c1fc893c Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 28 11:58:55 2018 -0400 Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. --- browser/components/customizableui/content/panelUI.inc.xul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index 3aab2fd2587d..5891556a6e5f 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -123,7 +123,7 @@ <popupnotification id="appMenu-update-restart-notification" popupid="update-restart" label="&updateRestart.header.message2;" - buttonlabel="&updateRestart.acceptButton.label;" + buttonlabel="&updateRestart.header.message2;" buttonaccesskey="&updateRestart.acceptButton.accesskey;" closebuttonhidden="true" secondarybuttonlabel="&updateRestart.cancelButton.label;" @@ -133,7 +133,7 @@ buttonhighlight="true" hidden="true"> <popupnotificationcontent id="update-restart-notification-content" orient="vertical"> - <description id="update-restart-description">&updateRestart.message2;</description> + <description id="update-restart-description"> </description> </popupnotificationcontent> </popupnotification> </panel>

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] squash! Bug 4234: Use the Firefox Update Process for Tor Browser.
by gk＠torproject.org 28 Aug '18

28 Aug '18

commit 9ec2b75e1639153f064fd751506f86e52979d180 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 28 12:12:42 2018 -0400 squash! Bug 4234: Use the Firefox Update Process for Tor Browser. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). --- browser/branding/official/pref/firefox-branding.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js index c53fe7202788..682da69ffce8 100644 --- a/browser/branding/official/pref/firefox-branding.js +++ b/browser/branding/official/pref/firefox-branding.js @@ -11,8 +11,8 @@ pref("app.update.interval", 43200); // 12 hours // background (in seconds) // 0 means "download everything at once" pref("app.update.download.backgroundInterval", 0); -// Give the user x seconds to react before showing the big UI. default=48 hours -pref("app.update.promptWaitTime", 172800); +// Give the user x seconds to react before showing the big UI. default=1 hour +pref("app.update.promptWaitTime", 3600); // app.update.url.manual: URL user can browse to manually if for some reason // all update installation attempts fail. // app.update.url.details: a default value for the "More information about this

1 0

[torbutton/master] Bug 27214: Improve the onboarding text
by gk＠torproject.org 28 Aug '18

28 Aug '18

commit 4028a0c197e516a72125973355505b499a17cebc Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 28 14:32:07 2018 -0400 Bug 27214: Improve the onboarding text --- src/chrome/locale/en/browserOnboarding.properties | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/chrome/locale/en/browserOnboarding.properties b/src/chrome/locale/en/browserOnboarding.properties index 49085fba..6c2fb0c8 100644 --- a/src/chrome/locale/en/browserOnboarding.properties +++ b/src/chrome/locale/en/browserOnboarding.properties @@ -4,37 +4,37 @@ onboarding.tour-tor-welcome=Welcome onboarding.tour-tor-welcome.title=You’re ready. -onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You are now protected against tracking, surveillance and censorship. Learn how we are doing it by following this quick onboarding. +onboarding.tour-tor-welcome.description=Tor Browser offers the highest standard of privacy and security while browsing the web. You’re now protected against tracking, surveillance, and censorship. This quick onboarding will show you how. onboarding.tour-tor-welcome.button=Start Now onboarding.tour-tor-privacy=Privacy onboarding.tour-tor-privacy.title=Snub trackers and snoopers. -onboarding.tour-tor-privacy.description=Tor Browser will isolate all traffic for each domain you visit. That means trackers and advertisers can’t follow you. And any information storage such as isolated cookies or browser history is deleted after your session. We make all these modifications to ensure your privacy and security protections in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. +onboarding.tour-tor-privacy.description=Tor Browser isolates cookies and deletes your browser history after your session. These modifications ensure your privacy and security are protected in the browser. Click ‘Tor Network’ to learn how we protect you on the network level. onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser will connect you to the Tor Network. Our network protects you more than a VPN because it is not centralized. Tor is a network of servers, we call them relays, run by thousands of volunteers all around the world. This way, there’s no one point of failure and no centralized entity you need to trust in order to enjoy the internet. For each domain you open we create a circuit for you, click on ‘Circuit Display’ to learn how they work. +onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.button=Go to Circuit Display onboarding.tour-tor-circuit-display=Circuit Display onboarding.tour-tor-circuit-display.title=See your path. -onboarding.tour-tor-circuit-display.description=For each domain you visit your traffic is relayed and encrypted in a circuit across three relays around the world. This way no website knows where you are connecting from, because they will only see the connection coming from the last relay. If you would like a new circuit you can just request one by clicking ‘New Circuit for this Site’ on our Circuit Display. Click below to see how it works. -onboarding.tour-tor-circuit-display.button=Explore +onboarding.tour-tor-circuit-display.description=For each domain you visit, your traffic is relayed and encrypted in a circuit across three Tor relays around the world. No website knows where you are connecting from. You can request a new circuit by clicking ‘New Circuit for this Site’ on our Circuit Display. +onboarding.tour-tor-circuit-display.button=See My Path onboarding.tour-tor-security=Security onboarding.tour-tor-security.title=Choose your experience. -onboarding.tour-tor-security.description=Your privacy will always be taken care of by Tor Browser and the Tor network by default. Besides that we also provide you with different settings for when you would like to bump up your browser security while accessing sites. Our Security Settings will allow you to block things that could be used by bad agents to attack your computer. Click below to see the different options and what they do. +onboarding.tour-tor-security.description=We also provide you with additional settings for bumping up your browser security. Our Security Settings allow you to block elements that could be used to attack your computer. Click below to see what the different options do. onboarding.tour-tor-security.button=Review Settings onboarding.tour-tor-expect-differences=Experience Tips -onboarding.tour-tor-expect-differences.title=Experience Tips -onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by the Tor Browser and the Tor Network, your experience while browsing the internet will be a little bit different. You will notice things will run a bit slower since your connection is going through three relays around the world. Sometimes sites will ask you to prove you are a human not a robot and depending on your security options, some things might not work or load. Our goal is to always provide the best experience for our users while not lowering the bar on how to provide real privacy to our users. +onboarding.tour-tor-expect-differences.title=Expect some differences. +onboarding.tour-tor-expect-differences.description=With all the security and privacy features provided by Tor, your experience while browsing the internet may be a little different. Things may be a bit slower, and depending on your security level, some elements may not work or load. You may also be asked to prove you are a human and not a robot. onboarding.tour-tor-expect-differences.button=See FAQs onboarding.tour-tor-onion-services=Onion Services -onboarding.tour-tor-onion-services.title=Onion Services -onboarding.tour-tor-onion-services.description=Finally we would like to introduce you to Onion services. For ultimate privacy and security, sites ending in .onion are configured using the Tor network. Onion services provide extra protections to publishers and visitors, including added safeguards against censorship. The same way our Browser allows you to browse the web anonymously our onion services allow people to provide content and services anonymously. You will notice a little onion icon in the URL bar when accessing these services. Click below to see the NYTimes onion services and how they work. +onboarding.tour-tor-onion-services.title=Be extra protected. +onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. onboarding.tour-tor-onion-services.button=Visit an Onion # Circuit Display onboarding.

1 0

[torbutton/master] Bug 27301: Improve about:tor behavior and appearance.
by gk＠torproject.org 28 Aug '18

28 Aug '18

commit 3bf17f3f9ca7fd40ed13d40f628384d38ba71368 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Aug 28 09:40:39 2018 -0400 Bug 27301: Improve about:tor behavior and appearance. Change TB Manual link to open in a new tab. Use a dynamic margin between search box and TB Manual link (10% of viewport). Add more onion circles to improve appearance on wide displays. --- src/chrome/content/aboutTor/aboutTor.xhtml | 54 +++++++++++++++++++++++++++++- src/chrome/skin/aboutTor.css | 6 ++-- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index c2bbcb25..ecdd0f85 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -61,7 +61,7 @@ window.addEventListener("pageshow", function() { <div id="bottom"> <p class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label; - <a id="manualLink">&aboutTor.torbrowser_user_manual_link.label;</a></p> + <a id="manualLink" target="_blank">&aboutTor.torbrowser_user_manual_link.label;</a></p> <p>&aboutTor.tor_mission.label; <a href="&aboutTor.getInvolved.link;">&aboutTor.getInvolved.label;</a></p> </div> @@ -138,6 +138,26 @@ window.addEventListener("pageshow", function() { <div class="inner dashed"></div> <div class="inner dashed"></div> </div> + + <div class="circle dotted"></div> + + <div class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + </div> + + <div class="circle dashed"></div> + + <div class="circle dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + + <div class="circle bold"></div> + + <div class="circle solid"></div> </div> <div class="onion-pattern-row onion-pattern-offset-row"> @@ -198,6 +218,38 @@ window.addEventListener("pageshow", function() { </div> <div class="circle dashed"></div> + + <div class="circle solid"></div> + + <div class="circle dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + + <div class="circle border"> + <div class="inner border"></div> + <div class="inner border"></div> + <div class="inner border"></div> + </div> + + <div class="circle"> + <div class="half solid"></div> + <div class="half solid"></div> + </div> + + <div class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + </div> + + <div class="circle"> + <div class="half solid"></div> + <div class="half dotted"></div> + </div> + + <div class="circle dotted"></div> </div> </div> </body> diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 02a81744..c402bbed 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -119,7 +119,7 @@ body:not([showmanual]) .showForManual { } #bottom { - margin-top: 170px; + margin-top: 10vh; } #bottom p { @@ -196,12 +196,12 @@ body:not([showmanual]) .showForManual { .onion-pattern-container { margin: 0px auto; width: 100%; - max-width: 1624px; /* room for 14 of the widest circles */ + max-width: 2200px; /* room for our 20 circles */ overflow: hidden; } .onion-pattern-row { - width: 1624px; + width: 2200px; display: flex; flex-direction: row; position: relative;

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 21787: Spoof en-US for date picker
by gk＠torproject.org 28 Aug '18

28 Aug '18

commit 7150252e7a0213aeddfe3c0aed294aae4cfcb3b8 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 20 15:42:08 2018 -0700 Bug 21787: Spoof en-US for date picker When privacy.spoof_english === 2, then en-US spoofing is enabled. In that case, make sure the date picker does not leak the locale. --- dom/base/IntlUtils.cpp | 5 ++++ dom/base/IntlUtils.h | 2 ++ dom/webidl/IntlUtils.webidl | 6 +++++ toolkit/content/widgets/datetimebox.xml | 43 +++++++++++++++++-------------- toolkit/content/widgets/datetimepopup.xml | 3 ++- 5 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dom/base/IntlUtils.cpp b/dom/base/IntlUtils.cpp index 9fc21414fd58..89f2ebbdc026 100644 --- a/dom/base/IntlUtils.cpp +++ b/dom/base/IntlUtils.cpp @@ -141,5 +141,10 @@ IntlUtils::GetLocaleInfo(const Sequence<nsString>& aLocales, } } +bool +IntlUtils::SpoofEnglish() const { + return Preferences::GetInt("privacy.spoof_english", 0) == 2; +} + } // dom namespace } // mozilla namespace diff --git a/dom/base/IntlUtils.h b/dom/base/IntlUtils.h index 76875497f293..55d8e823abfd 100644 --- a/dom/base/IntlUtils.h +++ b/dom/base/IntlUtils.h @@ -47,6 +47,8 @@ public: mozilla::dom::LocaleInfo& aResult, mozilla::ErrorResult& aError); + bool SpoofEnglish() const; + private: ~IntlUtils(); diff --git a/dom/webidl/IntlUtils.webidl b/dom/webidl/IntlUtils.webidl index c70e0f955c82..1fea1735997c 100644 --- a/dom/webidl/IntlUtils.webidl +++ b/dom/webidl/IntlUtils.webidl @@ -70,4 +70,10 @@ interface IntlUtils { */ [Throws] LocaleInfo getLocaleInfo(sequence<DOMString> locales); + + /** + * Attribute that indicates whether the user has chosen + * to spoof the locale as en-US in content. + */ + readonly attribute boolean spoofEnglish; }; diff --git a/toolkit/content/widgets/datetimebox.xml b/toolkit/content/widgets/datetimebox.xml index 2a7cdd50f64d..f4bb32ca35e7 100644 --- a/toolkit/content/widgets/datetimebox.xml +++ b/toolkit/content/widgets/datetimebox.xml @@ -27,13 +27,13 @@ <constructor> <![CDATA[ /* eslint-disable no-multi-spaces */ - this.mYearPlaceHolder = ]]>"&date.year.placeholder;"<![CDATA[; - this.mMonthPlaceHolder = ]]>"&date.month.placeholder;"<![CDATA[; - this.mDayPlaceHolder = ]]>"&date.day.placeholder;"<![CDATA[; + this.mYearPlaceHolder = this.mSpoofEnglish ? "yyyy" : ]]>"&date.year.placeholder;"<![CDATA[; + this.mMonthPlaceHolder = this.mSpoofEnglish ? "mm" : ]]>"&date.month.placeholder;"<![CDATA[; + this.mDayPlaceHolder = this.mSpoofEnglish ? "dd" : ]]>"&date.day.placeholder;"<![CDATA[; - this.mYearLabel = ]]>"&date.year.label;"<![CDATA[; - this.mMonthLabel = ]]>"&date.month.label;"<![CDATA[; - this.mDayLabel = ]]>"&date.day.label;"<![CDATA[; + this.mYearLabel = this.mSpoofEnglish ? "Year" : ]]>"&date.year.label;"<![CDATA[; + this.mMonthLabel = this.mSpoofEnglish ? "Month" : ]]>"&date.month.label;"<![CDATA[; + this.mDayLabel = this.mSpoofEnglish ? "Day" : ]]>"&date.day.label;"<![CDATA[; /* eslint-enable no-multi-spaces */ this.mMinMonth = 1; @@ -451,17 +451,17 @@ this.mPMIndicator = pmString || kDefaultPMString; /* eslint-disable no-multi-spaces */ - this.mHourPlaceHolder = ]]>"&time.hour.placeholder;"<![CDATA[; - this.mMinutePlaceHolder = ]]>"&time.minute.placeholder;"<![CDATA[; - this.mSecondPlaceHolder = ]]>"&time.second.placeholder;"<![CDATA[; - this.mMillisecPlaceHolder = ]]>"&time.millisecond.placeholder;"<![CDATA[; - this.mDayPeriodPlaceHolder = ]]>"&time.dayperiod.placeholder;"<![CDATA[; - - this.mHourLabel = ]]>"&time.hour.label;"<![CDATA[; - this.mMinuteLabel = ]]>"&time.minute.label;"<![CDATA[; - this.mSecondLabel = ]]>"&time.second.label;"<![CDATA[; - this.mMillisecLabel = ]]>"&time.millisecond.label;"<![CDATA[; - this.mDayPeriodLabel = ]]>"&time.dayperiod.label;"<![CDATA[; + this.mHourPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.hour.placeholder;"<![CDATA[; + this.mMinutePlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.minute.placeholder;"<![CDATA[; + this.mSecondPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.second.placeholder;"<![CDATA[; + this.mMillisecPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.millisecond.placeholder;"<![CDATA[; + this.mDayPeriodPlaceHolder = this.mSpoofEnglish ? "--" : ]]>"&time.dayperiod.placeholder;"<![CDATA[; + + this.mHourLabel = this.mSpoofEnglish ? "Hours" : ]]>"&time.hour.label;"<![CDATA[; + this.mMinuteLabel = this.mSpoofEnglish ? "Minutes" :]]>"&time.minute.label;"<![CDATA[; + this.mSecondLabel = this.mSpoofEnglish ? "Seconds" :]]>"&time.second.label;"<![CDATA[; + this.mMillisecLabel = this.mSpoofEnglish ? "Milliseconds" :]]>"&time.millisecond.label;"<![CDATA[; + this.mDayPeriodLabel = this.mSpoofEnglish ? "AM/PM" :]]>"&time.dayperiod.label;"<![CDATA[; /* eslint-enable no-multi-spaces */ this.mHour12 = this.is12HourTime(this.mLocales); @@ -1218,10 +1218,11 @@ <![CDATA[ this.DEBUG = false; this.mInputElement = this.parentNode; - this.mLocales = window.getRegionalPrefsLocales(); + let intlUtils = window.intlUtils; + this.mSpoofEnglish = intlUtils.spoofEnglish; + this.mLocales = this.mSpoofEnglish ? ["en-US"] : window.getRegionalPrefsLocales(); this.mIsRTL = false; - let intlUtils = window.intlUtils; if (intlUtils) { this.mIsRTL = intlUtils.getLocaleInfo(this.mLocales).direction === "rtl"; @@ -1242,6 +1243,10 @@ this.mResetButton = document.getAnonymousElementByAttribute(this, "anonid", "reset-button"); this.mResetButton.style.visibility = "hidden"; + if (this.mSpoofEnglish) { + // Use the US English version of datetime.reset.label. + this.mResetButton.setAttribute("aria-label", "Clear"); + } this.EVENTS.forEach((eventName) => { this.addEventListener(eventName, this, { mozSystemGroup: true }, false); diff --git a/toolkit/content/widgets/datetimepopup.xml b/toolkit/content/widgets/datetimepopup.xml index ddbdd9dd0fd3..e9fef1234929 100644 --- a/toolkit/content/widgets/datetimepopup.xml +++ b/toolkit/content/widgets/datetimepopup.xml @@ -110,7 +110,8 @@ <body><![CDATA[ // TODO: When bug 1376616 lands, replace this.setGregorian with // mozIntl.Locale for setting calendar to Gregorian - const locale = this.setGregorian(Services.locale.getAppLocaleAsBCP47()); + const locale = this.setGregorian( + window.intlUtils.spoofEnglish ? "en-US" : Services.locale.getAppLocaleAsBCP47()); const dir = this.mozIntl.getLocaleInfo(locale).direction; switch (this.type) {

1 0