September 2018 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-60.2.0esr-8.0-1] Bug 26146: Spoof HTTP User-Agent header for desktop platforms
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 62d76b2381c1df0b893336f496ae4ffe161d592f Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 14 10:02:17 2018 -0400 Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. --- browser/app/profile/000-tor-browser.js | 1 - dom/base/Navigator.cpp | 13 +++++++++++++ netwerk/protocol/http/nsHttpHandler.cpp | 2 +- toolkit/components/resistfingerprinting/nsRFPService.cpp | 5 +++-- toolkit/components/resistfingerprinting/nsRFPService.h | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d9e609a71eb8..7b602c13e0d5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -122,7 +122,6 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index c2ec1f7081a3..33563ad65ccb 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1772,6 +1772,19 @@ Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, } } + // When the caller is content and 'privacy.resistFingerprinting' is true, + // return a spoofed userAgent which reveals the platform but not the + // specific OS version, etc. + if (!aIsCallerChrome && nsContentUtils::ShouldResistFingerprinting()) { + nsAutoCString spoofedUA; + nsresult rv = nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + CopyASCIItoUTF16(spoofedUA, aUserAgent); + return NS_OK; + } + nsresult rv; nsCOMPtr<nsIHttpProtocolHandler> service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index f7f449868711..18f942c216fb 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -491,7 +491,7 @@ nsHttpHandler::Init() } // Generating the spoofed User Agent for fingerprinting resistance. - rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); + rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); if (NS_FAILED(rv)) { // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string // will not be used anywhere. diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp index f560ce27f228..595e6556a27e 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp +++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -666,7 +666,7 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t /* static */ nsresult -nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) +nsRFPService::GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be @@ -703,9 +703,10 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) // Except we used 60 as an ESR instead of 59. // We infer the last and closest ESR version based on this rule. uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7); + const char *spoofedOS = isForHTTPHeader ? SPOOFED_HTTP_UA_OS : SPOOFED_UA_OS; userAgent.Assign(nsPrintfCString( "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0", - SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); + spoofedOS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); return rv; } diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index 9708d362496f..da79da8de948 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -48,6 +48,14 @@ #define SPOOFED_APPNAME "Netscape" #define LEGACY_BUILD_ID "20100101" +// For the HTTP User-Agent header, we use a simpler set of spoofed values +// that do not reveal the specific desktop platform. +#if defined(MOZ_WIDGET_ANDROID) +#define SPOOFED_HTTP_UA_OS "Android 6.0; Mobile" +#else +#define SPOOFED_HTTP_UA_OS "Windows NT 6.1" +#endif + // Forward declare LRUCache, defined in nsRFPService.cpp class LRUCache; @@ -212,7 +220,7 @@ public: static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight); // This method generates the spoofed value of User Agent. - static nsresult GetSpoofedUserAgent(nsACString &userAgent); + static nsresult GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader); /** * This method for getting spoofed modifier states for the given keyboard event.

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] Bug 26146: Spoof HTTP User-Agent header for desktop platforms
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 165031359d2db55af85cab32713860bb6a026483 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Sep 14 10:02:17 2018 -0400 Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. --- browser/app/profile/000-tor-browser.js | 1 - dom/base/Navigator.cpp | 13 +++++++++++++ netwerk/protocol/http/nsHttpHandler.cpp | 2 +- toolkit/components/resistfingerprinting/nsRFPService.cpp | 5 +++-- toolkit/components/resistfingerprinting/nsRFPService.h | 10 +++++++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d9e609a71eb8..7b602c13e0d5 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -122,7 +122,6 @@ pref("general.appname.override", "Netscape"); pref("general.appversion.override", "5.0 (Windows)"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:60.0) Gecko/20100101 Firefox/60.0"); pref("general.productSub.override", "20100101"); pref("general.buildID.override", "20100101"); pref("browser.startup.homepage_override.buildID", "20100101"); diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index c2ec1f7081a3..33563ad65ccb 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1772,6 +1772,19 @@ Navigator::GetUserAgent(nsPIDOMWindowInner* aWindow, } } + // When the caller is content and 'privacy.resistFingerprinting' is true, + // return a spoofed userAgent which reveals the platform but not the + // specific OS version, etc. + if (!aIsCallerChrome && nsContentUtils::ShouldResistFingerprinting()) { + nsAutoCString spoofedUA; + nsresult rv = nsRFPService::GetSpoofedUserAgent(spoofedUA, false); + if (NS_WARN_IF(NS_FAILED(rv))) { + return rv; + } + CopyASCIItoUTF16(spoofedUA, aUserAgent); + return NS_OK; + } + nsresult rv; nsCOMPtr<nsIHttpProtocolHandler> service(do_GetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &rv)); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index f7f449868711..18f942c216fb 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -491,7 +491,7 @@ nsHttpHandler::Init() } // Generating the spoofed User Agent for fingerprinting resistance. - rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent); + rv = nsRFPService::GetSpoofedUserAgent(mSpoofedUserAgent, true); if (NS_FAILED(rv)) { // Empty mSpoofedUserAgent to make sure the unsuccessful spoofed UA string // will not be used anywhere. diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp index f560ce27f228..595e6556a27e 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp +++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -666,7 +666,7 @@ nsRFPService::GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t /* static */ nsresult -nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) +nsRFPService::GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader) { // This function generates the spoofed value of User Agent. // We spoof the values of the platform and Firefox version, which could be @@ -703,9 +703,10 @@ nsRFPService::GetSpoofedUserAgent(nsACString &userAgent) // Except we used 60 as an ESR instead of 59. // We infer the last and closest ESR version based on this rule. uint32_t spoofedVersion = firefoxVersion - ((firefoxVersion - 4) % 7); + const char *spoofedOS = isForHTTPHeader ? SPOOFED_HTTP_UA_OS : SPOOFED_UA_OS; userAgent.Assign(nsPrintfCString( "Mozilla/5.0 (%s; rv:%d.0) Gecko/%s Firefox/%d.0", - SPOOFED_UA_OS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); + spoofedOS, spoofedVersion, LEGACY_BUILD_ID, spoofedVersion)); return rv; } diff --git a/toolkit/components/resistfingerprinting/nsRFPService.h b/toolkit/components/resistfingerprinting/nsRFPService.h index 9708d362496f..da79da8de948 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.h +++ b/toolkit/components/resistfingerprinting/nsRFPService.h @@ -48,6 +48,14 @@ #define SPOOFED_APPNAME "Netscape" #define LEGACY_BUILD_ID "20100101" +// For the HTTP User-Agent header, we use a simpler set of spoofed values +// that do not reveal the specific desktop platform. +#if defined(MOZ_WIDGET_ANDROID) +#define SPOOFED_HTTP_UA_OS "Android 6.0; Mobile" +#else +#define SPOOFED_HTTP_UA_OS "Windows NT 6.1" +#endif + // Forward declare LRUCache, defined in nsRFPService.cpp class LRUCache; @@ -212,7 +220,7 @@ public: static uint32_t GetSpoofedPresentedFrames(double aTime, uint32_t aWidth, uint32_t aHeight); // This method generates the spoofed value of User Agent. - static nsresult GetSpoofedUserAgent(nsACString &userAgent); + static nsresult GetSpoofedUserAgent(nsACString &userAgent, bool isForHTTPHeader); /** * This method for getting spoofed modifier states for the given keyboard event.

