Bug 1813489: Remove pref dom.security.secFetch.enabled, r=dveditz

Differential Revision: https://phabricator.services.mozilla.com/D168229
dothq · Jan 31, 2023 · 0866d5a · 0866d5a
1 parent c9c81d4
commit 0866d5a
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 55 deletions.
diff --git a/dom/security/SecFetch.cpp b/dom/security/SecFetch.cpp
@@ -379,11 +379,6 @@ void mozilla::dom::SecFetch::AddSecFetchUser(nsIHttpChannel* aHTTPChannel) {
 }
 
 void mozilla::dom::SecFetch::AddSecFetchHeader(nsIHttpChannel* aHTTPChannel) {
-  // if sec-fetch-* is prefed off, then there is nothing to do
-  if (!StaticPrefs::dom_security_secFetch_enabled()) {
-    return;
-  }
-
   nsCOMPtr<nsIURI> uri;
   nsresult rv = aHTTPChannel->GetURI(getter_AddRefs(uri));
   if (NS_WARN_IF(NS_FAILED(rv))) {

diff --git a/dom/security/test/sec-fetch/browser_navigation.js b/dom/security/test/sec-fetch/browser_navigation.js
@@ -8,10 +8,6 @@ let gExpectedHeader = {};
 
 async function setup() {
   waitForExplicitFinish();
-
-  await SpecialPowers.pushPrefEnv({
-    set: [["dom.security.secFetch.enabled", true]],
-  });
 }
 
 function checkSecFetchUser(subject, topic, data) {
@@ -166,10 +162,6 @@ async function testNavigations() {
 add_task(async function() {
   waitForExplicitFinish();
 
-  await SpecialPowers.pushPrefEnv({
-    set: [["dom.security.secFetch.enabled", true]],
-  });
-
   await testNavigations();
 
   // If fission is enabled we also want to test the navigations with the bfcache

diff --git a/dom/security/test/sec-fetch/test_iframe_history_manipulation.html b/dom/security/test/sec-fetch/test_iframe_history_manipulation.html
@@ -76,12 +76,9 @@
 
 SimpleTest.waitForExplicitFinish();
 
-SpecialPowers.pushPrefEnv({set: [["dom.security.secFetch.enabled", true]]}, async () => {
-  testFrame = document.createElement('iframe');
-  testFrame.src = `https://example.org/${REQUEST_PATH}?test`;
-  document.body.appendChild(testFrame);
-});
-
+testFrame = document.createElement('iframe');
+testFrame.src = `https://example.org/${REQUEST_PATH}?test`;
+document.body.appendChild(testFrame);
 
 </script>
 </body>

diff --git a/dom/security/test/sec-fetch/test_iframe_src_metaRedirect.html b/dom/security/test/sec-fetch/test_iframe_src_metaRedirect.html
@@ -86,11 +86,9 @@
   SimpleTest.finish();
 });
 
-SpecialPowers.pushPrefEnv({set: [["dom.security.secFetch.enabled", true]]}, async () => {
-  let frame = document.createElement("iframe");
-  frame.src = REQUEST_URL + "?meta";
-  document.body.appendChild(frame);
-});
+let frame = document.createElement("iframe");
+frame.src = REQUEST_URL + "?meta";
+document.body.appendChild(frame);
 
 </script>
 </body>

diff --git a/dom/security/test/sec-fetch/test_iframe_srcdoc_metaRedirect.html b/dom/security/test/sec-fetch/test_iframe_srcdoc_metaRedirect.html
@@ -86,11 +86,9 @@
   SimpleTest.finish();
 });
 
-SpecialPowers.pushPrefEnv({set: [["dom.security.secFetch.enabled", true]]}, async () => {
-  let frame = document.createElement("iframe");
-  frame.srcdoc = `<meta http-equiv="refresh" content="0; url='${REQUEST_URL}?meta'">`;
-  document.body.appendChild(frame);
-});
+let frame = document.createElement("iframe");
+frame.srcdoc = `<meta http-equiv="refresh" content="0; url='${REQUEST_URL}?meta'">`;
+document.body.appendChild(frame);
 
 </script>
 </body>

diff --git a/dom/security/test/sec-fetch/test_iframe_window_open_metaRedirect.html b/dom/security/test/sec-fetch/test_iframe_window_open_metaRedirect.html
@@ -91,9 +91,7 @@
   SimpleTest.finish();
 });
 
