July 2021 - tor-commits - lists.torproject.org

[translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
by translation＠torproject.org 23 Jul '21

23 Jul '21

commit 03fa6bb19171978be0b52bc32bd0970ba7ae5368 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 23 08:15:53 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-mess… --- cs/messages.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cs/messages.json b/cs/messages.json index c91d5baa1e..b8761752b8 100644 --- a/cs/messages.json +++ b/cs/messages.json @@ -39,13 +39,13 @@ "message": "Snowflake je systém pro obcházení cenzury internetu. Lidé, kteří jsou cenzurováni, jej mohou použít pro přístup k internetu. Jejich spojení je vedeno přes proxy servery Snowflaku, které jsou provozované dobrovolníky. Podrobnější informace, jak Snowflake funguje, najdete na <a href=\"https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow…">naší wiki</a>." }, "browser": { - "message": "Use Snowflake" + "message": "Použít Snowflake" }, "censoredUsers": { "message": "Pokud je váš přístup k internetu cenzurován, stáhněte si\n<a href=\"https://www.torproject.org/download/\">Prohlížeč Tor</a>." }, "extension": { - "message": "Run a Proxy" + "message": "Spustit proxy" }, "installExtension": { "message": "Pokud vaše připojení k internetu <strong>není</strong> cenzurované, zvažte instalaci rozšíření Snowflake, které pomůže uživatelům, kteří s cenzurou bojovat musí. Nemusíte se strachovat, jaké stránky lidé skrze Snowflake navštěvují. IP adresa, kterou servery uvidí, bude odpovídat IP adrese koncového uzlu, nikoliv vaší." @@ -57,7 +57,7 @@ "message": "Nainstalovat do Chromu" }, "installStandalone": { - "message": "If you would like to run a command-line version of the Snowflake proxy on your desktop or server, see our <a href=\"https://community.torproject.org/relay/setup/snowflake/standalone/\">community documentation</a> for running a standalone Snowflake proxy." + "message": "Pokud chcete na svém počítači nebo serveru spustit verzi proxy serveru Snowflake pro příkazový řádek, podívejte se do naší <a href=\"https://community.torproject.org/relay/setup/snowflake/standalone/\">komunitní dokumentace</a> pro spuštění standalone proxy serveru Snowflake." }, "reportingBugs": { "message": "Hlášení chyb"

1 0

[newsletter/master] fix typo in the newsletter signup form
by arma＠torproject.org 23 Jul '21

23 Jul '21

commit a07c4cac064c0f034098327e9c913a43b3f3f13e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jul 22 21:12:24 2021 -0400 fix typo in the newsletter signup form --- templates/intro.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/intro.html b/templates/intro.html index 50e3e64..60a77f5 100644 --- a/templates/intro.html +++ b/templates/intro.html @@ -44,7 +44,7 @@ </div> <div class="form-group row"> <div class="col-sm-6 captcha"> - <input id="captcha" type="text" class="form-control form-control-lg form-required" data-name="captcha" data-stripe="captcha" aria-label="captcha" name="captcha" size="4" placeholder="* Enter the 4 letters (case insenstive) that appear below"> + <input id="captcha" type="text" class="form-control form-control-lg form-required" data-name="captcha" data-stripe="captcha" aria-label="captcha" name="captcha" size="4" placeholder="* Enter the 4 letters (case insensitive) that appear below"> <img src="https://donate-api.torproject.org/captcha" border="0" /> </div> </div>

1 0

[tpo/master] Update Tor people page
by gus＠torproject.org 23 Jul '21

23 Jul '21

commit ec45fa7cca9107d53dba10be320ad1dd96219048 Author: gus <gus(a)torproject.org> Date: Thu Jul 22 20:54:55 2021 -0300 Update Tor people page --- content/about/people/acat/contents.lr | 15 --------------- content/about/people/mrphs/contents.lr | 17 ----------------- content/about/people/ssteele-core/contents.lr | 21 --------------------- 3 files changed, 53 deletions(-) diff --git a/content/about/people/acat/contents.lr b/content/about/people/acat/contents.lr deleted file mode 100644 index ade319b0..00000000 --- a/content/about/people/acat/contents.lr +++ /dev/null @@ -1,15 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role: core ---- -name: Alex Catarineu ---- -pronoun: he ---- -nickname: acat ---- -description: - -Works on Tor Browser diff --git a/content/about/people/mrphs/contents.lr b/content/about/people/mrphs/contents.lr deleted file mode 100644 index 0d8ee831..00000000 --- a/content/about/people/mrphs/contents.lr +++ /dev/null @@ -1,17 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role:core ---- -name: Nima Fatemi ---- -nickname: mrphs ---- -twitter_handle: mrphs ---- -gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=E745A4CC726A94229B2B2DEE… ---- -description: - -His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services. diff --git a/content/about/people/ssteele-core/contents.lr b/content/about/people/ssteele-core/contents.lr deleted file mode 100644 index 09af9d20..00000000 --- a/content/about/people/ssteele-core/contents.lr +++ /dev/null @@ -1,21 +0,0 @@ -_model: person ---- -_hidden: yes ---- -role:core ---- -name: Shari Steele ---- -nickname: ssteele ---- -pronoun: she ---- -twitter_handle: ssteele1234 ---- -gpg: /static/keys/ssteele.txt ---- -image: /static/images/people/ssteele.png ---- -description: - -Shari Steele is on the board of directors for the Tor Project.

1 0

[tpo/master] Add Blockchair and DEF CON to membership program page
by gus＠torproject.org 23 Jul '21

23 Jul '21

commit 057c2370e88355208c397157c3f38fbbd7de63fc Author: gus <gus(a)torproject.org> Date: Thu Jul 22 20:44:56 2021 -0300 Add Blockchair and DEF CON to membership program page --- templates/membership.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/membership.html b/templates/membership.html index 56f487d2..80b42957 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -115,9 +115,15 @@ <p><a href="https://www.goblank.io/" title="Blank" target="_blank">Blank</a></p> </li> <li class="list-group-item px-0"> + <p><a href="https://blockchair.com/" title="Blockchair" target="_blank">Blockchair</a></p> + </li> + <li class="list-group-item px-0"> <p><a href="https://brave.com" title="Brave" target="_blank">Brave</a></p> </li> <li class="list-group-item px-0"> + <p><a href="https://defcon.org/" title="DEF CON" target="_blank">DEF CON</a></p> + </li> + <li class="list-group-item px-0"> <p><a href="https://duckduckgo.com" title="DuckDuckGo" target="_blank">DuckDuckGo</a></p> </li> <li class="list-group-item px-0">

1 0

[tpo/master] Merge remote-tracking branch 'gitlab-gus/add-ford-foundation'
by gus＠torproject.org 23 Jul '21

23 Jul '21

commit 46638b12c23c074eb76b8be76ba88621338dd1aa Merge: 7a28e2da c3ad43fb Author: gus <gus(a)torproject.org> Date: Thu Jul 22 20:00:01 2021 -0300 Merge remote-tracking branch 'gitlab-gus/add-ford-foundation' assets/static/images/sponsors/ford_logo.png | Bin 0 -> 42297 bytes content/about/sponsors/ford/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+)