1 0

[tor-browser-build/maint-8.0] Bug 26556: Fix broken Tor Browser icon path on Linux
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit eb6a0da7fc417f7f0b42c99a072e18056c8c40dc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 13 09:42:11 2018 +0000 Bug 26556: Fix broken Tor Browser icon path on Linux --- projects/tor-browser/RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 722caa5..474360b 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -240,7 +240,7 @@ fi # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-tor-browser.desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" --detach || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop if [ "$register_desktop_app" -eq 1 ]; then

1 0

[tor-browser-build/master] Bug 26556: Fix broken Tor Browser icon path on Linux
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 5d99870ce97b06252c393c12f0c4d2bcf326d6c3 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Sep 13 09:42:11 2018 +0000 Bug 26556: Fix broken Tor Browser icon path on Linux --- projects/tor-browser/RelativeLink/start-tor-browser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/RelativeLink/start-tor-browser b/projects/tor-browser/RelativeLink/start-tor-browser index 722caa5..474360b 100755 --- a/projects/tor-browser/RelativeLink/start-tor-browser +++ b/projects/tor-browser/RelativeLink/start-tor-browser @@ -240,7 +240,7 @@ fi # canonical version if it was changed by the updater. cp start-tor-browser.desktop ../ sed -i -e "s,^Name=.*,Name=Tor Browser,g" ../start-tor-browser.desktop -sed -i -e "s,^Icon=.*,Icon=$PWD/browser/icons/mozicon128.png,g" ../start-tor-browser.desktop +sed -i -e "s,^Icon=.*,Icon=$PWD/browser/chrome/icons/default/default128.png,g" ../start-tor-browser.desktop sed -i -e "s,^Exec=.*,Exec=sh -c '\"$PWD/start-tor-browser\" --detach || ([ ! -x \"$PWD/start-tor-browser\" ] \&\& \"\$(dirname \"\$*\")\"/Browser/start-tor-browser --detach)' dummy %k,g" ../start-tor-browser.desktop if [ "$register_desktop_app" -eq 1 ]; then

