tor-commits January 2021

tor-commits@lists.torproject.org

16 participants
2244 discussions

[tor-browser/tor-browser-85.0b1-10.5-1] squash! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit f4136334d21088822d74f6ccaabcd1ab5258e94e Author: Georg Koppen <gk(a)torproject.org> Date: Mon Nov 30 07:54:38 2020 +0000 squash! TB3: Tor Browser's official .mozconfigs. Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files --- .mozconfig | 1 + .mozconfig-android | 1 + .mozconfig-asan | 1 + .mozconfig-mac | 1 + .mozconfig-mingw | 1 + 5 files changed, 5 insertions(+) diff --git a/.mozconfig b/.mozconfig index d71c858844e3..c50c57d410de 100755 --- a/.mozconfig +++ b/.mozconfig @@ -14,6 +14,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-android b/.mozconfig-android index 1b5e3f3178b7..50015ec615ef 100755 --- a/.mozconfig-android +++ b/.mozconfig-android @@ -3,6 +3,7 @@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Android diff --git a/.mozconfig-asan b/.mozconfig-asan index ca05fb12eedb..e42ff6c86bc5 100644 --- a/.mozconfig-asan +++ b/.mozconfig-asan @@ -22,6 +22,7 @@ ac_add_options --disable-jemalloc ac_add_options --disable-elf-hack ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 diff --git a/.mozconfig-mac b/.mozconfig-mac index 9be7751f8241..5b4624ef1f67 100644 --- a/.mozconfig-mac +++ b/.mozconfig-mac @@ -38,6 +38,7 @@ ac_add_options --enable-application=browser ac_add_options --enable-strip ac_add_options --enable-official-branding ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --disable-debug ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/.mozconfig-mingw b/.mozconfig-mingw index 29c58d8fdab2..ce6ace1dad67 100644 --- a/.mozconfig-mingw +++ b/.mozconfig-mingw @@ -10,6 +10,7 @@ export MOZILLA_OFFICIAL=1 ac_add_options --disable-debug ac_add_options --enable-optimize +ac_add_options --enable-rust-simd ac_add_options --enable-strip ac_add_options --enable-official-branding

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] Bug 40125: Expose Security Level pref in GeckoView
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 56a75370c7e4e825a648ef3ff63541fa6e63bd8a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Sep 14 02:52:28 2020 +0000 Bug 40125: Expose Security Level pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index e863ae733300..afab7a2ea9f3 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -633,6 +633,7 @@ package org.mozilla.geckoview { method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); + method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); method public boolean getWebFontsEnabled(); method public boolean getWebManifestEnabled(); @@ -650,6 +651,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); field public static final int COLOR_SCHEME_DARK = 1; @@ -685,6 +687,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); + method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); method @NonNull public GeckoRuntimeSettings.Builder webFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder webManifest(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index 97c33665fc18..662b34c476ae 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -446,6 +446,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mForceUserScalable.set(flag); return this; } + + /** + * Set security level. + * + * @param level A value determining the security level. Default is 0. + * @return This Builder instance. + */ + public @NonNull Builder torSecurityLevel(final int level) { + getSettings().mTorSecurityLevel.set(level); + return this; + } } private GeckoRuntime mRuntime; @@ -494,6 +505,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "browser.ui.zoom.force-user-scalable", false); /* package */ final Pref<Boolean> mAutofillLogins = new Pref<Boolean>( "signon.autofillForms", true); + /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( + "extensions.torbutton.security_slider", 4); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1132,6 +1145,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Gets the current security level. + * + * @return current security protection level + */ + public int getTorSecurityLevel() { + return mTorSecurityLevel.get(); + } + + /** + * Sets the Tor Security Level. + * + * @param level security protection level + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setTorSecurityLevel(final int level) { + mTorSecurityLevel.commit(level); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit a5801b7d04aa64a793078ff64f2a0da3b32a7e08 Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Oct 9 12:55:35 2020 +0200 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots --- browser/app/profile/000-tor-browser.js | 3 +++ browser/components/BrowserGlue.jsm | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index d7c7d366b24d..19991a801fcd 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -313,6 +313,9 @@ pref("security.enterprise_roots.enabled", false); // Don't ping Mozilla for MitM detection, see bug 32321 pref("security.certerrors.mitm.priming.enabled", false); +// Don't automatically enable enterprise roots, see bug 40166 +pref("security.certerrors.mitm.auto_enable_enterprise_roots", false); + // Disable the language pack signing check for now on macOS, see #31942 #ifdef XP_MACOSX pref("extensions.langpacks.signatures.required", false); diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 9891d105384a..f6cdee350bea 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -1346,6 +1346,20 @@ BrowserGlue.prototype = { // handle any UI migration this._migrateUI(); + // Clear possibly auto enabled enterprise_roots prefs (see bug 40166) + if ( + !Services.prefs.getBoolPref( + "security.certerrors.mitm.auto_enable_enterprise_roots" + ) && + Services.prefs.getBoolPref( + "security.enterprise_roots.auto-enabled", + false + ) + ) { + Services.prefs.clearUserPref("security.enterprise_roots.enabled"); + Services.prefs.clearUserPref("security.enterprise_roots.auto-enabled"); + } + if (!Services.prefs.prefHasUserValue(PREF_PDFJS_ISDEFAULT_CACHE_STATE)) { PdfJs.checkIsDefault(this._isNewProfile); }

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit c2c42f94e29914ce74808dcbf96a86e44a83d92e Author: Peter Story <pstory(a)andrew.cmu.edu> Date: Fri Jan 8 12:07:24 2021 -0500 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40287: Switch DDG search from POST to GET --- browser/components/search/extensions/ddg-onion/manifest.json | 4 ++-- browser/components/search/extensions/ddg/manifest.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/search/extensions/ddg-onion/manifest.json b/browser/components/search/extensions/ddg-onion/manifest.json index 294496b78368..4aa79e4abea0 100644 --- a/browser/components/search/extensions/ddg-onion/manifest.json +++ b/browser/components/search/extensions/ddg-onion/manifest.json @@ -19,8 +19,8 @@ "search_provider": { "name": "DuckDuckGoOnion", "search_url": "https://3g2upl4pq6kufc4m.onion", - "search_form": "https://3g2upl4pq6kufc4m.onion", - "search_url_post_params": "q={searchTerms}" + "search_form": "https://3g2upl4pq6kufc4m.onion/?q={searchTerms}", + "search_url_get_params": "q={searchTerms}" } } } \ No newline at end of file diff --git a/browser/components/search/extensions/ddg/manifest.json b/browser/components/search/extensions/ddg/manifest.json index f6aacc3dd069..4a3b0ad20fe9 100644 --- a/browser/components/search/extensions/ddg/manifest.json +++ b/browser/components/search/extensions/ddg/manifest.json @@ -20,8 +20,8 @@ "keyword": ["@duckduckgo", "@ddg"], "name": "DuckDuckGo", "search_url": "https://duckduckgo.com", - "search_form": "https://duckduckgo.com", - "search_url_post_params": "q={searchTerms}", + "search_form": "https://duckduckgo.com/?q={searchTerms}", + "search_url_get_params": "q={searchTerms}", "suggest_url": "https://ac.duckduckgo.com/ac/", "suggest_url_get_params": "q={searchTerms}&type=list" }

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] Bug 40198: Expose privacy.spoof_english pref in GeckoView
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 81b772d7a0a051fe25109cf439fd805a9276b120 Author: Alex Catarineu <acat(a)torproject.org> Date: Sun Oct 18 17:06:04 2020 +0200 Bug 40198: Expose privacy.spoof_english pref in GeckoView --- mobile/android/geckoview/api.txt | 3 ++ .../mozilla/geckoview/GeckoRuntimeSettings.java | 33 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt index afab7a2ea9f3..65529f18cf46 100644 --- a/mobile/android/geckoview/api.txt +++ b/mobile/android/geckoview/api.txt @@ -632,6 +632,7 @@ package org.mozilla.geckoview { method public boolean getRemoteDebuggingEnabled(); method @Nullable public GeckoRuntime getRuntime(); method @Nullable public Rect getScreenSizeOverride(); + method public boolean getSpoofEnglish(); method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate(); method public int getTorSecurityLevel(); method public boolean getUseMaxScreenDepth(); @@ -651,6 +652,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean); method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int); method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean); + method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean); method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int); method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean); method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean); @@ -686,6 +688,7 @@ package org.mozilla.geckoview { method @NonNull public GeckoRuntimeSettings.Builder preferredColorScheme(int); method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean); method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int); + method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean); method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate); method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int); method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean); diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java index bb992733937e..e6493f8cddb3 100644 --- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java +++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java @@ -457,6 +457,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { getSettings().mTorSecurityLevel.set(level); return this; } + + /** + * Sets whether we should spoof locale to English for webpages. + * + * @param flag True if we should spoof locale to English for webpages, false otherwise. + * @return This Builder instance. + */ + public @NonNull Builder spoofEnglish(final boolean flag) { + getSettings().mSpoofEnglish.set(flag ? 2 : 1); + return this; + } } private GeckoRuntime mRuntime; @@ -507,6 +518,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { "signon.autofillForms", true); /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>( "extensions.torbutton.security_slider", 4); + /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>( + "privacy.spoof_english", 0); /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM; @@ -1171,6 +1184,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { return this; } + /** + * Get whether we should spoof locale to English for webpages. + * + * @return Whether we should spoof locale to English for webpages. + */ + public boolean getSpoofEnglish() { + return mSpoofEnglish.get() == 2; + } + + /** + * Set whether we should spoof locale to English for webpages. + * + * @param flag A flag determining whether we should locale to English for webpages. + * @return This GeckoRuntimeSettings instance. + */ + public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) { + mSpoofEnglish.commit(flag ? 2 : 1); + return this; + } + @Override // Parcelable public void writeToParcel(final Parcel out, final int flags) { super.writeToParcel(out, flags);

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 32658: Create a new MAR signing key
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit af86953812484a744c8dbe2d6b7a19b3ebbc668d Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 8 07:57:34 2021 +0000 fixup! Bug 32658: Create a new MAR signing key Closes #40274. --- .../update/updater/nightly_aurora_level3_primary.der | Bin 1245 -> 1245 bytes .../updater/nightly_aurora_level3_secondary.der | Bin 1245 -> 1245 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der index a3a3077cc574..d579cf801e1a 100644 Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der differ diff --git a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der index d579cf801e1a..7cbfa77d06e7 100644 Binary files a/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der and b/toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der differ

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 2cc266366b66aa1052b5bb288db78ad466023a2f Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 20:49:51 2020 +0100 fixup! Bug 12620: TorBrowser regression tests --- run-tbb-tests | 10 +++++++--- tbb-tests-ignore.txt | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/run-tbb-tests b/run-tbb-tests index 5e266f9ba4cd..b12e62d942c9 100755 --- a/run-tbb-tests +++ b/run-tbb-tests @@ -18,8 +18,8 @@ then echo "Using tests list from file tbb-tests-list.txt" tests=($(cat tbb-tests-list.txt)) else - ffxbld_commit=$(git log -500 --format='%an %H' | grep '^ffxbld ' \ - | head -1 | cut -d ' ' -f 2) + ffxbld_commit=$(git log -500 --format='oneline' | grep "TB3: Tor Browser's official .mozconfigs." \ + | head -1 | cut -d ' ' -f 1) tests=($(git diff --name-status "$ffxbld_commit" HEAD | \ grep -e '^[AM].*/test_[^/]\+\.$html\|xul$$' \ @@ -51,7 +51,11 @@ fi rm -f tbb-tests.log echo $'\n''Starting tests' -./mach mochitest --log-tbpl tbb-tests.log --setpref security.nocertdb=false \ +./mach mochitest --log-tbpl tbb-tests.log \ + --setpref network.file.path_blacklist='' \ + --setpref extensions.torbutton.use_nontor_proxy=true \ + --setpref browser.privatebrowsing.autostart=false \ + --setpref security.nocertdb=false \ "${tests[@]}" echo "*************************" diff --git a/tbb-tests-ignore.txt b/tbb-tests-ignore.txt new file mode 100644 index 000000000000..f965010a7cd4 --- /dev/null +++ b/tbb-tests-ignore.txt @@ -0,0 +1,14 @@ +browser/extensions/onboarding/test/browser/browser_onboarding_accessibility.js +browser/extensions/onboarding/test/browser/browser_onboarding_keyboard.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_2.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_3.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_4.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_5.js +browser/extensions/onboarding/test/browser/browser_onboarding_notification_click_auto_complete_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_select_default_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_skip_tour.js +browser/extensions/onboarding/test/browser/browser_onboarding_tours.js +browser/extensions/onboarding/test/browser/browser_onboarding_tourset.js +browser/extensions/onboarding/test/browser/browser_onboarding_uitour.js +

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 5078ee1f284b7dcb0893e76241f28b9c9fc7d3c9 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 21:04:52 2020 +0100 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing --- tbb-tests/browser_tor_omnibox.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tbb-tests/browser_tor_omnibox.js b/tbb-tests/browser_tor_omnibox.js index e18b2a84a3d8..f3efd0c3da5e 100644 --- a/tbb-tests/browser_tor_omnibox.js +++ b/tbb-tests/browser_tor_omnibox.js @@ -1,14 +1,14 @@ // # Test Tor Omnibox // Check what search engines are installed in the search box. -function test() { +add_task(async function() { // Grab engine IDs. let browserSearchService = Components.classes["@mozilla.org/browser/search-service;1"] - .getService(Components.interfaces.nsIBrowserSearchService), - engineIDs = browserSearchService.getEngines().map(e => e.identifier); + .getService(Components.interfaces.nsISearchService), + engineIDs = (await browserSearchService.getEngines()).map(e => e.identifier); // Check that we have the correct engines installed, in the right order. is(engineIDs[0], "ddg", "Default search engine is duckduckgo"); is(engineIDs[1], "youtube", "Secondary search engine is youtube"); is(engineIDs[2], "google", "Google is third search engine"); -} +});

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 12620: TorBrowser regression tests
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit ea7eb55e79fd4bd7856efb043540fe62f0331fc8 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Nov 4 21:05:43 2020 +0100 fixup! Bug 12620: TorBrowser regression tests --- tbb-tests/browser_tor_bug2950.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tbb-tests/browser_tor_bug2950.js b/tbb-tests/browser_tor_bug2950.js index 010cc6356202..add683022d8e 100644 --- a/tbb-tests/browser_tor_bug2950.js +++ b/tbb-tests/browser_tor_bug2950.js @@ -13,19 +13,19 @@ let Ci = Components.interfaces; // ## utility functions -// __uri(spec)__. -// Creates an nsIURI instance from a spec +// __principal(spec)__. +// Creates a principal instance from a spec // (string address such as "http://torproject.org"). -let uri = spec => Services.io.newURI(spec, null, null); +let principal = spec => Services.scriptSecurityManager.createContentPrincipalFromOrigin(spec); // __setPermission(spec, key, value)__. // Sets the site permission of type key to value, for the site located at address spec. -let setPermission = (spec, key, value) => SitePermissions.set(uri(spec), key, value); +let setPermission = (spec, key, value) => SitePermissions.setForPrincipal(principal(spec), key, value); // __getPermission(spec, key)__. // Reads the site permission value for permission type key, for the site // located at address spec. -let getPermission = (spec, key) => SitePermissions.get(uri(spec), key); +let getPermission = (spec, key) => SitePermissions.getForPrincipal(principal(spec), key); // __profileDirPath__. // The Firefox Profile directory. Expected location of various persistent files. @@ -54,12 +54,12 @@ let originalValue = getPermission(SITE, KEY); window.setTimeout( function () { // Set the permission to a new value. - setPermission(SITE, KEY, (originalValue === 0) ? 1 : 0); + setPermission(SITE, KEY, SitePermissions.BLOCK); // Now read back the permission value again. let newReadValue = getPermission(SITE, KEY); // Compare to confirm that the permission // value was successfully changed. - isnot(newReadValue, originalValue, "Set a value in permissions db (perhaps in memory).");; + Assert.notDeepEqual(originalValue, newReadValue, "Set a value in permissions db (perhaps in memory)."); // If file existed or now exists, get the current time stamp. if (permissionsFile.exists()) { newModifiedTime = permissionsFile.lastModifiedTime;

1 0

[tor-browser/tor-browser-85.0b1-10.5-1] fixup! Bug 23104: Add a default line height compensation
by gk＠torproject.org 12 Jan '21

12 Jan '21

commit 7ff72b429066ffa0dff343f6fd1d4aad44d8866d Author: Alex Catarineu <acat(a)torproject.org> Date: Fri Apr 3 21:34:55 2020 +0200 fixup! Bug 23104: Add a default line height compensation --- layout/generic/test/test_tor_bug23104.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/layout/generic/test/test_tor_bug23104.html b/layout/generic/test/test_tor_bug23104.html index ae73a3446037..8ff1d2190c45 100644 --- a/layout/generic/test/test_tor_bug23104.html +++ b/layout/generic/test/test_tor_bug23104.html @@ -17,12 +17,10 @@ <span id="test1">Test1</span> <span id="test2">كلمة</span> <span id="test3">ação</span> -<script type="application/javascript;version=1.7"> +<script> -let setPref = function* (key, value) { - return new Promise(function(resolve, reject) { - SpecialPowers.pushPrefEnv({"set": [[key, value]]}, resolve); - }); +let setPref = async function (key, value) { + await SpecialPowers.pushPrefEnv({"set": [[key, value]]}); } function getStyle(el, styleprop) { @@ -34,12 +32,13 @@ function validateElement(elementName, isFingerprintResistent) { var fontSize = getStyle(elementName, 'font-size'); var lineHeight = getStyle(elementName, 'line-height'); var validationCb = isFingerprintResistent ? is : isnot; - validationCb(parseFloat(lineHeight), parseFloat(fontSize) * 1.2, 'Line Height validation'); + validationCb(parseFloat(lineHeight), Math.round(parseFloat(fontSize)) * 1.2, 'Line Height validation'); } -add_task(function* () { +add_task(async function() { + await setPref("layout.css.line-height.normal-as-resolved-value.enabled", false); for (let resistFingerprintingValue of [true, false]) { - yield setPref("privacy.resistFingerprinting", resistFingerprintingValue); + await setPref("privacy.resistFingerprinting", resistFingerprintingValue); for (let elementId of ['test1', 'test2', 'test3']) { validateElement(elementId, resistFingerprintingValue); }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2021