1 0

[tpo/master] Add Ford Foundation to sponsors page. Closes #212
by gus＠torproject.org 23 Jul '21

23 Jul '21

commit c3ad43fbcf57ca707984a45f1ce15122ae07e1cb Author: gus <gus(a)torproject.org> Date: Thu Jul 22 19:47:54 2021 -0300 Add Ford Foundation to sponsors page. Closes #212 --- assets/static/images/sponsors/ford_logo.png | Bin 0 -> 42297 bytes content/about/sponsors/ford/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/ford_logo.png b/assets/static/images/sponsors/ford_logo.png new file mode 100644 index 00000000..6498befd Binary files /dev/null and b/assets/static/images/sponsors/ford_logo.png differ diff --git a/content/about/sponsors/ford/contents.lr b/content/about/sponsors/ford/contents.lr new file mode 100644 index 00000000..9f59055c --- /dev/null +++ b/content/about/sponsors/ford/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: true +--- +time: 2021 +--- +name: Ford Foundation +--- +key: 27 +--- +logo: /static/images/sponsors/ford_logo.png +--- +_hidden: yes +--- +link: https://www.fordfoundation.org/ +--- +description: +The Ford Foundation is an independent, nonprofit grant-making organization. For more than 80 years it has worked with courageous people on the frontlines of social change worldwide, guided by its mission to strengthen democratic values, reduce poverty and injustice, promote international cooperation, and advance human achievement. +The Ford Foundation has made a general support grant to the Tor Project.