1 0

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

14 Sep '18

commit 32b4b24c4cf56b9e88c7aae60c1db5affabd99b1 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 13:44:31 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 27535 and enables the TLS 1.3 draft version included in ESR60. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b7c2ff8207f2..d9e609a71eb8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -293,9 +293,6 @@ pref("media.audio_data.enabled", false); // Patch written by Jeff Gibat (iSEC). pref("network.jar.block-remote-files", true); -// Enable TLS 1.1 and 1.2: -// https://trac.torproject.org/projects/tor/ticket/11253 -pref("security.tls.version.max", 3); // Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: // https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ pref("security.tls.unrestricted_rc4_fallback", false);

1 0

[tor-browser/tor-browser-60.2.0esr-8.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit dc3519d999329f06042409786568e8e871503a92 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Sep 12 13:44:31 2018 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. This fixes bug 27535 and enables the TLS 1.3 draft version included in ESR60. --- browser/app/profile/000-tor-browser.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index b7c2ff8207f2..d9e609a71eb8 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -293,9 +293,6 @@ pref("media.audio_data.enabled", false); // Patch written by Jeff Gibat (iSEC). pref("network.jar.block-remote-files", true); -// Enable TLS 1.1 and 1.2: -// https://trac.torproject.org/projects/tor/ticket/11253 -pref("security.tls.version.max", 3); // Disable RC4 fallback. This will go live in Firefox 44, Chrome and IE/Edge: // https://blog.mozilla.org/security/2015/09/11/deprecating-the-rc4-cipher/ pref("security.tls.unrestricted_rc4_fallback", false);

1 0

[tor-launcher/master] Bug 27469: Adapt Moat URLs
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 1db5a1ccddffe78c6b1ff242acfa628d9e9823e0 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 11 13:52:41 2018 +0000 Bug 27469: Adapt Moat URLs --- src/defaults/preferences/prefs.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/defaults/preferences/prefs.js b/src/defaults/preferences/prefs.js index dcddb1b..cc6b1a7 100644 --- a/src/defaults/preferences/prefs.js +++ b/src/defaults/preferences/prefs.js @@ -47,8 +47,8 @@ pref("extensions.torlauncher.tordatadir_path", ""); // BridgeDB-related preferences (used for Moat). pref("extensions.torlauncher.bridgedb_front", "ajax.aspnetcdn.com"); -pref("extensions.torlauncher.bridgedb_reflector", "https://onionquiche.azureedge.net/"); -pref("extensions.torlauncher.moat_service", "https://moat.onionlab.eu/moat"); +pref("extensions.torlauncher.bridgedb_reflector", "https://onion.azureedge.net/"); +pref("extensions.torlauncher.moat_service", "https://bridges.torproject.org/moat"); pref("extensions.torlauncher.bridgedb_bridge_type", "obfs4"); // Recommended default bridge type (can be set per localized bundle).

1 0

[torbutton/master] Bug 27558: Update the link to "Your Guard note may not change" text
by gk＠torproject.org 14 Sep '18

14 Sep '18

commit 6cf83b818025b0f941c92904d17e914cdf61ee2f Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Fri Sep 7 18:59:45 2018 -0400 Bug 27558: Update the link to "Your Guard note may not change" text --- src/chrome/content/tor-circuit-display.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index fe6b51c1..bbabe1c8 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -386,7 +386,7 @@ let setupGuardNote = function () { ["div", {}, noteBefore, ["span", {class: "circuit-guard-name"}, name], noteAfter, " ", - ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/${localeCode}');`, + ["span", {onclick: `gBrowser.selectedTab = gBrowser.addTab('https://support.torproject.org/${localeCode}/tbb/tbb-2/');`, class: "circuit-link"}, learnMoreString]]); };

1 0

[torbutton/master] Bug 27478: Torbutton icons for dark theme
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 9156c5564a5da6bd8e17eab094d655034e4135b6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 02:18:41 2018 -0700 Bug 27478: Torbutton icons for dark theme --- src/chrome/skin/torbutton-dark-update-needed.svg | 13 +++++++++++++ src/chrome/skin/torbutton-dark.svg | 9 +++++++++ src/chrome/skin/torbutton.css | 15 +++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/src/chrome/skin/torbutton-dark-update-needed.svg b/src/chrome/skin/torbutton-dark-update-needed.svg new file mode 100644 index 00000000..44df4a00 --- /dev/null +++ b/src/chrome/skin/torbutton-dark-update-needed.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-Update---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" fill="#F9F9FA" fill-opacity="0.8"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 Z" id="Half-Content"></path> + </g> + <g id="!" transform="translate(0.000000, 6.100000)"> + <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> + <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton-dark.svg b/src/chrome/skin/torbutton-dark.svg new file mode 100644 index 00000000..55d633e8 --- /dev/null +++ b/src/chrome/skin/torbutton-dark.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> + <g id="Tor-Button-Icon" fill="#F9F9FA"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index cf90ae6d..928ba93d 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -6,10 +6,21 @@ list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } } +@keyframes blink-update-dark { + 0% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark-update-needed.svg"); + } + 100% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); + } +} #torbutton-button { list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } +toolbar[brighttext] #torbutton-button { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); +} #torbutton-button[tbstatus="on"] { opacity: 1.0; } @@ -20,6 +31,10 @@ opacity: 1.0; animation: blink-update normal 1s infinite ease-in-out; } +toolbar[brighttext] #torbutton-button[tbUpdateNeeded="true"] { + opacity: 1.0; + animation: blink-update-dark normal 1s infinite ease-in-out; +} #torbutton-button-tb { list-style-image: url("chrome://torbutton/skin/torbutton.svg");

1 0

[torbutton/master] Bug 27506: Move status version to UL corner for RTL locales
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 2754f4d06268c18e9121de41e436335a6946efc5 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 00:24:00 2018 -0700 Bug 27506: Move status version to UL corner for RTL locales We use both offset-inline-end and inset-inline-end because the former is supported in Firefox 60 and the latter is supported in Firefox 63 and later. --- src/chrome/skin/aboutTor.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chrome/skin/aboutTor.css b/src/chrome/skin/aboutTor.css index c402bbed..2e6bab75 100644 --- a/src/chrome/skin/aboutTor.css +++ b/src/chrome/skin/aboutTor.css @@ -58,12 +58,13 @@ body:not([initialized]) { #torstatus-version { position: absolute; top: 6px; - right: 6px; + offset-inline-end: 6px; + inset-inline-end: 6px; height: 30px; width: 200px; font-size: 15px; white-space: pre-wrap; - text-align: right; + text-align: end; } a {

1 0