tbb-commits August 2018

tbb-commits@lists.torproject.org

2 participants
112 discussions

[torbutton/master] Bug 26189: Remove content-policy.js
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit b9b87bcb3105e7aafb42f162b4bb1e8fc7dc54ba Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 09:55:40 2018 -0700 Bug 26189: Remove content-policy.js Our old patch for Bug 8725 was upstreamed in https://bugzilla.mozilla.org/show_bug.cgi?id=863246 --- src/components/content-policy.js | 174 -------------------------------- src/components/startup-observer.js | 7 +- src/defaults/preferences/preferences.js | 2 +- 3 files changed, 3 insertions(+), 180 deletions(-) diff --git a/src/components/content-policy.js b/src/components/content-policy.js deleted file mode 100644 index db72efea..00000000 --- a/src/components/content-policy.js +++ /dev/null @@ -1,174 +0,0 @@ -/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* - * Based on ResourceFilter: A direct workaround for https://bugzil.la/863246 - * https://notabug.org/desktopd/no-resource-uri-leak/src/master/src/resource-f… - */ - -const Cc = Components.classes, Ci = Components.interfaces, Cu = Components.utils; - -// Import XPCOMUtils object. -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); -let { bindPrefAndInit } = - Cu.import("resource://torbutton/modules/utils.js", {}); - -function ContentPolicy() { - this.uriFingerprinting = null; - let that = this; - bindPrefAndInit("extensions.torbutton.resource_and_chrome_uri_fingerprinting", - function (enabled) { - that.uriFingerprinting = enabled; - }); - - // Register as an nsIContentPolicy filter. - let registrar = Components.manager.QueryInterface(Ci.nsIComponentRegistrar); - registrar.registerFactory(this.classID, this.classDescription, - this.contractID, this); - - let catMan = Cc["@mozilla.org/categorymanager;1"] - .getService(Ci.nsICategoryManager); - catMan.addCategoryEntry("content-policy", this.contractID, this.contractID, - false, true); -} - -ContentPolicy.prototype = { - classDescription: "ContentPolicy", - classID: Components.ID("{4c03be7d-492f-990e-f0da-f3689e564898}"), - contractID: "@torproject.org/content-policy;1", - - uriWhitelist: { - // Video playback. - "chrome://global/content/TopLevelVideoDocument.js": Ci.nsIContentPolicy.TYPE_SCRIPT, - "resource://gre/res/TopLevelVideoDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - "chrome://global/content/bindings/videocontrols.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/scale.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/progressmeter.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/button.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/general.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/text.xml": Ci.nsIContentPolicy.TYPE_XBL, - - // Image display. - "resource://gre/res/ImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - "resource://gre/res/TopLevelImageDocument.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - - // Scrollbars, text box resizer, and content keyboard shortcuts. - "chrome://global/content/bindings/scrollbar.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/bindings/resizer.xml": Ci.nsIContentPolicy.TYPE_XBL, - "chrome://global/content/platformHTMLBindings.xml": Ci.nsIContentPolicy.TYPE_XBL, - - // Directory listing. - "chrome://global/skin/dirListing/dirListing.css": Ci.nsIContentPolicy.TYPE_STYLESHEET, - }, - - uriRegexWhitelist: [ - // Video playback: whitelist png and svg images under chrome://global/skin/media - { regex: /^chrome:\/\/global\/skin\/media\/.+\.(png|svg)$/, - type: Ci.nsIContentPolicy.TYPE_IMAGE }, - - // Video playback and image display: whitelist css files under chrome://global/skin/media - { regex: /^chrome:\/\/global\/skin\/media\/.+\.css$/, - type: Ci.nsIContentPolicy.TYPE_STYLESHEET }, - ], - - // nsISupports - QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentPolicy, Ci.nsIFactory, - Ci.nsISupportsWeakReference]), - - // nsIFactory - createInstance: function(outer, iid) - { - if (outer) - throw Cr.NS_ERROR_NO_AGGREGATION; - return this.QueryInterface(iid); - }, - - // nsIContentPolicy - shouldLoad: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeTypeGuess, aExtra) { - - // Accept if the user does not care, no content URI is available or scheme - // is not resource/chrome. - if (this.uriFingerprinting || !aContentLocation || - !(aContentLocation.schemeIs('resource') || - aContentLocation.schemeIs('chrome'))) { - return Ci.nsIContentPolicy.ACCEPT; - } - - // Accept if no origin URI or if origin scheme is - // chrome/resource/about/view-source. - if (!aRequestOrigin || aRequestOrigin.schemeIs('resource') || - aRequestOrigin.schemeIs('chrome') || - aRequestOrigin.schemeIs('about') || - aRequestOrigin.schemeIs('view-source')) - return Ci.nsIContentPolicy.ACCEPT; - - // Accept if resource directly loaded into a tab. - if (Ci.nsIContentPolicy.TYPE_DOCUMENT === aContentType) - return Ci.nsIContentPolicy.ACCEPT; - - // There's certain things that break horribly if they aren't allowed to - // access URIs with proscribed schemes, with `aContentOrigin` basically - // set to arbibrary URIs. - // - // XXX: Feature gate this behind the security slider or something, I don't - // give a fuck. - if (aContentLocation.spec in this.uriWhitelist) - if (this.uriWhitelist[aContentLocation.spec] == aContentType) - return Ci.nsIContentPolicy.ACCEPT; - - for (let wlObj of this.uriRegexWhitelist) { - if ((wlObj.type == aContentType) && wlObj.regex.test(aContentLocation.spec)) - return Ci.nsIContentPolicy.ACCEPT; - } - - return Ci.nsIContentPolicy.REJECT_REQUEST; - }, - - shouldProcess: function(aContentType, aContentLocation, aRequestOrigin, aContext, aMimeType, aExtra) { - return Ci.nsIContentPolicy.ACCEPT; - }, -}; - -// Install a HTTP response handler to check for redirects to URLs with schemes -// that should be internal to the browser. There's various safeguards and -// checks that cause the body to be unavailable, but the `onLoad()` behavior -// is inconsistent, which results in leaking information about the specific -// user agent instance (eg: what addons are installed). -var requestObserver = { - ioService: Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService), - observerService: Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService), - - start: function() { - this.observerService.addObserver(this, "http-on-examine-response", false); - }, - - observe: function(aSubject, aTopic, aData) { - let aChannel = aSubject.QueryInterface(Ci.nsIHttpChannel); - let aStatus = aChannel.responseStatus; - - // If this is a redirect... - // - // Note: `304 Not Modifed` isn't a redirect, so there is no Location header to check - // in that case. - if (aStatus >= 300 && aStatus < 400 && aStatus != 304) { - let location = aChannel.getResponseHeader("Location"); - let aUri = this.ioService.newURI(location, null, null); - - // And it's redirecting into the browser or addon's internal URLs... - if (aUri.schemeIs("resource") || aUri.schemeIs("chrome") || aUri.schemeIs("about")) { - // Cancel the request. - aSubject.cancel(Components.results.NS_BINDING_ABORTED); - } - } - }, -}; - -// Create a content policy object; initialization is done in the contructor. -var cp = new ContentPolicy(); - -// In the chrome process, register the request observer to handle redirects. -if (Services.appinfo.processType == Services.appinfo.PROCESS_TYPE_DEFAULT) { - requestObserver.start(); -} diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index 144d600a..cd9e7d2c 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -62,13 +62,10 @@ function StartupObserver() { this.logger.log(4, "Early proxy change failed. Will try again at profile load. Error: "+e); } - // Arrange for our nsIContentPolicy filter and about:tor handler to be - // loaded in the default (chrome) process as well as in each content - // process. + // Arrange for our about:tor handler to be loaded in the default (chrome) + // process as well as in each content process. let ppmm = Cc["@mozilla.org/parentprocessmessagemanager;1"] .getService(Ci.nsIProcessScriptLoader); - ppmm.loadProcessScript("resource://torbutton/components/content-policy.js", - true); ppmm.loadProcessScript("resource://torbutton/components/aboutTor.js", true); } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index 43401ad0..428e70bc 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -34,7 +34,7 @@ pref("extensions.torbutton.startup_state", 2); // 0=non-tor, 1=tor, 2=last pref("extensions.torbutton.tor_memory_jar",false); pref("extensions.torbutton.nontor_memory_jar",false); pref("extensions.torbutton.launch_warning",true); -pref("extensions.torbutton.resource_and_chrome_uri_fingerprinting",false); + // Opt out of Firefox addon pings: // https://developer.mozilla.org/en/Addons/Working_with_AMO pref("extensions.torbutton(a)torproject.org.getAddons.cache.enabled", false);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit de2e1fbe5b024957ed469063bf38b8b274b4f4ba Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Aug 3 21:29:47 2018 +0000 Bug 26826 - Disable tab queue and delete SYSTEM_ALERT_WINDOW permission --- mobile/android/app/src/main/res/xml/preferences_general.xml | 1 + mobile/android/app/src/main/res/xml/preferences_general_tablet.xml | 1 + mobile/android/base/FennecManifest_permissions.xml.in | 3 --- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/android/app/src/main/res/xml/preferences_general.xml b/mobile/android/app/src/main/res/xml/preferences_general.xml index f148ae61b169..ef739db0c3d8 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general.xml @@ -31,6 +31,7 @@ <SwitchPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" + android:selectable="false" android:defaultValue="false" /> <SwitchPreference android:key="android.not_a_preference.compact_tabs" diff --git a/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml b/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml index f05be98277fc..72d4e024b55f 100644 --- a/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml +++ b/mobile/android/app/src/main/res/xml/preferences_general_tablet.xml @@ -37,6 +37,7 @@ <SwitchPreference android:key="android.not_a_preference.tab_queue" android:title="@string/pref_tab_queue_title" android:summary="@string/pref_tab_queue_summary" + android:selectable="false" android:defaultValue="false" /> </PreferenceScreen> diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in index 1b7b2d5475ec..f7bfe475bece 100644 --- a/mobile/android/base/FennecManifest_permissions.xml.in +++ b/mobile/android/base/FennecManifest_permissions.xml.in @@ -46,9 +46,6 @@ #endif <uses-feature android:name="android.hardware.touchscreen"/> -  - <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/> - #ifdef MOZ_ANDROID_BEAM  <uses-permission android:name="android.permission.NFC"/>

