Bug 1912434 - Remove network.websocket.extensions.permessage-deflate pref r=necko-reviewers,kershaw

gregorypappas · gregorypappas · commit 7c7405e575c0 · 2024-09-20T09:28:45.000Z
Differential Revision: https://phabricator.services.mozilla.com/D222901
diff --git a/dom/websocket/tests/file_websocket_permessage_deflate_disabled_wsh.py b/dom/websocket/tests/file_websocket_permessage_deflate_disabled_wsh.py
diff --git a/dom/websocket/tests/mochitest.toml b/dom/websocket/tests/mochitest.toml
@@ -9,7 +9,6 @@ support-files = [
   "file_websocket_hello_wsh.py",
   "file_websocket_http_resource.txt",
   "file_websocket_permessage_deflate_wsh.py",
-  "file_websocket_permessage_deflate_disabled_wsh.py",
   "file_websocket_permessage_deflate_rejected_wsh.py",
   "file_websocket_permessage_deflate_params_wsh.py",
   "file_websocket_wsh.py",
diff --git a/dom/websocket/tests/test_websocket_permessage_deflate.html b/dom/websocket/tests/test_websocket_permessage_deflate.html
@@ -5,7 +5,7 @@
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="loadDeflate()">
+<body onload="testDeflate()">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=792831">Mozilla Bug </a>
 <p id="display"></p>
 <div id="content" style="display: none">
@@ -21,13 +21,11 @@
 
 let tests = [
   // enable PMCE
-  [ true, true, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate" ],
-  // disable PMCE
-  [ false, false, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_disabled" ],
+  [ true, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate" ],
   // server rejects offered PMCE
-  [ true, false, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_rejected" ],
+  [ false, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_rejected" ],
   // server returns parameters in the handshake
-  [ true, true, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_params" ]
+  [ true, "ws://mochi.test:8888/tests/dom/websocket/tests/file_websocket_permessage_deflate_params" ]
 ]
 
 function ab2str(buf) {
@@ -53,10 +51,10 @@
 }
 
 function testDeflate() {
-  ws = new WebSocket(tests[testIdx][2]);
+  ws = new WebSocket(tests[testIdx][1]);
 
   ws.onopen = function() {
-    if (tests[testIdx][1]) {
+    if (tests[testIdx][0]) {
       is(ws.extensions, "permessage-deflate", "permessage-deflate not negotiated!");
     } else {
       is(ws.extensions, "", "permessage-deflate should not be negotiated!");
@@ -90,18 +88,14 @@
       sendText = true;
       testIdx++;
       if (testIdx < tests.length) {
-        loadDeflate();
+        testDeflate();
       } else {
         SimpleTest.finish();
       }
     }
   }
 }
 
-function loadDeflate() {
-  SpecialPowers.pushPrefEnv({"set":[['network.websocket.extensions.permessage-deflate', tests[testIdx][0]]]}, testDeflate);
-}
-
 SimpleTest.waitForExplicitFinish();
 
 </script>
diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
@@ -1328,10 +1328,6 @@ pref("network.websocket.timeout.ping.request", 0);
 // event is sent to the javascript websockets application
 pref("network.websocket.timeout.ping.response", 10);
 
-// Defines whether or not to try to negotiate the permessage compression
-// extension with the websocket server.
-pref("network.websocket.extensions.permessage-deflate", true);
-
 // the maximum number of concurrent websocket sessions. By specification there
 // is never more than one handshake oustanding to an individual host at
 // one time.
diff --git a/netwerk/protocol/websocket/WebSocketChannel.cpp b/netwerk/protocol/websocket/WebSocketChannel.cpp
@@ -1185,7 +1185,6 @@ WebSocketChannel::WebSocketChannel()
       mInnerWindowID(0),
       mGotUpgradeOK(0),
       mRecvdHttpUpgradeTransport(0),
-      mAllowPMCE(1),
       mPingOutstanding(0),
       mReleaseOnTransmit(0),
       mDataStarted(false),
@@ -2700,14 +2699,6 @@ nsresult WebSocketChannel::HandleExtensions() {
     return rv;
   }
 
-  if (!mAllowPMCE) {
-    LOG(
-        ("WebSocketChannel::HandleExtensions: "
-         "Recvd permessage-deflate which wasn't offered\n"));
-    AbortSession(NS_ERROR_ILLEGAL_VALUE);
-    return NS_ERROR_ILLEGAL_VALUE;
-  }
-
   if (clientMaxWindowBits == -1) {
     clientMaxWindowBits = 15;
   }
@@ -2743,17 +2734,6 @@ void ProcessServerWebSocketExtensions(const nsACString& aExtensions,
                                       nsACString& aNegotiatedExtensions) {
   aNegotiatedExtensions.Truncate();
 
-  nsCOMPtr<nsIPrefBranch> prefService;
-  prefService = mozilla::components::Preferences::Service();
-  if (prefService) {
-    bool boolpref;
-    nsresult rv = prefService->GetBoolPref(
-        "network.websocket.extensions.permessage-deflate", &boolpref);
-    if (NS_SUCCEEDED(rv) && !boolpref) {
-      return;
-    }
-  }
-
   for (const auto& ext :
        nsCCharSeparatedTokenizer(aExtensions, ',').ToRange()) {
     bool clientNoContextTakeover;
@@ -2847,11 +2827,9 @@ nsresult WebSocketChannel::SetupRequest() {
     MOZ_ASSERT(NS_SUCCEEDED(rv));
   }
 
-  if (mAllowPMCE) {
-    rv = mHttpChannel->SetRequestHeader("Sec-WebSocket-Extensions"_ns,
-                                        "permessage-deflate"_ns, false);
-    MOZ_ASSERT(NS_SUCCEEDED(rv));
-  }
+  rv = mHttpChannel->SetRequestHeader("Sec-WebSocket-Extensions"_ns,
+                                      "permessage-deflate"_ns, false);
+  MOZ_ASSERT(NS_SUCCEEDED(rv));
 
   uint8_t* secKey;
   nsAutoCString secKeyString;
@@ -3462,7 +3440,6 @@ WebSocketChannel::AsyncOpenNative(nsIURI* aURI, const nsACString& aOrigin,
 
   if (prefService) {
     int32_t intpref;
-    bool boolpref;
     rv =
         prefService->GetIntPref("network.websocket.max-message-size", &intpref);
     if (NS_SUCCEEDED(rv)) {
@@ -3486,11 +3463,6 @@ WebSocketChannel::AsyncOpenNative(nsIURI* aURI, const nsACString& aOrigin,
     if (NS_SUCCEEDED(rv) && !mClientSetPingTimeout) {
       mPingResponseTimeout = clamped(intpref, 1, 3600) * 1000;
     }
-    rv = prefService->GetBoolPref(
-        "network.websocket.extensions.permessage-deflate", &boolpref);
-    if (NS_SUCCEEDED(rv)) {
-      mAllowPMCE = boolpref ? 1 : 0;
-    }
     rv = prefService->GetIntPref("network.websocket.max-connections", &intpref);
     if (NS_SUCCEEDED(rv)) {
       mMaxConcurrentConnections = clamped(intpref, 1, 0xffff);
diff --git a/netwerk/protocol/websocket/WebSocketChannel.h b/netwerk/protocol/websocket/WebSocketChannel.h
@@ -282,7 +282,6 @@ class WebSocketChannel : public BaseWebSocketChannel,
   // following members are accessed only on the main thread
   uint32_t mGotUpgradeOK : 1;
   uint32_t mRecvdHttpUpgradeTransport : 1;
-  uint32_t mAllowPMCE : 1;
   uint32_t : 0;  // ensure these aren't mixed with the next set
 
   // following members are accessed only on the IO thread