1 0

[tor-browser/tor-browser-91.0b5-11.0-1] Bug 28369: Stop shipping pingsender executable
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit f28eec32018c76fce67701f5d747b7daded64199 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 10 17:52:51 2019 +0200 Bug 28369: Stop shipping pingsender executable --- browser/app/macbuild/Contents/MacOS-files.in | 1 - browser/installer/package-manifest.in | 4 ---- browser/installer/windows/nsis/shared.nsh | 1 - python/mozbuild/mozbuild/artifacts.py | 2 -- toolkit/components/telemetry/app/TelemetrySend.jsm | 19 +------------------ toolkit/components/telemetry/moz.build | 4 ---- 6 files changed, 1 insertion(+), 30 deletions(-) diff --git a/browser/app/macbuild/Contents/MacOS-files.in b/browser/app/macbuild/Contents/MacOS-files.in index 6f0b4481473b..6e8a1689ea19 100644 --- a/browser/app/macbuild/Contents/MacOS-files.in +++ b/browser/app/macbuild/Contents/MacOS-files.in @@ -17,7 +17,6 @@ #if defined(MOZ_CRASHREPORTER) /minidump-analyzer #endif -/pingsender /pk12util /ssltunnel /xpcshell diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index c99a2a1066c2..0c21997c50f5 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -439,10 +439,6 @@ bin/libfreebl_64int_3.so @BINPATH@/minidump-analyzer@BIN_SUFFIX@ #endif -; [ Ping Sender ] -; -@BINPATH@/pingsender@BIN_SUFFIX@ - ; Shutdown Terminator @RESPATH@/components/terminator.manifest diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh index beeb67211e47..7439ffd33e3e 100755 --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -1478,7 +1478,6 @@ ${RemoveDefaultBrowserAgentShortcut} Push "crashreporter.exe" Push "default-browser-agent.exe" Push "minidump-analyzer.exe" - Push "pingsender.exe" Push "updater.exe" Push "mozwer.dll" Push "${FileMainEXE}" diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index fb563cb8b882..d00b56e17892 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -495,7 +495,6 @@ class LinuxArtifactJob(ArtifactJob): "{product}/{product}", "{product}/{product}-bin", "{product}/minidump-analyzer", - "{product}/pingsender", "{product}/plugin-container", "{product}/updater", "{product}/**/*.so", @@ -550,7 +549,6 @@ class MacArtifactJob(ArtifactJob): "{product}-bin", "*.dylib", "minidump-analyzer", - "pingsender", "plugin-container.app/Contents/MacOS/plugin-container", "updater.app/Contents/MacOS/org.mozilla.updater", # 'xpcshell', diff --git a/toolkit/components/telemetry/app/TelemetrySend.jsm b/toolkit/components/telemetry/app/TelemetrySend.jsm index 0da39d85ad33..c87a281019e4 100644 --- a/toolkit/components/telemetry/app/TelemetrySend.jsm +++ b/toolkit/components/telemetry/app/TelemetrySend.jsm @@ -1595,23 +1595,6 @@ var TelemetrySendImpl = { }, runPingSender(pings, observer) { - if (AppConstants.platform === "android") { - throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); - } - - const exeName = - AppConstants.platform === "win" ? "pingsender.exe" : "pingsender"; - - let exe = Services.dirsvc.get("GreBinD", Ci.nsIFile); - exe.append(exeName); - - let params = pings.flatMap(ping => [ping.url, ping.path]); - let process = Cc["@mozilla.org/process/util;1"].createInstance( - Ci.nsIProcess - ); - process.init(exe); - process.startHidden = true; - process.noShell = true; - process.runAsync(params, params.length, observer); + throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); }, }; diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index 3eee4e938c4e..cedf9b313d9c 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -8,10 +8,6 @@ include("/ipc/chromium/chromium-config.mozbuild") FINAL_LIBRARY = "xul" -DIRS = [ - "pingsender", -] - DEFINES["MOZ_APP_VERSION"] = '"%s"' % CONFIG["MOZ_APP_VERSION"] LOCAL_INCLUDES += [

