Bug 1843841 - Make navigator.appName constant. r=dom-worker-reviewers…

…,webidl,smaug,timhuang This is supposed to constant per https://html.spec.whatwg.org/#client-identification. Differential Revision: https://phabricator.services.mozilla.com/D183723
dothq · Jul 19, 2023 · 7906e7f · 7906e7f
1 parent 584ea48
commit 7906e7f
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 144 deletions.
diff --git a/browser/components/resistfingerprinting/test/browser/browser_navigator.js b/browser/components/resistfingerprinting/test/browser/browser_navigator.js
@@ -114,6 +114,7 @@ const CONST_PRODUCT = "Gecko";
 const CONST_PRODUCTSUB = "20100101";
 const CONST_VENDOR = "";
 const CONST_VENDORSUB = "";
+const CONST_LEGACY_BUILD_ID = "20181001000000";
 
 const appVersion = parseInt(Services.appinfo.version);
 const rvVersion =
@@ -228,6 +229,11 @@ async function testNavigator() {
     CONST_APPNAME,
     "Navigator.appName reports correct constant value."
   );
+  is(
+    result.buildID,
+    CONST_LEGACY_BUILD_ID,
+    "Navigator.buildID reports correct constant value."
+  );
   is(
     result.product,
     CONST_PRODUCT,
@@ -438,11 +444,11 @@ add_task(async function setupResistFingerprinting() {
 add_task(async function runOverrideTest() {
   await SpecialPowers.pushPrefEnv({
     set: [
-      ["general.appname.override", "appName overridden"],
       ["general.appversion.override", "appVersion overridden"],
       ["general.platform.override", "platform overridden"],
       ["general.useragent.override", "userAgent overridden"],
       ["general.oscpu.override", "oscpu overridden"],
+      ["general.buildID.override", "buildID overridden"],
     ],
   });
 
@@ -452,7 +458,7 @@ add_task(async function runOverrideTest() {
 
   await testUserAgentHeader();
 
-  // Pop general.appname.override etc
+  // Pop general.appversion.override etc
   await SpecialPowers.popPrefEnv();
 
   // Pop privacy.resistFingerprinting

diff --git a/browser/components/resistfingerprinting/test/browser/file_navigator.html b/browser/components/resistfingerprinting/test/browser/file_navigator.html
@@ -11,6 +11,7 @@
     result.appCodeName = navigator.appCodeName;
     result.appName = navigator.appName;
     result.appVersion = navigator.appVersion;
+    result.buildID = navigator.buildID;
     result.platform = navigator.platform;
     result.userAgent = navigator.userAgent;
     result.product = navigator.product;

diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp
@@ -307,11 +307,8 @@ void Navigator::GetAppVersion(nsAString& aAppVersion, CallerType aCallerType,
   }
 }
 
-void Navigator::GetAppName(nsAString& aAppName, CallerType aCallerType) const {
-  nsCOMPtr<Document> doc = mWindow->GetExtantDoc();
-
-  AppName(aAppName, doc,
-          /* aUsePrefOverriddenValue = */ aCallerType != CallerType::System);
+void Navigator::GetAppName(nsAString& aAppName) const {
+  aAppName.AssignLiteral("Netscape");
 }
 
 /**
@@ -2028,32 +2025,6 @@ nsresult Navigator::GetAppVersion(nsAString& aAppVersion, Document* aCallerDoc,
   return rv;
 }
 
-/* static */
-void Navigator::AppName(nsAString& aAppName, Document* aCallerDoc,
-                        bool aUsePrefOverriddenValue) {
-  MOZ_ASSERT(NS_IsMainThread());
-
-  if (aUsePrefOverriddenValue) {
-    // If fingerprinting resistance is on, we will spoof this value. See
-    // nsRFPService.h for details about spoofed values.
-    if (ShouldResistFingerprinting(aCallerDoc, RFPTarget::NavigatorAppName)) {
-      aAppName.AssignLiteral(SPOOFED_APPNAME);
-      return;
-    }
-
-    nsAutoString override;
-    nsresult rv =
-        mozilla::Preferences::GetString("general.appname.override", override);
-
-    if (NS_SUCCEEDED(rv)) {
-      aAppName = override;
-      return;
-    }
-  }
-
-  aAppName.AssignLiteral("Netscape");
-}
-
 void Navigator::ClearUserAgentCache() {
   Navigator_Binding::ClearCachedUserAgentValue(this);
 }

diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h
@@ -107,7 +107,7 @@ class Navigator final : public nsISupports, public nsWrapperCache {
 
   void GetProduct(nsAString& aProduct);
   void GetLanguage(nsAString& aLanguage);
-  void GetAppName(nsAString& aAppName, CallerType aCallerType) const;
+  void GetAppName(nsAString& aAppName) const;
   void GetAppVersion(nsAString& aAppName, CallerType aCallerType,
                      ErrorResult& aRv) const;
   void GetPlatform(nsAString& aPlatform, CallerType aCallerType,
@@ -132,9 +132,6 @@ class Navigator final : public nsISupports, public nsWrapperCache {
   bool CanShare(const ShareData& aData);
   already_AddRefed<Promise> Share(const ShareData& aData, ErrorResult& aRv);
 
-  static void AppName(nsAString& aAppName, Document* aCallerDoc,
-                      bool aUsePrefOverriddenValue);
-
   static nsresult GetPlatform(nsAString& aPlatform, Document* aCallerDoc,
                               bool aUsePrefOverriddenValue);
 

diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini
@@ -268,7 +268,6 @@ skip-if = headless # Bug 1405867
 [test_anonymousContent_insert.html]
 [test_anonymousContent_manipulate_content.html]
 [test_anonymousContent_style_csp.html]
-[test_appname_override.html]
 [test_async_setTimeout_stack.html]
 [test_async_setTimeout_stack_across_globals.html]
 [test_base.xhtml]

diff --git a/dom/base/test/test_appname_override.html b/dom/base/test/test_appname_override.html
diff --git a/dom/base/test/test_navigatorPrefOverride.html b/dom/base/test/test_navigatorPrefOverride.html
@@ -15,30 +15,27 @@
 <pre id="test"></pre>
 <script class="testbody" type="text/javascript">
 
-  ok(navigator.appName, "This is used just to populate the cache");
   ok(navigator.appVersion, "This is used just to populate the cache");
-
-  // B2G could have an empty platform.
-  info(navigator.platform);
-
+  ok(navigator.platform, "This is used just to populate the cache");
   ok(navigator.userAgent, "This is used just to populate the cache");
+  ok(navigator.buildID, "This is used just to populate the cache");
 
   SpecialPowers.pushPrefEnv({"set": [
-    ["general.appname.override", "appName overridden"],
     ["general.appversion.override", "appVersion overridden"],
     ["general.platform.override", "platform overridden"],
     ["general.useragent.override", "userAgent overridden"],
+    ["general.buildID.override", "buildID overridden"],
     ]},
     function() {
       var ifr = document.createElement('IFRAME');
       ifr.src = "about:blank";
 
       ifr.addEventListener('load', function() {
         var nav = ifr.contentWindow.navigator;
-        isnot(navigator.appName, nav.appName, "appName should match");
         isnot(navigator.appVersion, nav.appVersion, "appVersion should match");
         isnot(navigator.platform, nav.platform, "platform should match");
         isnot(navigator.userAgent, nav.userAgent, "userAgent should match");
+        isnot(navigator.buildID, nav.buildID, "buildID should match");
         SimpleTest.finish();
       });
 

diff --git a/dom/webidl/Navigator.webidl b/dom/webidl/Navigator.webidl
@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origin of this IDL file is
- * http://www.whatwg.org/specs/web-apps/current-work/#the-navigator-object
+ * https://html.spec.whatwg.org/#the-navigator-object
  * http://www.w3.org/TR/tracking-dnt/
  * http://www.w3.org/TR/geolocation-API/#geolocation_interface
  * http://www.w3.org/TR/battery-status/#navigatorbattery-interface
@@ -26,7 +26,7 @@
 
 interface URI;
 
-// http://www.whatwg.org/specs/web-apps/current-work/#the-navigator-object
+// https://html.spec.whatwg.org/#the-navigator-object
 [HeaderFile="Navigator.h",
  Exposed=Window]
 interface Navigator {
@@ -47,8 +47,8 @@ interface mixin NavigatorID {
   // WebKit/Blink/Trident/Presto support this (hardcoded "Mozilla").
   [Constant, Cached, Throws]
   readonly attribute DOMString appCodeName; // constant "Mozilla"
-  [Constant, Cached, NeedsCallerType]
-  readonly attribute DOMString appName;
+  [Constant, Cached]
+  readonly attribute DOMString appName; // constant "Netscape"
   [Constant, Cached, Throws, NeedsCallerType]
   readonly attribute DOMString appVersion;
   [Pure, Cached, Throws, NeedsCallerType]

diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp
@@ -992,18 +992,6 @@ void PrefLanguagesChanged(const char* /* aPrefName */, void* /* aClosure */) {
   }
 }
 
-void AppNameOverrideChanged(const char* /* aPrefName */, void* /* aClosure */) {
-  AssertIsOnMainThread();
-
-  nsAutoString override;
-  Preferences::GetString("general.appname.override", override);
-
-  RuntimeService* runtime = RuntimeService::GetService();
-  if (runtime) {
-    runtime->UpdateAppNameOverridePreference(override);
-  }
-}
-
 void AppVersionOverrideChanged(const char* /* aPrefName */,
                                void* /* aClosure */) {
   AssertIsOnMainThread();
@@ -1172,9 +1160,6 @@ bool RuntimeService::RegisterWorker(WorkerPrivate& aWorkerPrivate) {
     }
   } else {
     if (!mNavigatorPropertiesLoaded) {
-      Navigator::AppName(mNavigatorProperties.mAppName,
-                         aWorkerPrivate.GetDocument(),
-                         false /* aUsePrefOverriddenValue */);
       if (NS_FAILED(Navigator::GetAppVersion(
               mNavigatorProperties.mAppVersion, aWorkerPrivate.GetDocument(),
               false /* aUsePrefOverriddenValue */)) ||
@@ -1407,7 +1392,6 @@ nsresult RuntimeService::Init() {
           LoadGCZealOptions, PREF_JS_OPTIONS_PREFIX PREF_GCZEAL)) ||
 #endif
       WORKER_PREF("intl.accept_languages", PrefLanguagesChanged) ||
-      WORKER_PREF("general.appname.override", AppNameOverrideChanged) ||
       WORKER_PREF("general.appversion.override", AppVersionOverrideChanged) ||
       WORKER_PREF("general.platform.override", PlatformOverrideChanged) ||
       NS_FAILED(Preferences::RegisterPrefixCallbackAndCall(
@@ -1657,7 +1641,6 @@ void RuntimeService::Cleanup() {
     if (NS_FAILED(Preferences::UnregisterPrefixCallback(
             LoadContextOptions, PREF_JS_OPTIONS_PREFIX)) ||
         WORKER_PREF("intl.accept_languages", PrefLanguagesChanged) ||
-        WORKER_PREF("general.appname.override", AppNameOverrideChanged) ||
         WORKER_PREF("general.appversion.override", AppVersionOverrideChanged) ||
         WORKER_PREF("general.platform.override", PlatformOverrideChanged) ||
 #ifdef JS_GC_ZEAL
@@ -1815,11 +1798,6 @@ void RuntimeService::UpdateAllWorkerContextOptions() {
   });
 }
 
-void RuntimeService::UpdateAppNameOverridePreference(const nsAString& aValue) {
-  AssertIsOnMainThread();
-  mNavigatorProperties.mAppNameOverridden = aValue;
-}
-
 void RuntimeService::UpdateAppVersionOverridePreference(
     const nsAString& aValue) {
   AssertIsOnMainThread();

diff --git a/dom/workers/RuntimeService.h b/dom/workers/RuntimeService.h
@@ -68,8 +68,6 @@ class RuntimeService final : public nsIObserver {
 
  public:
   struct NavigatorProperties {
-    nsString mAppName;
-    nsString mAppNameOverridden;
     nsString mAppVersion;
     nsString mAppVersionOverridden;
     nsString mPlatform;
@@ -125,8 +123,6 @@ class RuntimeService final : public nsIObserver {
     sDefaultJSSettings->contextOptions = aContextOptions;
   }
 
-  void UpdateAppNameOverridePreference(const nsAString& aValue);
-
   void UpdateAppVersionOverridePreference(const nsAString& aValue);
 
   void UpdatePlatformOverridePreference(const nsAString& aValue);

diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp
@@ -96,28 +96,6 @@ void WorkerNavigator::SetLanguages(const nsTArray<nsString>& aLanguages) {
   mProperties.mLanguages = aLanguages.Clone();
 }
 
-void WorkerNavigator::GetAppName(nsString& aAppName,
-                                 CallerType aCallerType) const {
-  WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
-  MOZ_ASSERT(workerPrivate);
-
-  if (aCallerType != CallerType::System) {
-    if (workerPrivate->ShouldResistFingerprinting(
-            RFPTarget::NavigatorAppName)) {
-      // See nsRFPService.h for spoofed value.
-      aAppName.AssignLiteral(SPOOFED_APPNAME);
-      return;
-    }
-
-    if (!mProperties.mAppNameOverridden.IsEmpty()) {
-      aAppName = mProperties.mAppNameOverridden;
-      return;
-    }
-  }
-
-  aAppName = mProperties.mAppName;
-}
-
 void WorkerNavigator::GetAppVersion(nsString& aAppVersion,
                                     CallerType aCallerType,
                                     ErrorResult& aRv) const {

diff --git a/dom/workers/WorkerNavigator.h b/dom/workers/WorkerNavigator.h
@@ -67,7 +67,9 @@ class WorkerNavigator final : public nsWrapperCache {
   void GetAppCodeName(nsString& aAppCodeName, ErrorResult& /* unused */) const {
     aAppCodeName.AssignLiteral("Mozilla");
   }
-  void GetAppName(nsString& aAppName, CallerType aCallerType) const;
+  void GetAppName(nsString& aAppName) const {
+    aAppName.AssignLiteral("Netscape");
+  }
 
   void GetAppVersion(nsString& aAppVersion, CallerType aCallerType,
                      ErrorResult& aRv) const;

diff --git a/dom/workers/test/test_bug1062920.html b/dom/workers/test/test_bug1062920.html
@@ -39,7 +39,6 @@
 
   function replaceAndCheckValues() {
     SpecialPowers.pushPrefEnv({"set": [
-      ["general.appname.override", "appName overridden"],
       ["general.appversion.override", "appVersion overridden"],
       ["general.platform.override", "platform overridden"],
       ["general.useragent.override", "userAgent overridden"]

diff --git a/dom/workers/test/test_bug1062920.xhtml b/dom/workers/test/test_bug1062920.xhtml
@@ -17,8 +17,6 @@
 
     worker.onmessage = function(event) {
       is(event.data.appCodeName, navigator.appCodeName, "appCodeName should match");
-      is(event.data.appName, navigator.appName, "appName should match");
-      isnot(event.data.appName, "appName overridden", "appName is not overridden");
       is(event.data.appVersion, navigator.appVersion, "appVersion should match");
       isnot(event.data.appVersion, "appVersion overridden", "appVersion is not overridden");
       is(event.data.platform, navigator.platform, "platform should match");
@@ -31,7 +29,6 @@
 
   function replaceAndCheckValues() {
     SpecialPowers.pushPrefEnv({"set": [
-      ["general.appname.override", "appName overridden"],
       ["general.appversion.override", "appVersion overridden"],
       ["general.platform.override", "platform overridden"],
       ["general.useragent.override", "userAgent overridden"]

diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
@@ -6110,7 +6110,6 @@ static const PrefListEntry sDynamicPrefOverrideList[]{
     PREF_LIST_ENTRY("extensions.foobaz"),
     PREF_LIST_ENTRY(
         "extensions.formautofill.creditCards.heuristics.testConfidence"),
-    PREF_LIST_ENTRY("general.appname.override"),
     PREF_LIST_ENTRY("general.appversion.override"),
     PREF_LIST_ENTRY("general.buildID.override"),
     PREF_LIST_ENTRY("general.oscpu.override"),