-SpecialPowers.pushPrefEnv({set: [["dom.security.secFetch.enabled", true]]}, async () => {
-  testWindow = window.open(REQUEST_URL + "?meta");
-});
+testWindow = window.open(REQUEST_URL + "?meta");
 
 </script>
 </body>

diff --git a/dom/security/test/sec-fetch/test_websocket.html b/dom/security/test/sec-fetch/test_websocket.html
@@ -60,20 +60,14 @@
   checkTestsDone();
 });
 
-function test_sec_fetch_websocket() {
-  var wssSocket = new WebSocket("wss://example.com/tests/dom/security/test/sec-fetch/file_websocket");
-  wssSocket.onopen = function(e) {
-    ok(true, "sanity: wssSocket onopen");
-    checkTestsDone();
-  };
-  wssSocket.onerror = function(e) {
-    ok(false, "sanity: wssSocket onerror");
-  };
-}
-
-SpecialPowers.pushPrefEnv({
-  set: [["dom.security.secFetch.enabled", true]]
-}, test_sec_fetch_websocket);
+var wssSocket = new WebSocket("wss://example.com/tests/dom/security/test/sec-fetch/file_websocket");
+wssSocket.onopen = function(e) {
+  ok(true, "sanity: wssSocket onopen");
+  checkTestsDone();
+};
+wssSocket.onerror = function(e) {
+  ok(false, "sanity: wssSocket onerror");
+};
 
 </script>
 </body>

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -3599,13 +3599,6 @@
   value: false
   mirror: always
 
-# This pref enables Sec-Fetch-* logic and causes corresponding
-# request headers to be set.
-- name: dom.security.secFetch.enabled
-  type: RelaxedAtomicBool
-  value: true
-  mirror: always
-
 # This pref enables the featurePolicy header support.
 - name: dom.security.featurePolicy.header.enabled
   type: bool

diff --git a/testing/web-platform/meta/fetch/metadata/__dir__.ini b/testing/web-platform/meta/fetch/metadata/__dir__.ini
@@ -1,3 +1,2 @@
-prefs: [dom.security.secFetch.enabled:true]
 lsan-allowed: [Alloc, Create, MakeUnique, Malloc, PLDHashTable::ChangeTable, PLDHashTable::MakeEntryHandle, Realloc, allocate, createTable, mozilla::BasePrincipal::CreateContentPrincipal, mozilla::Permission::Create, mozilla::ThrottledEventQueue::Create, mozilla::WeakPtr, mozilla::dom::BrowsingContext::Attach, mozilla::dom::BrowsingContext::CreateChildSHistory, mozilla::dom::BrowsingContext::CreateDetached, mozilla::dom::CanonicalBrowsingContext::GetSecureBrowserUI, mozilla::dom::ContentParent::CreateBrowser, mozilla::dom::Performance::CreateForMainThread, mozilla::dom::PerformanceMainThread::CreateNavigationTimingEntry, mozilla::dom::ReferrerInfo::Clone, mozilla::dom::ServiceWorker::Create, mozilla::extensions::ChannelWrapper::ChannelWrapper, mozilla::net::HttpBaseChannel::CloneLoadInfoForRedirect, mozilla::net::HttpBaseChannel::HttpBaseChannel, mozilla::net::nsStandardURL::TemplatedMutator, nsDynamicAtom::Create, nsHashPropertyBagBase::SetPropertyAsInterface, operator]
 leak-threshold: [default:51200, tab:358400]
diff --git a/testing/web-platform/meta/fetch/metadata/redirect/__dir__.ini b/testing/web-platform/meta/fetch/metadata/redirect/__dir__.ini
@@ -1,3 +1,2 @@
-prefs: [dom.security.secFetch.enabled:true]
 lsan-disabled: true
 leak-threshold: [tab:51200]