1 0

[tor-browser/tor-browser-91.0b5-11.0-1] Bug 21431: Clean-up system extensions shipped in Firefox
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 0e87b0bdcf6bcadc7eb47cfccaababcb03a7bbb1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue May 23 17:05:29 2017 -0400 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. --- browser/components/BrowserGlue.jsm | 6 ++++++ browser/extensions/moz.build | 9 +-------- browser/installer/package-manifest.in | 1 - browser/locales/Makefile.in | 8 -------- browser/locales/jar.mn | 7 ------- 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 3beb2da3ce52..7c3a7ace3ae9 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1967,6 +1967,9 @@ BrowserGlue.prototype = { const ID = "screenshots(a)mozilla.org"; const _checkScreenshotsPref = async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let disabled = Services.prefs.getBoolPref(PREF, false); if (disabled) { await addon.disable({ allowSystemAddons: true }); @@ -1983,6 +1986,9 @@ BrowserGlue.prototype = { const ID = "webcompat-reporter(a)mozilla.org"; Services.prefs.addObserver(PREF, async () => { let addon = await AddonManager.getAddonByID(ID); + if (!addon) { + return; + } let enabled = Services.prefs.getBoolPref(PREF, false); if (enabled && !addon.isActive) { await addon.enable({ allowSystemAddons: true }); diff --git a/browser/extensions/moz.build b/browser/extensions/moz.build index fa60184daea8..72a9c9e9a636 100644 --- a/browser/extensions/moz.build +++ b/browser/extensions/moz.build @@ -4,14 +4,7 @@ # 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/. -DIRS += [ - "doh-rollout", - "formautofill", - "screenshots", - "webcompat", - "report-site-issue", - "pictureinpicture", -] +DIRS += [] if CONFIG["NIGHTLY_BUILD"]: DIRS += [ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index 0b0b65a6f932..c99a2a1066c2 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -259,7 +259,6 @@ @RESPATH@/browser/chrome/icons/default/default64.png @RESPATH@/browser/chrome/icons/default/default128.png #endif -@RESPATH@/browser/features/* ; [DevTools Startup Files] @RESPATH@/browser/chrome/devtools-startup@JAREXT@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in index 496379c4306f..0946188813da 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in @@ -58,10 +58,6 @@ l10n-%: @$(MAKE) -C ../../toolkit/locales l10n-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* -ifneq (,$(wildcard ../extensions/formautofill/locales)) - @$(MAKE) -C ../extensions/formautofill/locales AB_CD=$* XPI_NAME=locale-$* -endif - @$(MAKE) -C ../extensions/report-site-issue/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../devtools/client/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) -C ../../devtools/startup/locales AB_CD=$* XPI_NAME=locale-$* XPI_ROOT_APPID='$(XPI_ROOT_APPID)' @$(MAKE) l10n AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @@ -75,14 +71,10 @@ chrome-%: @$(MAKE) -C ../../toolkit/locales chrome-$* @$(MAKE) -C ../../services/sync/locales chrome AB_CD=$* @$(MAKE) -C ../../extensions/spellcheck/locales chrome AB_CD=$* -ifneq (,$(wildcard ../extensions/formautofill/locales)) - @$(MAKE) -C ../extensions/formautofill/locales chrome AB_CD=$* -endif @$(MAKE) -C ../../devtools/client/locales chrome AB_CD=$* @$(MAKE) -C ../../devtools/startup/locales chrome AB_CD=$* @$(MAKE) chrome AB_CD=$* @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales chrome AB_CD=$* - @$(MAKE) -C ../extensions/report-site-issue/locales chrome AB_CD=$* package-win32-installer: $(SUBMAKEFILES) $(MAKE) -C ../installer/windows CONFIG_DIR=l10ngen ZIP_IN='$(ZIP_OUT)' installer diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn index c6fdccea7d70..90bc7a0d4757 100644 --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn @@ -48,10 +48,3 @@ # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) locale/browser/appstrings.properties (%chrome/overrides/appstrings.properties) - -#ifdef XPI_NAME -# Bug 1240628, restructure how l10n repacks work with feature addons -# This is hacky, but ensures the chrome.manifest chain is complete -[.] chrome.jar: -% manifest features/chrome.manifest -#endif

1 0

[tor-browser/tor-browser-91.0b5-11.0-1] Bug 26353: Prevent speculative connect that violated FPI.
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit cbf15188a8ba9a411b77c7e1dc9a7482b4fcb3f4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jul 14 08:50:55 2018 -0700 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. --- toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm index 5d46b1dd8e3b..5a1f8075d1e7 100644 --- a/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm +++ b/toolkit/components/remotebrowserutils/RemoteWebNavigation.jsm @@ -95,6 +95,9 @@ class RemoteWebNavigation { } uri = Services.uriFixup.getFixupURIInfo(aURI, fixupFlags).preferredURI; +/******************************************************************************* + TOR BROWSER: Disable the following speculative connect until + we can make it properly obey first-party isolation. // We know the url is going to be loaded, let's start requesting network // connection before the content process asks. @@ -118,6 +121,7 @@ class RemoteWebNavigation { } Services.io.speculativeConnect(uri, principal, null); } +*******************************************************************************/ } catch (ex) { // Can't setup speculative connection for this uri string for some // reason (such as failing to parse the URI), just ignore it.

1 0

[tor-browser/tor-browser-91.0b5-11.0-1] Bug 23104: Add a default line height compensation
by sysrqb＠torproject.org 22 Jul '21

22 Jul '21

commit 572acbc2c21f282cd5f43c66d9b492d0f4b735c5 Author: Igor Oliveira <igor.oliveira(a)posteo.net> Date: Sun Dec 10 18:16:59 2017 -0200 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. --- layout/generic/ReflowInput.cpp | 19 +++++++++--- layout/generic/test/mochitest.ini | 1 + layout/generic/test/test_tor_bug23104.html | 50 ++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) diff --git a/layout/generic/ReflowInput.cpp b/layout/generic/ReflowInput.cpp index 2c56afd2e02a..4d30c7762c14 100644 --- a/layout/generic/ReflowInput.cpp +++ b/layout/generic/ReflowInput.cpp @@ -31,6 +31,7 @@ #include "mozilla/SVGUtils.h" #include "mozilla/dom/HTMLInputElement.h" #include "nsGridContainerFrame.h" +#include "nsContentUtils.h" using namespace mozilla; using namespace mozilla::css; @@ -2642,7 +2643,8 @@ void ReflowInput::CalculateBlockSideMargins() { // For risk management, we use preference to control the behavior, and // eNoExternalLeading is the old behavior. -static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) { +static nscoord GetNormalLineHeight(nsIContent* aContent, + nsFontMetrics* aFontMetrics) { MOZ_ASSERT(nullptr != aFontMetrics, "no font metrics"); nscoord normalLineHeight; @@ -2650,6 +2652,12 @@ static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) { nscoord externalLeading = aFontMetrics->ExternalLeading(); nscoord internalLeading = aFontMetrics->InternalLeading(); nscoord emHeight = aFontMetrics->EmHeight(); + + if (nsContentUtils::ShouldResistFingerprinting() && + !aContent->IsInChromeDocument()) { + return NSToCoordRound(emHeight * NORMAL_LINE_HEIGHT_FACTOR); + } + switch (GetNormalLineHeightCalcControl()) { case eIncludeExternalLeading: normalLineHeight = emHeight + internalLeading + externalLeading; @@ -2667,7 +2675,8 @@ static nscoord GetNormalLineHeight(nsFontMetrics* aFontMetrics) { return normalLineHeight; } -static inline nscoord ComputeLineHeight(ComputedStyle* aComputedStyle, +static inline nscoord ComputeLineHeight(nsIContent* aContent, + ComputedStyle* aComputedStyle, nsPresContext* aPresContext, nscoord aBlockBSize, float aFontSizeInflation) { @@ -2696,7 +2705,7 @@ static inline nscoord ComputeLineHeight(ComputedStyle* aComputedStyle, RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetFontMetricsForComputedStyle( aComputedStyle, aPresContext, aFontSizeInflation); - return GetNormalLineHeight(fm); + return GetNormalLineHeight(aContent, fm); } nscoord ReflowInput::CalcLineHeight() const { @@ -2718,7 +2727,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent, float aFontSizeInflation) { MOZ_ASSERT(aComputedStyle, "Must have a ComputedStyle"); - nscoord lineHeight = ComputeLineHeight(aComputedStyle, aPresContext, + nscoord lineHeight = ComputeLineHeight(aContent, aComputedStyle, aPresContext, aBlockBSize, aFontSizeInflation); NS_ASSERTION(lineHeight >= 0, "ComputeLineHeight screwed up"); @@ -2731,7 +2740,7 @@ nscoord ReflowInput::CalcLineHeight(nsIContent* aContent, if (!lh.IsNormal()) { RefPtr<nsFontMetrics> fm = nsLayoutUtils::GetFontMetricsForComputedStyle( aComputedStyle, aPresContext, aFontSizeInflation); - nscoord normal = GetNormalLineHeight(fm); + nscoord normal = GetNormalLineHeight(aContent, fm); if (lineHeight < normal) { lineHeight = normal; } diff --git a/layout/generic/test/mochitest.ini b/layout/generic/test/mochitest.ini index 64348d308568..64437b3a0d23 100644 --- a/layout/generic/test/mochitest.ini +++ b/layout/generic/test/mochitest.ini @@ -144,3 +144,4 @@ skip-if = debug == true || tsan # the test is slow. tsan: bug 1612707 support-files = file_reframe_for_lazy_load_image.html [test_bug1655135.html] +[test_tor_bug23104.html] diff --git a/layout/generic/test/test_tor_bug23104.html b/layout/generic/test/test_tor_bug23104.html new file mode 100644 index 000000000000..8ff1d2190c45 --- /dev/null +++ b/layout/generic/test/test_tor_bug23104.html @@ -0,0 +1,50 @@ +<!DOCTYPE HTML> +<meta charset="UTF-8"> +<html> +<head> + <title>Test for Tor Bug #23104: CSS line-height reveals the platform Tor browser is running</title> + <script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script> + <script type="application/javascript" src="/tests/SimpleTest/SpawnTask.js"></script> + <style type="text/css"> + span { + background-color: #000; + color: #fff; + font-size: 16.5px; + } + </style> +</head> +<body> +<span id="test1">Test1</span> +<span id="test2">كلمة</span> +<span id="test3">ação</span> +<script> + +let setPref = async function (key, value) { + await SpecialPowers.pushPrefEnv({"set": [[key, value]]}); +} + +function getStyle(el, styleprop) { + el = document.getElementById(el); + return document.defaultView.getComputedStyle(el, null).getPropertyValue(styleprop); +} + +function validateElement(elementName, isFingerprintResistent) { + var fontSize = getStyle(elementName, 'font-size'); + var lineHeight = getStyle(elementName, 'line-height'); + var validationCb = isFingerprintResistent ? is : isnot; + validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation'); +} + +add_task(async function() { + await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false); + for (let resistFingerprintingValue of [true, false]) { + await setPref("privacy.resistFingerprinting", resistFingerprintingValue); + for (let elementId of ['test1', 'test2', 'test3']) { + validateElement(elementId, resistFingerprintingValue); + } + } +}); + +</script> +</body> +</html>

1 0