1 0

[tor-browser-build/master] Bug 12968: enable HEASLR in Windows x86_64 builds
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit f7247cca852ce5f9cce092ca82cb92efbbba611d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue May 29 13:42:09 2018 +0200 Bug 12968: enable HEASLR in Windows x86_64 builds We still need the other half of the fix for actually providing higher entropy (see bug 12968, comment:17ff. for discussion). --- rbm.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index ff36e6c..cd6dc08 100644 --- a/rbm.conf +++ b/rbm.conf @@ -204,6 +204,8 @@ targets: container: arch: amd64 faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1 + # HEASLR is 64 bit only (see bug 12968) + flag_HEASLR: '-Wl,--high-entropy-va' windows-i686: arch: i686 var: @@ -226,7 +228,7 @@ targets: suite: jessie configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' - LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_mwindows") %]' + LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' compiler: mingw-w64 deps:

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25906 - Imply false both Adjust and Leanplum configure options
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit ccb635fc7b7c02c4431adfbe67bff2f73e491157 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Aug 3 18:32:46 2018 +0000 Bug 25906 - Imply false both Adjust and Leanplum configure options These configure options should be false already, because we set |--without-google-play-services| in .mozconfig-android. But, this is another layer of certainty. --- mobile/android/torbrowser.configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mobile/android/torbrowser.configure b/mobile/android/torbrowser.configure index ac30fde888a6..8f3462982dc7 100644 --- a/mobile/android/torbrowser.configure +++ b/mobile/android/torbrowser.configure @@ -44,3 +44,8 @@ imply_option('MOZ_SERVICES_HEALTHREPORT', False) imply_option('MOZ_ANDROID_NETWORK_STATE', False); imply_option('MOZ_ANDROID_LOCATION', False); + +# Exclude Leanplum MMA (marketing automation and user behavior) +imply_option('MOZ_ANDROID_MMA', False); +# Exclude Adjust (installation tracking) +imply_option('MOZ_INSTALL_TRACKING', False);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 27016 - Create proxy connection during image download
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit dda3c7d44a12cc2d9ff5e071605c8f36670ac956 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Aug 2 21:49:05 2018 +0000 Bug 27016 - Create proxy connection during image download Picasso, the image retrieval library used by Fennec, ignores the network proxy configuration. We override the openConnection() method and create the connection using the configured proxy. --- .../java/org/mozilla/gecko/home/ImageLoader.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java index 2bbd82a8df77..cbbe7babbba4 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/ImageLoader.java @@ -15,9 +15,14 @@ import com.squareup.picasso.Picasso; import com.squareup.picasso.Downloader.Response; import com.squareup.picasso.UrlConnectionDownloader; +import org.mozilla.gecko.util.ProxySelector; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URISyntaxException; import java.util.EnumSet; import java.util.Set; @@ -84,6 +89,23 @@ public class ImageLoader { this.distribution = distribution; } + @Override + protected HttpURLConnection openConnection(Uri path) throws IOException { + try { + // This is annoying, but |path| is an android.net.Uri and + // openConnectionWithProxy() accepts a java.net.URI + return (HttpURLConnection)ProxySelector.openConnectionWithProxy( + new URI( + path.getScheme(), path.getHost(), path.getPath(), + path.getEncodedFragment())); + } catch (URISyntaxException ex) { + // And android.net.Uri is more lenient than java.net.URI. + // Uri does not catch syntax errors which URI may catch. + // We'll re-throw this as an IOException + throw new IOException(ex.getMessage()); + } + } + private Density getDensity(float factor) { final DisplayMetrics dm = context.getResources().getDisplayMetrics(); final float densityDpi = dm.densityDpi * factor;

1 0

[tor-browser-build/master] Bug 27129: Add locales ca, ga, id, is, nb
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit ad4233157674808d5d8557ada5ce97a145d8a3e5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 15:13:25 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- rbm.conf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rbm.conf b/rbm.conf index 8cfa5e2..ff36e6c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -52,15 +52,20 @@ var: locale_ja: ja locales: - ar + - ca - da - de - es-ES - fa - fr + - ga-IE - he + - id + - is - it - '[% c("var/locale_ja") %]' - ko + - nb-NO - nl - pl - pt-BR

1 0

[tor-launcher/master] Bug 27129: Add locales ca, ga, id, is, nb
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit 0fb1ea7e8ec9b118c1aa08f92fef7cb7b47cb4ea Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 14:54:36 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- src/chrome/content/network-settings.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 0e18b29..aaa91ac 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -305,16 +305,21 @@ function populateLocaleList(aLangPackAddons) "en-US" : "English", "ar" : "\u0627\u0644\u0639\u0631\u0628\u064a\u0629", "bn-BD" : "\u09ac\u09be\u0982\u09b2\u09be", + "ca" : "català", "da" : "Dansk", "de" : "Deutsch", "es-ES" : "Espa\u00f1ol", "fa" : "\u0641\u0627\u0631\u0633\u06cc", "fr" : "Fran\u00e7ais", + "ga" : "Gaeilge (Irish)", "he" : "\u05e2\u05d1\u05e8\u05d9\u05ea", + "id" : "bahasa Indonesia", + "is" : "\u0355slenska", "it" : "Italiano", "ja" : "\u65e5\u672c\u8a9e", "ko" : "\ud55c\uad6d\uc5b4", "nl" : "Nederlands", + "nb" : "Norsk bokmå\u0345l", "pl" : "Polski", "pt-PT" : "Portugu\u00eas (Europeu)", "ru" : "\u0420\u0443\u0441\u0441\u043a\u0438\u0439",

1 0

[torbutton/master] Bug 27129: Add locales ca, ga, id, is, nb
by gk＠torproject.org 15 Aug '18

15 Aug '18

commit 859160f4d23a2706c4cad689c5379a33b0070ef5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 13 14:35:33 2018 -0700 Bug 27129: Add locales ca, ga, id, is, nb --- trans_tools/import-translations.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trans_tools/import-translations.sh b/trans_tools/import-translations.sh index 736d62ff..2f0be994 100755 --- a/trans_tools/import-translations.sh +++ b/trans_tools/import-translations.sh @@ -2,7 +2,7 @@ # This var comes from the TBB locale list. # XXX: Find some way to keep this, tor-launcher, and Tor Browser in sync -BUNDLE_LOCALES="ar bn-BD da de es fa fr he it ja ko nl pl pt-BR ru sv tr vi zh-CN zh-TW" +BUNDLE_LOCALES="ar bn-BD ca da de es fa fr ga he id is it ja ko nb nl pl pt-BR ru sv tr vi zh-CN zh-TW" # XXX: Basque (eu) by request in #10687. # This is not used for official builds, but should remain

1 0

[torbutton/master] Bug 26960: implement new about:tor start page
by gk＠torproject.org 14 Aug '18

14 Aug '18

commit 985bcbf8323c159b18345fbfc010a7277d54559f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Jul 27 12:23:36 2018 -0400 Bug 26960: implement new about:tor start page Implement new design from UX team. Remove "update needed" notification (will be addressed by bug 25694). --- src/chrome/content/aboutTor/aboutTor-content.js | 222 +-------------- src/chrome/content/aboutTor/aboutTor.xhtml | 212 +++++++++----- src/chrome/content/torbutton.js | 63 +---- src/chrome/locale/en/aboutTor.dtd | 42 +-- src/chrome/locale/en/aboutTor.properties | 8 +- src/chrome/skin/aboutTor.css | 353 ++++++++++-------------- src/chrome/skin/forwardArrow.png | Bin 0 -> 258 bytes src/chrome/skin/onionArrow-extension.png | Bin 1798 -> 0 bytes src/chrome/skin/onionArrow-leftBend.png | Bin 2080 -> 0 bytes src/chrome/skin/onionArrow-rightBend.png | Bin 2077 -> 0 bytes src/chrome/skin/onionArrow-short.png | Bin 1913 -> 0 bytes src/chrome/skin/search.png | Bin 934 -> 0 bytes src/chrome/skin/searchLogo.png | Bin 0 -> 1912 bytes src/chrome/skin/tor-off.png | Bin 5835 -> 0 bytes src/chrome/skin/tor-on.png | Bin 17945 -> 0 bytes src/defaults/preferences/preferences.js | 1 - 16 files changed, 318 insertions(+), 583 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor-content.js b/src/chrome/content/aboutTor/aboutTor-content.js index 1a8d5cfa..c2e26c8c 100644 --- a/src/chrome/content/aboutTor/aboutTor-content.js +++ b/src/chrome/content/aboutTor/aboutTor-content.js @@ -12,8 +12,6 @@ * the code in torbutton.js: * AboutTor:Loaded page loaded content -> chrome * AboutTor:ChromeData privileged data chrome -> content - * AboutTor:GetToolbarData request toolbar info content -> chrome - * AboutTor:ToolbarData toolbar info chrome -> content */ var {classes: Cc, interfaces: Ci, utils: Cu} = Components; @@ -24,7 +22,8 @@ let { bindPrefAndInit } = Cu.import("resource://torbutton/modules/utils.js", {}) var AboutTorListener = { - kAboutTorMessages: [ "AboutTor:ChromeData", "AboutTor:ToolbarData" ], + kAboutTorLoadedMessage: "AboutTor:Loaded", + kAboutTorChromeDataMessage: "AboutTor:ChromeData", get isAboutTor() { return content.document.documentURI.toLowerCase() == "about:tor"; @@ -45,9 +44,6 @@ var AboutTorListener = { case "pagehide": this.onPageHide(); break; - case "resize": - sendAsyncMessage("AboutTor:GetToolbarData"); - break; } }, @@ -56,12 +52,9 @@ var AboutTorListener = { return; switch (aMessage.name) { - case "AboutTor:ChromeData": + case this.kAboutTorChromeDataMessage: this.onChromeDataUpdate(aMessage.data); break; - case "AboutTor:ToolbarData": - this.onToolbarDataUpdate(aMessage.data); - break; } }, @@ -74,70 +67,42 @@ var AboutTorListener = { }); // Add message and event listeners. - this.kAboutTorMessages.forEach(aMsg => addMessageListener(aMsg, this)); - addMessageListener("AboutTor:ChromeData", this); + addMessageListener(this.kAboutTorChromeDataMessage, this); addEventListener("pagehide", this, false); addEventListener("resize", this, false); - sendAsyncMessage("AboutTor:Loaded"); + sendAsyncMessage(this.kAboutTorLoadedMessage); }, onPageHide: function() { removeEventListener("resize", this, false); removeEventListener("pagehide", this, false); - this.kAboutTorMessages.forEach(aMsg => removeMessageListener(aMsg, this)); + removeMessageListener(this.kAboutTorChromeDataMessage, this); }, onChromeDataUpdate: function(aData) { let body = content.document.body; - // Update status: tor on/off, update needed, Tor Browser manual shown. + // Update status: tor on/off, Tor Browser manual shown. if (aData.torOn) body.setAttribute("toron", "yes"); else body.removeAttribute("toron"); - if (aData.updateNeeded) - body.setAttribute("torNeedsUpdate", "yes"); - else - body.removeAttribute("torNeedsUpdate"); - if (aData.showManual) body.setAttribute("showmanual", "yes"); else body.removeAttribute("showmanual"); - // Setting body.initialized="yes" displays the body, which must be done - // at this point because our remaining initialization depends on elements - // being visible so that their size and position are accurate. + // Setting body.initialized="yes" displays the body. body.setAttribute("initialized", "yes"); - - let containerName = "torstatus-" + (aData.torOn ? "on" : "off") + - "-container"; - this.adjustFontSizes(containerName); - - this.onToolbarDataUpdate(aData); - }, - - onToolbarDataUpdate: function(aData) { - this.adjustArrow(aData.toolbarButtonXPos); }, onLocaleChange: function(aLocale) { - this.insertPropertyStrings(); - // Set Tor Browser manual link. content.document.getElementById("manualLink").href = "https://tb-manual.torproject.org/" + aLocale; - // Insert "Test Tor Network Settings" url. - let elem = content.document.getElementById("testTorSettings"); - if (elem) { - let url = Services.prefs.getCharPref( - "extensions.torbutton.test_url_interactive"); - elem.href = url.replace(/__LANG__/g, aLocale.replace(/-/g, '_')); - } - // Display the Tor Browser product name and version. try { const kBrandBundle = "chrome://branding/locale/brand.properties"; @@ -153,177 +118,6 @@ var AboutTorListener = { elem.appendChild(content.document.createTextNode(productName + '\n' + tbbVersion)); } catch (e) {} - }, - - insertPropertyStrings: function() { - try { - let kPropertiesURL = "chrome://torbutton/locale/aboutTor.properties"; - - let stringBundle = Services.strings.createBundle(kPropertiesURL); - let s1 = stringBundle.GetStringFromName("aboutTor.searchDDG.privacy.link"); - let s2 = stringBundle.GetStringFromName("aboutTor.searchDDG.search.link"); - let result = stringBundle.formatStringFromName( - "aboutTor.searchDDG.privacy", [s1, s2], 2); - if (result) { - let elem = content.document.getElementById("searchProviderInfo"); - if (elem) - elem.innerHTML = result; - } - } catch(e) {} - }, - - // Ensure that text in top area does not overlap the tor on/off (onion) image. - // This is done by reducing the font sizes as necessary. - adjustFontSizes: function(aContainerName) - { - let imgElem = content.document.getElementById("torstatus-image"); - let containerElem = content.document.getElementById(aContainerName); - if (!imgElem || !containerElem) - return; - - try - { - let imgRect = imgElem.getBoundingClientRect(); - - for (let textElem = containerElem.firstChild; textElem; - textElem = textElem.nextSibling) - { - if ((textElem.nodeType != textElem.ELEMENT_NODE) || - (textElem.nodeName.toLowerCase() == "br")) - { - continue; - } - - let textRect = textElem.getBoundingClientRect(); - if (0 == textRect.width) - continue; - - // Reduce font to 90% of previous size, repeating the process up to 7 - // times. This allows for a maximum reduction to just less than 50% of - // the original size. - let maxTries = 7; - while ((textRect.left < imgRect.right) && (--maxTries >= 0)) - { - let style = content.document.defaultView - .getComputedStyle(textElem, null); - let fontSize = parseFloat(style.getPropertyValue("font-size")); - textElem.style.fontSize = (fontSize * 0.9) + "px"; - textRect = textElem.getBoundingClientRect(); - } - } - - } catch (e) {} - }, - - adjustArrow: function(aToolbarButtonXPos) - { - let win = content; - let doc = content.document; - let textElem = doc.getElementById("updatePrompt"); - let arrowHeadDiv = doc.getElementById("toolbarIconArrowHead"); - let vertExtDiv = doc.getElementById("toolbarIconArrowVertExtension"); - let bendDiv = doc.getElementById("toolbarIconArrowBend"); - let horzExtDiv = doc.getElementById("toolbarIconArrowHorzExtension"); - if (!textElem || !arrowHeadDiv || !vertExtDiv || !bendDiv || !horzExtDiv) - return; - - let arrowTailElems = [ vertExtDiv, bendDiv, horzExtDiv ]; - if (!aToolbarButtonXPos || isNaN(aToolbarButtonXPos) || - (aToolbarButtonXPos < 0)) - { - arrowHeadDiv.style.display = "none"; - for (let elem of arrowTailElems) - elem.style.display = "none"; - return; - } - - const kArrowMargin = 6; // Horizontal margin between line and text. - const kArrowHeadExtraWidth = 9; // Horizontal margin to the line. - const kArrowLineThickness = 11; - const kBendWidth = 22; - const kBendHeight = 22; - - try { - // Compensate for any content zoom that may be in effect on about:tor. - // Because window.devicePixelRatio always returns 1.0 for non-Chrome - // windows (see bug 13875), we use screenPixelsPerCSSPixel for the - // content window. - let pixRatio = content.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIDOMWindowUtils) - .screenPixelsPerCSSPixel; - let tbXpos = Math.round(aToolbarButtonXPos / pixRatio); - - arrowHeadDiv.style.display = "block"; // Must be visible to get offsetWidth. - let arrowHalfWidth = Math.round(arrowHeadDiv.offsetWidth / 2); - let leftAnchor = textElem.offsetLeft - kArrowMargin - - kBendWidth + Math.round(kArrowLineThickness / 2); - let rightAnchor = textElem.offsetLeft + textElem.offsetWidth - + kArrowMargin + arrowHalfWidth; - - let isArrowOnLeft = (tbXpos < leftAnchor); - let isArrowOnRight = (tbXpos > rightAnchor) && - (tbXpos < (win.innerWidth - arrowHalfWidth)); - let isArrowInMiddle = (tbXpos >= leftAnchor) && (tbXpos <= rightAnchor); - - if (isArrowOnLeft || isArrowOnRight || isArrowInMiddle) - { - // Position the arrow head. - let arrowHeadLeft = tbXpos - arrowHalfWidth; - arrowHeadDiv.style.left = arrowHeadLeft + "px"; - if (isArrowOnLeft || isArrowOnRight) - { - let horzExtBottom = textElem.offsetTop + - Math.round((textElem.offsetHeight + kArrowLineThickness) / 2); - - // Position the vertical (extended) line. - let arrowHeadBottom = arrowHeadDiv.offsetTop + - arrowHeadDiv.offsetHeight; - vertExtDiv.style.top = arrowHeadBottom + "px"; - vertExtDiv.style.left = (arrowHeadLeft + kArrowHeadExtraWidth) + "px"; - let ht = horzExtBottom - kBendHeight - arrowHeadBottom; - vertExtDiv.style.height = ht + "px"; - - // Position the bend (elbow). - bendDiv.style.top = (horzExtBottom - kBendHeight) + "px"; - let bendDivLeft; - if (isArrowOnLeft) - { - bendDiv.setAttribute("pos", "left"); - bendDivLeft = arrowHeadLeft + kArrowHeadExtraWidth; - } - else if (isArrowOnRight) - { - bendDiv.setAttribute("pos", "right"); - bendDivLeft = arrowHeadLeft + kArrowHeadExtraWidth - + kArrowLineThickness - kBendWidth; - } - bendDiv.style.left = bendDivLeft + "px"; - - // Position the horizontal (extended) line. - horzExtDiv.style.top = (horzExtBottom - kArrowLineThickness) + "px"; - let horzExtLeft, w; - if (isArrowOnLeft) - { - horzExtLeft = bendDivLeft + kBendWidth; - w = (textElem.offsetLeft - horzExtLeft - kArrowMargin); - } - else - { - horzExtLeft = rightAnchor - arrowHalfWidth; - w = tbXpos - arrowHalfWidth - horzExtLeft; - } - horzExtDiv.style.left = horzExtLeft + "px"; - horzExtDiv.style.width = w + "px"; - } - } - - let headDisplay = (isArrowOnLeft || isArrowInMiddle || isArrowOnRight) - ? "block" : "none"; - arrowHeadDiv.style.display = headDisplay; - let tailDisplay = (isArrowOnLeft || isArrowOnRight) ? "block" : "none"; - for (let elem of arrowTailElems) - elem.style.display = tailDisplay; - } catch (e) {} } }; diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index 5cb2a605..c2bbcb25 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -31,87 +31,173 @@ window.addEventListener("pageshow", function() { </script> </head> <body dir="&locale.dir;"> - <div class="hideIfTorIsUpToDate"> - <div id="toolbarIconArrowHead" class="arrow"/> - <div id="toolbarIconArrowVertExtension" class="arrow"/> - <div id="toolbarIconArrowBend" class="arrow"/> - <div id="toolbarIconArrowHorzExtension" class="arrow"/> - </div> <div class="torcontent-container"> <div id="torstatus-version"/> <div id="torstatus" class="top"> - <div id="torstatus-image"/> <div id="torstatus-on-container" class="hideIfTorOff torstatus-container"> - <h1>&aboutTor.success.label;</h1> - <br/> - <h3 class="hideIfTBBNeedsUpdate">&aboutTor.success3.label;</h3> + <div class="heading1">&aboutTor.ready.label;</div> <br/> - <div style="margin-top: 20px;"> - <a id="testTorSettings" href="about:blank">&aboutTor.check.label;</a> - </div> + <div class="heading2">&aboutTor.ready2.label;</div> </div> <div id="torstatus-off-container" class="hideIfTorOn torstatus-container"> - <h1>&aboutTor.failure.label;</h1> + <div class="heading1">&aboutTor.failure.label;</div> <br/> - <h2>&aboutTor.failure2.label;</h2> - </div> - </div> - <div class="top"> - <div class="hideIfTorIsUpToDate"> - <h1 class="hideIfTorOff">&aboutTor.outOfDateTorOn.label;</h1> - <h1 class="hideIfTorOn">&aboutTor.outOfDateTorOff.label;</h1> - <div> - <h3 id="updatePrompt">&aboutTor.outOfDate2.label;</h3> - </div> + <div class="heading2">&aboutTor.failure2.label;</div> </div> </div> <div class="searchbox hideIfTorOff">  <form action="&aboutTor.searchDDGPost.link;" method="post"> - <div id="sxw"> - <div id="sbutton"> - <input name="b" id="sb" value="" title="&aboutTor.search.label;" - alt="&aboutTor.search.label;" type="submit"/> + <div class="searchwrapper"> + <label class="searchlabel" for="search-text"> </label> + <input name="q" id="search-text" placeholder="&aboutTor.search.label;" + autocomplete="off" type="text"/> + <input name="b" id="search-button" value="" + title="&aboutTor.search.label;" + alt="&aboutTor.search.label;" type="submit"/> </div> - <input name="q" autocomplete="off" id="sx" type="text"/> - </div> - <h4 id="searchProviderInfo" /> </form> </div> - <div class="hideIfTorOn" style="height:100px"/> - - <div id="middle" class="hideIfTorOff"> - <div class="bubble"> - <h1>&aboutTor.whatnextQuestion.label;</h1> - <p>&aboutTor.whatnextAnswer.label;</p> - <ul> - <li> - <a href="&aboutTor.whatnext.link;"> - &aboutTor.whatnext.label; - </a> - </li> - <li class="showForManual"> - <a id="manualLink"> - &aboutTor.torbrowser_user_manual.label; » - </a> - </li> - </ul> - </div> - <div class="bubble"> - <h1>&aboutTor.helpInfo1.label;</h1> - <p>&aboutTor.helpInfo2.label;</p> - <ul> - <li><a href="&aboutTor.helpInfo3.link;">&aboutTor.helpInfo3.label;</a></li> - <li><a href="&aboutTor.helpInfo4.link;">&aboutTor.helpInfo4.label;</a></li> - <li><a href="&aboutTor.helpInfo5.link;">&aboutTor.helpInfo5.label;</a></li> - </ul> - </div> - </div>  - <div id="bottom"> - <p>&aboutTor.footer.label; - <a href="&aboutTor.learnMore.link;">&aboutTor.learnMore.label;</a></p> + <p class="showForManual moreInfoLink">&aboutTor.torbrowser_user_manual_questions.label; + <a id="manualLink">&aboutTor.torbrowser_user_manual_link.label;</a></p> + <p>&aboutTor.tor_mission.label; + <a href="&aboutTor.getInvolved.link;">&aboutTor.getInvolved.label;</a></p> + </div> + </div> + + + <div class="onion-pattern-container"> + <div class="onion-pattern-row"> + <div class="circle solid"></div> + + <div class="circle border"></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 dotted"></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 class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></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 dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + </div> + + <div class="onion-pattern-row onion-pattern-offset-row"> + <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 class="circle dotted"> + <div class="inner dotted"></div> + <div class="inner dotted"></div> + <div class="inner dotted"></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 dashed"> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + <div class="inner dashed"></div> + </div> + + <div class="circle solid"></div> + + <div class="circle border"></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 dotted"></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> </div> </body> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index d0195b46..8e62a5ab 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -338,10 +338,9 @@ function torbutton_init() { } } - // Add about:tor IPC message listeners. - let aboutTorMessages = [ "AboutTor:Loaded", "AboutTor:GetToolbarData" ]; - aboutTorMessages.forEach(aMsg => window.messageManager.addMessageListener( - aMsg, torbutton_abouttor_message_handler)); + // Add about:tor IPC message listener. + window.messageManager.addMessageListener("AboutTor:Loaded", + torbutton_abouttor_message_handler); // 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 @@ -369,11 +368,6 @@ function torbutton_init() { torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); - // Detect toolbar customization and update arrow on about:tor pages. - window.addEventListener("aftercustomization", function() { - torbutton_abouttor_message_handler.updateAllOpenPages(); - }, false); - //setting up context menu //var contextMenu = document.getElementById("contentAreaContextMenu"); //if (contextMenu) @@ -425,10 +419,6 @@ var torbutton_abouttor_message_handler = { aMessage.target.messageManager.sendAsyncMessage("AboutTor:ChromeData", this.chromeData); break; - case "AboutTor:GetToolbarData": - aMessage.target.messageManager.sendAsyncMessage("AboutTor:ToolbarData", - this.toolbarData); - break; } }, @@ -441,23 +431,12 @@ var torbutton_abouttor_message_handler = { // The chrome data contains all of the data needed by the about:tor // content process that is only available here (in the chrome process). // It is sent to the content process when an about:tor window is opened - // and in response to events such as the browser noticing that an update - // is available. + // and in response to events such as the browser noticing that Tor is + // not working. get chromeData() { return { torOn: torbutton_tor_check_ok(), - updateNeeded: torbutton_update_is_needed(), - showManual: torbutton_show_torbrowser_manual(), - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() - }; - }, - - // The toolbar data only contains the x coordinate of Torbutton's toolbar - // item; it is sent back to the content process as the about:tor window - // is resized. - get toolbarData() { - return { - toolbarButtonXPos: torbutton_get_toolbarbutton_xpos() + showManual: torbutton_show_torbrowser_manual() }; } }; @@ -593,9 +572,6 @@ function torbutton_notify_if_update_needed() { var btn = torbutton_get_toolbutton(); setOrClearAttribute(btn, "tbUpdateNeeded", updateNeeded); - // Update all open about:tor pages. - torbutton_abouttor_message_handler.updateAllOpenPages(); - // Make the "check for update" menu item bold if an update is needed. var item = document.getElementById("torbutton-checkForUpdate"); setOrClearAttribute(item, "tbUpdateNeeded", updateNeeded); @@ -621,33 +597,6 @@ function torbutton_check_for_update() { prompter.checkForUpdates(); } -// Determine X position of Torbutton toolbar item. The value returned -// accounts for retina but not content zoom. -// undefined is returned if the value cannot be determined (e.g., if the -// toolbar item is not on the toolbar). -function torbutton_get_toolbarbutton_xpos() { - try { - let tbXpos = -1; - let tbItem = torbutton_get_toolbutton(); - if (tbItem) { - let tbItemRect = tbItem.getBoundingClientRect(); - let contentElem = document.getElementById("tabbrowser-initialBrowser"); - let contentRect = contentElem.getBoundingClientRect(); - if (tbItemRect.top < contentRect.top) { - tbXpos = tbItemRect.left + (tbItemRect.width / 2.0) - contentRect.left; - } - } - - if (tbXpos >= 0) { - // Convert to device-independent units, compensating for retina display. - tbXpos *= window.devicePixelRatio; - return tbXpos; - } - } catch(e) {} - - return undefined; -} - function torbutton_show_sec_slider_notification() { // Show the notification about the new security slider. if (m_tb_prefs. diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 676878e2..3eecc0bc 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -1,45 +1,25 @@  <!ENTITY aboutTor.title "About Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> -<!ENTITY aboutTor.outOfDateTorOff.label "ALSO, this browser is out of date."> -<!ENTITY aboutTor.outOfDate2.label "Click on the onion and then choose Check for Tor Browser Update."> - -<!ENTITY aboutTor.check.label "Test Tor Network Settings"> - -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> -<!ENTITY aboutTor.success3.label "You are now free to browse the Internet anonymously."> +<!ENTITY aboutTor.ready.label "Explore. Privately."> +<!ENTITY aboutTor.ready2.label "You’re ready for the world’s most private browsing experience."> <!ENTITY aboutTor.failure.label "Something Went Wrong!"> <!ENTITY aboutTor.failure2.label "Tor is not working in this browser."> -<!ENTITY aboutTor.search.label "Search"> +<!ENTITY aboutTor.search.label "Search with DuckDuckGo"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com"> -<!ENTITY aboutTor.torInfo1.label "Additional Info:"> -<!ENTITY aboutTor.torInfo2.label "Country & IP Address:"> -<!ENTITY aboutTor.torInfo3.label "Exit Node:"> -<!ENTITY aboutTor.torInfo4.label "This server does not log any information about visitors."> -<!ENTITY aboutTor.whatnextQuestion.label "What Next?"> -<!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> -<!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> -<!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual_questions.label "Questions?"> +<!ENTITY aboutTor.torbrowser_user_manual_link.label "Check our Tor Browser Manual »"> + <!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> -<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY aboutTor.helpInfo1.label "You Can Help!"> -<!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> -<!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> -<!ENTITY aboutTor.helpInfo3.link "https://www.torproject.org/docs/tor-doc-relay.html.en"> -<!ENTITY aboutTor.helpInfo4.label "Volunteer Your Services »"> -<!ENTITY aboutTor.helpInfo4.link "https://www.torproject.org/getinvolved/volunteer.html.en"> -<!ENTITY aboutTor.helpInfo5.label "Make a Donation »"> -<!ENTITY aboutTor.helpInfo5.link "https://www.torproject.org/donate/donate.html.en"> +<!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser Manual"> -<!ENTITY aboutTor.footer.label "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, development, and education of online anonymity and privacy."> -<!ENTITY aboutTor.learnMore.label "Learn more about The Tor Project »"> -<!ENTITY aboutTor.learnMore.link "https://www.torproject.org/about/overview.html.en"> +<!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.getInvolved.link "https://www.torproject.org/getinvolved/volunteer.html.en"> diff --git a/src/chrome/locale/en/aboutTor.properties b/src/chrome/locale/en/aboutTor.properties index d0d3a64b..375c0da1 100644 --- a/src/chrome/locale/en/aboutTor.properties +++ b/src/chrome/locale/en/aboutTor.properties @@ -1,13 +1,7 @@ -# Copyright (c) 2014, The Tor Project, Inc. +# Copyright (c) 2018, The Tor Project, Inc. # See LICENSE for licensing information. # vim: set sw=2 sts=2 ts=8 et: -aboutTor.searchDDG.privacy=Search <a href="%1$S">securely</a> with <a href="%2$S">DuckDuckGo</a>. -# The following string is a link which replaces %1$S above. -aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html -# The following string is a link which replaces %2$S above. -aboutTor.searchDDG.search.link=https://duckduckgo.com/ - aboutTor.donationBanner.donate=Donate Now! aboutTor.donationBanner.slogan=Tor: Powering Digital Resistance diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index 62c9256c..02a81744 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -5,6 +5,12 @@ * vim: set sw=2 sts=2 ts=8 et syntax=css: */ +:root { + --abouttor-text-color: white; + --abouttor-bg-toron-color: #420C5D; + --abouttor-bg-toroff-color: #A4000F; +} + * { padding: 0px; margin: 0px; @@ -15,21 +21,15 @@ body { height: 100%; margin: 0px auto; padding: 0px 0px; - font-size: 62.5%; - font-family: "Liberation Sans", Arial, Helvetica, sans-serif; - font-weight: normal; - color: #4d4d4d; - background-color: #FFFFFF; + font-family: Helvetica, Arial, sans-serif; + color: var(--abouttor-text-color); + background-color: var(--abouttor-bg-toroff-color); background-attachment: fixed; background-size: 100% 100%; } -body { - background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #dddddd 50%, #dddddd); -} - body[toron] { - background-image: linear-gradient(to bottom, #ffffff, #ffffff 10%, #d5ffd5 50%, #d5ffd5); + background-color: var(--abouttor-bg-toron-color); } /* Hide the entire document by default to avoid showing the incorrect @@ -42,88 +42,44 @@ body:not([initialized]) { } .torcontent-container { - margin: 40px 20px; + margin: 40px 20px 28px 20px; display: flex; flex-direction: column; } +@media only screen and (min-width: 900px) { + .torcontent-container { + margin: 40px auto 28px auto; + max-width: 1000px; + min-width: 1000px; + } +} + #torstatus-version { position: absolute; top: 6px; right: 6px; height: 30px; width: 200px; - font-size: 1.4em; + font-size: 15px; white-space: pre-wrap; text-align: right; } -body[toron] #torstatus-image { - background-image: url('chrome://torbutton/skin/tor-on.png'); -} - -#torstatus-image { - display: none; - position: absolute; - left: 85px; - height: 128px; - width: 128px; - background-image: url('chrome://torbutton/skin/tor-off.png'); - background-repeat: no-repeat; - background-position: center; - z-index: -1; -} - -.arrow { - display: none; - position: absolute; - z-index: -1; -} - -#toolbarIconArrowHead { - top: 4px; - width: 30px; - height: 36px; - background-image: url('chrome://torbutton/skin/onionArrow-short.png'); -} - -#toolbarIconArrowVertExtension, #toolbarIconArrowHorzExtension { - width: 11px; - height: 11px; - background-image: url('chrome://torbutton/skin/onionArrow-extension.png'); -} - -#toolbarIconArrowBend { - width: 22px; - height: 22px; - background-image: url('chrome://torbutton/skin/onionArrow-leftBend.png'); -} - -#toolbarIconArrowBend[pos="right"] { - background-image: url('chrome://torbutton/skin/onionArrow-rightBend.png'); -} - a { - color: #008000; - text-decoration: none; -} - -a:hover { - color: #00A000; - text-decoration: underline; -} - -#testTorSettings { - font-size: 1.6em; - text-decoration: underline; - margin-bottom: 5px; + color: var(--abouttor-text-color); } #torstatus { - position: relative; /* needed for torstatus-image positioning */ + margin-top: 135px; display: flex; justify-content: center; - min-height: 148px; + vertical-align: bottom; + min-height: 92px; +} + +#torstatus > div { + align-self: flex-end; /* align text to bottom of container */ } .top { @@ -134,206 +90,183 @@ a:hover { text-align: center; } -body[toron][torNeedsUpdate] .hideIfTBBNeedsUpdate, -body:not([torNeedsUpdate]) .hideIfTorIsUpToDate { - display: none; -} - body[toron] .hideIfTorOn, body:not([toron]) .hideIfTorOff { display: none; } -body[toron] .top h1 { - color: #600060; -} - body:not([showmanual]) .showForManual { display: none; } -div.hideIfTorIsUpToDate { - display: flex; - flex-direction: column; -} - -div.hideIfTorIsUpToDate, -body .top div.hideIfTorIsUpToDate h1 { - color: black; - text-align: center; -} - -/* Use inline-block for text-oriented elements whose widths need to measured. */ -.torstatus-container *, -.top div.hideIfTorIsUpToDate h3 { - display: inline-block; +.torstatus-container * { text-align: center; } -.top div.hideIfTorOff h1 { +.top div.hideIfTorOff .heading1 { margin-top: 20px; } -.top h1 { - font-size: 4.00em; - font-weight: bold; +.top .heading1 { + font-size: 50px; + font-weight: 300; margin-bottom: 5px; } -.top h2 { - font-size: 2.934em; +.top .heading2 { + font-size: 15px; margin-bottom: 20px; - font-weight: normal; } -.top h3 { - font-size: 1.8em; - font-weight: normal; - color: #3B503C; +#bottom { + margin-top: 170px; } -#middle { - display: flex; - flex-flow: row wrap; - font-size: 1.6em; - justify-content: space-evenly; - margin-top: 40px; +#bottom p { + font-size: 10px; + text-align: start; + margin: auto; + padding-bottom: 20px; } -.bubble { - width: 242px; - padding: 20px 30px; - color: #3B503C; - background-color: #FFFFFF; - border: none; - border-radius: 16px; - margin-bottom: 40px; - text-align: start; - vertical-align: top; +@media only screen and (min-width: 900px) { + #bottom p { + margin: 0px 135px 0px 135px; + } } -#middle h1 { - font-size: 1.2em; - margin-bottom: 10px; +#bottom p:last-child { + padding-bottom: 0px; } -#middle ul { - padding: 5px 0 0 22px; +#bottom p.moreInfoLink { + font-size: 15px; } -#middle ul:dir(rtl) { - padding: 5px 22px 0 0; +.searchbox form { + width: 500px; + margin: 39px auto 0px auto; + text-align: left; } -#middle li { - padding-top: 2px; +@media only screen and (max-width: 540px) { + .searchbox form { + width: auto; + } } -#bottom { - padding-bottom: 40px; +.searchwrapper { + display: flex; + height: 46px; + border: 1px solid black; + border-radius: 8px; + background-color: white; } -#bottom p { - font-size: 1.6em; - text-align: start; - margin: auto; +.searchlabel { + height: auto; + width: 50px; + display: inline-block; + background: url('chrome://torbutton/skin/searchLogo.png') no-repeat center center; + background-size: 30px 30px; } -#bottom a { - color: #800080; - text-decoration: underline; +#search-button { + height: auto; + width: 36px; + border: 0; + background: url('chrome://torbutton/skin/forwardArrow.png') no-repeat center center; + background-size: 16px 14px; + cursor: pointer; } -#bottom a:hover { - color: #A000A0; - text-decoration: none; +#search-button:hover { + background-color: rgba(12, 12, 13, 0.1); /* same as Firefox's about:home */ } -#bottom h4 { - margin-top: 50px; - line-height: 1em; - font-size: 1em; - font-weight: normal; - text-align: center; +/* #search-text is the search input field */ +#search-text { + flex: 1; + border: none; + padding: 4px 2px 5px 2px; + margin: 0; + font-size: 15px; } -#bottom p.lang { - max-width: 620px; - margin: 10px auto; - font-size: 1em; - font-weight: normal; - text-align: center; +.onion-pattern-container { + margin: 0px auto; + width: 100%; + max-width: 1624px; /* room for 14 of the widest circles */ + overflow: hidden; } -.searchbox form { - width: 396px; - margin: 35px auto 1px auto; - text-align: left; +.onion-pattern-row { + width: 1624px; + display: flex; + flex-direction: row; + position: relative; } -.searchbox h4 { - padding-top: 5px; - font-size: 12px; - font-weight: normal; - text-align: center; +.onion-pattern-offset-row { + left: -40px; } -#sbutton { - display: block; - float: right; - width: 33px; +/* With borders, circles range in size from 100 x 100px to 116 x 116px. */ +.circle { + opacity: 0.2; + position: relative; + width: 100px; + height: 100px; + border-radius: 50%; } -#sbutton input { - height: 34px; - width: 33px; - border: 0; - background: url('chrome://torbutton/skin/search.png') no-repeat top left; - cursor: pointer; +.inner { + position: absolute; } -/* #sxw is the container div for the search field and button */ -#sxw { - border: none; +.inner:nth-child(1){ + transform: translate(calc(12.5% - 2px),calc(12.5% - 2px)); + width: calc(100% * 0.75); + height: calc(100% * 0.75); + border-radius: 50%; } -/* #sx is the search input (text) field */ -#sx { - border-color: lightgray; - border-style: solid; - border-width: 1px 0px 1px 1px; - width: 350px; - min-height: 23px; - padding: 4px 6px 5px 6px; - margin: 0; - outline: none; - color: #222; - font-size: 18px; +.inner:nth-child(2){ + transform: translate(calc(40% - 2px),calc(40% - 2px)); + width: calc(100% * 0.5); + height: calc(100% * 0.5); + border-radius: 50%; } -@media only screen and (min-width : 820px) { -.torcontent-container { - margin: auto; - margin-top: 40px; - max-width: 920px; - min-width: 920px; - } +.inner:nth-child(3){ + transform: translate(calc(108% - 2px),calc(108% - 2px)); + width: calc(100% * 0.25); + height: calc(100% * 0.25); + border-radius: 50%; +} - #torstatus-image { - display: block; - } +.solid { + background-color: #fff; +} - #bottom p { - margin: 10px 125px 0px 125px; - } +.border { + border: 4px solid #fff; } -@media only screen and (max-width : 436px) { - .searchbox form { - width: auto; - } +.dashed { + border: 4px dashed #fff; +} - #sx { - width: calc(100% - 46px); - } +.dotted { + border: 4px dotted #fff; +} + +.bold { + border: 8px solid #fff; +} + +.half { + width: 100px; + height: 50px; + border-radius: 50px 50px 0 0; } diff --git a/src/chrome/skin/forwardArrow.png b/src/chrome/skin/forwardArrow.png new file mode 100644 index 00000000..ceea950f Binary files /dev/null and b/src/chrome/skin/forwardArrow.png differ diff --git a/src/chrome/skin/onionArrow-extension.png b/src/chrome/skin/onionArrow-extension.png deleted file mode 100644 index 55ff2084..00000000 Binary files a/src/chrome/skin/onionArrow-extension.png and /dev/null differ diff --git a/src/chrome/skin/onionArrow-leftBend.png b/src/chrome/skin/onionArrow-leftBend.png deleted file mode 100644 index 9d1bb456..00000000 Binary files a/src/chrome/skin/onionArrow-leftBend.png and /dev/null differ diff --git a/src/chrome/skin/onionArrow-rightBend.png b/src/chrome/skin/onionArrow-rightBend.png deleted file mode 100644 index 6b60342d..00000000 Binary files a/src/chrome/skin/onionArrow-rightBend.png and /dev/null differ diff --git a/src/chrome/skin/onionArrow-short.png b/src/chrome/skin/onionArrow-short.png deleted file mode 100644 index 23e5a20e..00000000 Binary files a/src/chrome/skin/onionArrow-short.png and /dev/null differ diff --git a/src/chrome/skin/search.png b/src/chrome/skin/search.png deleted file mode 100644 index 698a77df..00000000 Binary files a/src/chrome/skin/search.png and /dev/null differ diff --git a/src/chrome/skin/searchLogo.png b/src/chrome/skin/searchLogo.png new file mode 100644 index 00000000..98ae319e Binary files /dev/null and b/src/chrome/skin/searchLogo.png differ diff --git a/src/chrome/skin/tor-off.png b/src/chrome/skin/tor-off.png deleted file mode 100644 index a4509ba5..00000000 Binary files a/src/chrome/skin/tor-off.png and /dev/null differ diff --git a/src/chrome/skin/tor-on.png b/src/chrome/skin/tor-on.png deleted file mode 100644 index 186fcf15..00000000 Binary files a/src/chrome/skin/tor-on.png and /dev/null differ diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index ab9b4bf4..43401ad0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -10,7 +10,6 @@ pref("extensions.torbutton.updateNeeded", false); // Tor check and proxy prefs pref("extensions.torbutton.test_enabled",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); -pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); pref("extensions.torbutton.local_tor_check",true); pref("extensions.torbutton.versioncheck_url","https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true);

1 0

[tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 26514 - intermittent updater failures on Win64 (Error 19)
by gk＠torproject.org 14 Aug '18

14 Aug '18

commit c2720b2274e51eb76b91e5f6a5f2a82bdfaf8013 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Aug 13 12:13:40 2018 -0400 Bug 26514 - intermittent updater failures on Win64 (Error 19) Avoid MinGW's _ftelli64() and _fseeki64() implementations because they are unreliable. --- modules/libmar/src/mar_private.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/libmar/src/mar_private.h b/modules/libmar/src/mar_private.h index e0c263271ed0..358026fbcf50 100644 --- a/modules/libmar/src/mar_private.h +++ b/modules/libmar/src/mar_private.h @@ -55,8 +55,15 @@ MOZ_STATIC_ASSERT(sizeof(BLOCKSIZE) < \ instead of the NSPR equivalents. */ #ifdef XP_WIN #include <winsock2.h> +#ifdef __MINGW32__ +/* Avoid MinGW's _ftelli64() and _fseeki64() implementations because they + * are unreliable. See bug #26514. */ +#define ftello ftello64 +#define fseeko fseeko64 +#else #define ftello _ftelli64 #define fseeko _fseeki64 +#endif #else #define _FILE_OFFSET_BITS 64 #include <netinet/in.h>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

tbb-commits August 2018