[tor-commits] [tor-browser-bundle-testsuite/master] Bug 34189: Fix the settings test

gk at torproject.org gk at torproject.org
Thu Oct 15 18:41:27 UTC 2020


commit f4b6d697a47c2b7d856f626363152777126369ad
Author: Alex Catarineu <acat at torproject.org>
Date:   Tue May 12 12:33:57 2020 +0200

    Bug 34189: Fix the settings test
---
 marionette/tor_browser_tests/test_settings.py | 98 ++++-----------------------
 1 file changed, 15 insertions(+), 83 deletions(-)

diff --git a/marionette/tor_browser_tests/test_settings.py b/marionette/tor_browser_tests/test_settings.py
index 97918d2..b0a9be4 100644
--- a/marionette/tor_browser_tests/test_settings.py
+++ b/marionette/tor_browser_tests/test_settings.py
@@ -17,7 +17,7 @@ class Test(MarionetteTestCase):
         # This variable contains settings we want to check on all versions of
         # Tor Browser. See below for settings to check on specific versions.
         #
-        # Most of the following checks and comments are taken from 
+        # Most of the following checks and comments are taken from
         # https://github.com/arthuredelstein/tor-browser/blob/12620/tbb-tests/browser_tor_TB4.js 
         self.SETTINGS = {
                 "privacy.clearOnShutdown.cache": True,
@@ -27,9 +27,6 @@ class Test(MarionetteTestCase):
                 "privacy.clearOnShutdown.history": True,
                 "privacy.clearOnShutdown.sessions": True,
 
-                # #16632 : Turn on the background autoupdater
-                "app.update.auto": True,
-
                 "browser.search.update": False,
                 "browser.rights.3.shown": True,
 
@@ -41,10 +38,8 @@ class Test(MarionetteTestCase):
                 "browser.privatebrowsing.autostart": True,
                 "browser.cache.disk.enable": False,
                 "browser.cache.offline.enable": False,
-                "dom.indexedDB.enabled": True,
                 "permissions.memory_only": True,
                 "network.cookie.lifetimePolicy": 2,
-                "browser.download.manager.retention": 1,
                 "security.nocertdb": True,
 
                 # Disk activity: TBB Directory Isolation
@@ -61,44 +56,30 @@ class Test(MarionetteTestCase):
                 # Misc privacy: Remote
                 "browser.send_pings": False,
                 "geo.enabled": False,
-                "geo.wifi.uri": "",
+                "geo.provider.network.url": "",
                 "browser.search.suggest.enabled": False,
-                "browser.safebrowsing.enabled": False,
+                "browser.safebrowsing.phishing.enabled": False,
                 "browser.safebrowsing.malware.enabled": False,
-                "browser.download.manager.scanWhenDone": False, # prevents AV remote reporting of downloads
                 "extensions.ui.lastCategory": "addons://list/extension",
-                "datareporting.healthreport.service.enabled": False, # Yes, all three of these must be set
                 "datareporting.healthreport.uploadEnabled": False,
                 "datareporting.policy.dataSubmissionEnabled": False,
                 "security.mixed_content.block_active_content": True, # Activated with bug #21323
 
-                # Don't fetch a localized remote page that Tor Browser interacts with, see
-                # #16727. And, yes, it is "reportUrl" and not "reportURL".
-                "datareporting.healthreport.about.reportUrl": "data:text/plain,",
-                "datareporting.healthreport.about.reportUrlUnified": "data:text/plain,",
-
                 # Make sure Unified Telemetry is really disabled, see: #18738.
                 "toolkit.telemetry.unified": False,
-                "toolkit.telemetry.enabled": False,
-                # No experiments, use Tor Browser. See 21797.
-                "experiments.enabled": False,
-                "browser.syncPromoViewsLeftMap": "{\"addons\":0, \"passwords\":0, \"bookmarks\":0}", # Don't promote sync
+                "toolkit.telemetry.enabled": True if ts.t["tbbinfos"]["version"].startswith("tbb-nightly") else False,
                 "identity.fxaccounts.enabled": False, # Disable sync by default
                 "services.sync.engine.prefs": False, # Never sync prefs, addons, or tabs with other browsers
                 "services.sync.engine.addons": False,
                 "services.sync.engine.tabs": False,
                 "extensions.getAddons.cache.enabled": False, # https://blog.mozilla.org/addons/how-to-opt-out-of-add-on-metadata-updates/
-                "browser.newtabpage.preload": False, # Bug 16316 - Avoid potential confusion over tiles for now.
-                "browser.search.countryCode": "US", # The next three prefs disable GeoIP search lookups (#16254)
                 "browser.search.region": "US",
                 "browser.search.geoip.url": "",
                 "browser.fixup.alternate.enabled": False, # Bug #16783: Prevent .onion fixups
                 # Make sure there is no Tracking Protection active in Tor Browser, see: #17898.
                 "privacy.trackingprotection.pbmode.enabled": False,
-                # Disable the Pocket extension (Bug #18886)
-                "browser.pocket.enabled": False,
-                "browser.pocket.api": "",
-                "browser.pocket.site": "",
+                # Disable the Pocket extension (Bug #18886 and #31602)
+                "extensions.pocket.enabled": False,
                 "network.http.referer.hideOnionSource": True,
 
                 # Fingerprinting
@@ -106,45 +87,20 @@ class Test(MarionetteTestCase):
                 "webgl.disable-fail-if-major-performance-caveat": True,
                 "webgl.enable-webgl2": False,
                 "gfx.downloadable_fonts.fallback_delay": -1,
-                "general.appname.override": "Netscape",
-                "general.appversion.override": "5.0 (Windows)",
-                "general.oscpu.override": "Windows NT 6.1",
-                "general.platform.override": "Win32",
-                "general.productSub.override": "20100101",
-                "general.buildID.override": "20100101",
                 "browser.startup.homepage_override.buildID": "20100101",
-                "general.useragent.vendor": "",
-                "general.useragent.vendorSub": "",
-                "dom.enable_performance": False,
-                "plugin.expose_full_path": False,
-                "browser.zoom.siteSpecific": False,
-                "intl.charset.default": "windows-1252",
                 "browser.link.open_newwindow.restriction": 0, # Bug 9881: Open popups in new tabs (to avoid fullscreen popups)
-                "dom.gamepad.enabled": False, # bugs.torproject.org/13023
-                # Disable video statistics fingerprinting vector (bug 15757)
-                "media.video_stats.enabled": False,
                 # Set video VP9 to 0 for everyone (bug 22548)
                 "media.benchmark.vp9.threshold": 0,
-                # Disable device sensors as possible fingerprinting vector (bug 15758)
-                "device.sensors.enabled": False,
                 "dom.enable_resource_timing": False, # Bug 13024: To hell with this API
-                "dom.enable_user_timing": False, # Bug 16336: To hell with this API
                 "privacy.resistFingerprinting": True,
                 "privacy.resistFingerprinting.block_mozAddonManager": True, # Bug 26114
-                "dom.event.highrestimestamp.enabled": True, # Bug #17046: "Highres" (but truncated) timestamps prevent uptime leaks
-                "privacy.suppressModifierKeyEvents": True, # Bug #17009: Suppress ALT and SHIFT events"
-                "ui.use_standins_for_native_colors": True, # https://bugzilla.mozilla.org/232227
-                "privacy.use_utc_timezone": True,
-                "media.webspeech.synth.enabled": False, # Bug 10283: Disable SpeechSynthesis API
                 "dom.webaudio.enabled": False, # Bug 13017: Disable Web Audio API
-                "dom.maxHardwareConcurrency": 1, # Bug 21675: Spoof single-core cpu
                 "dom.w3c_touch_events.enabled": 0, # Bug 10286: Always disable Touch API
                 "dom.w3c_pointer_events.enabled": False,
                 "dom.vr.enabled": False, # Bug 21607: Disable WebVR for now
                 # Disable randomised Firefox HTTP cache decay user test groups (Bug: 13575)
                 "security.webauth.webauthn": False, # Bug 26614: Disable Web Authentication API for now
-                "browser.cache.frecency_experiment": -1,
-                
+
                 # Third party stuff
                 "network.cookie.cookieBehavior": 1,
                 "privacy.firstparty.isolate": True,
@@ -167,8 +123,7 @@ class Test(MarionetteTestCase):
                 "network.protocol-handler.warn-external.news": True,
                 "network.protocol-handler.warn-external.nntp": True,
                 "network.protocol-handler.warn-external.snews": True,
-                "plugins.click_to_play": True,
-                "plugin.state.flash": 1,
+                "plugin.state.flash": 0,
                 "media.peerconnection.enabled": False, # Disable WebRTC interfaces
                 # Disables media devices but only if `media.peerconnection.enabled` is set to
                 # `false` as well. (see bug 16328 for this defense-in-depth measure)
@@ -187,18 +142,13 @@ class Test(MarionetteTestCase):
                 # --disable-eme (which we do), we disable all of them here as well for defense
                 # in depth.
                 "browser.eme.ui.enabled": False,
-                "media.gmp-eme-adobe.visible": False,
-                "media.gmp-eme-adobe.enabled": False,
                 "media.gmp-widevinecdm.visible": False,
                 "media.gmp-widevinecdm.enabled": False,
                 "media.eme.enabled": False,
-                "media.eme.apiVisible": False,
                 # WebIDE can bypass proxy settings for remote debugging. It also downloads
                 # some additional addons that we have not reviewed. Turn all that off.
-                "devtools.webide.autoinstallADBHelper": False,
-                "devtools.webide.autoinstallFxdtAdapters": False,
+                "devtools.webide.autoinstallADBExtension": False,
                 "devtools.webide.enabled": False,
-                "devtools.appmanager.enabled": False,
                 # The in-browser debugger for debugging chrome code is not coping with our
                 # restrictive DNS look-up policy. We use "127.0.0.1" instead of "localhost" as
                 # a workaround. See bug 16523 for more details.
@@ -225,8 +175,6 @@ class Test(MarionetteTestCase):
                 "extensions.autoDisableScopes": 0,
                 "extensions.bootstrappedAddons": "{}",
                 "extensions.checkCompatibility.4.*": False,
-                "extensions.enabledAddons": "https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,tor-launcher%40torproject.org:0.1.1pre-alpha,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5",
-                "extensions.enabledItems": "langpack-en-US at firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8",
                 # extensions.enabledScopes is set to 5 by marionette_driver
                 #"extensions.enabledScopes": 1,
                 "extensions.pendingOperations": False,
@@ -236,25 +184,13 @@ class Test(MarionetteTestCase):
                 # don't want to have some random Google Analytics script running either on the
                 # about:addons page, see bug 22073 and 22900.
                 "extensions.getAddons.showPane": False,
-                # Show our legacy extensions directly on about:addons and get rid of the
-                # warning for the default theme.
-                "extensions.legacy.exceptions": "{972ce4c6-7e08-4474-a285-3208198ce6fd},torbutton at torproject.org,tor-launcher at torproject.org",
                 # Bug 26114: Allow NoScript to access addons.mozilla.org etc.
                 "extensions.webextensions.restrictedDomains": "",
 
-                # Audio_data is deprecated in future releases, but still present
-                # in FF24. This is a dangerous combination (spotted by iSec)
-                "media.audio_data.enabled": False,
-                
                 "dom.enable_resource_timing": False,
 
-                # If true, remote JAR files will not be opened, regardless of content type
-                # Patch written by Jeff Gibat (iSEC).
-                "network.jar.block-remote-files": True,
-
                 # 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/
-                "security.tls.unrestricted_rc4_fallback": False,
 
                 # Enforce certificate pinning, see: https://bugs.torproject.org/16206
                 "security.cert_pinning.enforcement_level": 2,
@@ -262,11 +198,7 @@ class Test(MarionetteTestCase):
                 # Don't allow MitM via Microsoft Family Safety, see bug 21686
                 "security.family_safety.mode": 0,
 
-                # Enforce SHA1 deprecation, see: bug 18042.
-                "security.pki.sha1_enforcement_level": 2,
-
                 # Disable the language pack signing check for now, see: bug 26465
-                "extensions.langpacks.signatures.required": False,
 
                 # Avoid report TLS errors to Mozilla. We might want to repurpose this feature
                 # one day to help detecting bad relays (which is bug 19119). For now we just
@@ -283,14 +215,14 @@ class Test(MarionetteTestCase):
 
                 # checking torbrowser.version match the version from the filename
                 "torbrowser.version": ts.t["tbbinfos"]["version"],
-                
-                # Disable device sensors as possible fingerprinting vector (bug 15758)
-                "device.sensors.enabled": False,
-                # Disable video statistics fingerprinting vector (bug 15757)
-                "media.video_stats.enabled": False,
 
                 "startup.homepage_override_url": "https://blog.torproject.org/category/tags/tor-browser",
-                "network.jar.block-remote-files": True,
+
+                # Disable network information API everywhere
+                # but, alas, the behavior is inconsistent across platforms, see:
+                # https://trac.torproject.org/projects/tor/ticket/27268#comment:19. We should
+                # not leak that difference if possible.
+                "dom.netinfo.enabled": False,
                 }
 
         # Settings for the Tor Browser 8.0





More information about the tor-commits mailing list