Bug 1052909 - Remove network.websocket.auto-follow-http-redirects pref r=necko-reviewers,kershaw

Differential Revision: https://phabricator.services.mozilla.com/D189875

Author: gregorypappas

modules/libpref/init/all.js

@@ -1309,9 +1309,6 @@ pref("network.sts.pollable_event_timeout", 6);
 // 2147483647 == PR_INT32_MAX == ~2 GB
 pref("network.websocket.max-message-size", 2147483647);
 
-// Should we automatically follow http 3xx redirects during handshake
-pref("network.websocket.auto-follow-http-redirects", false);
-
 // the number of seconds to wait for websocket connection to be opened
 pref("network.websocket.timeout.open", 20);
 

netwerk/protocol/websocket/WebSocketChannel.cpp

@@ -1149,7 +1149,6 @@ WebSocketChannel::WebSocketChannel()
       mInnerWindowID(0),
       mGotUpgradeOK(0),
       mRecvdHttpUpgradeTransport(0),
-      mAutoFollowRedirects(0),
       mAllowPMCE(1),
       mPingOutstanding(0),
       mReleaseOnTransmit(0),
@@ -3168,20 +3167,17 @@ WebSocketChannel::AsyncOnChannelRedirect(
   // newuri is expected to be http or https
   bool newuriIsHttps = newuri->SchemeIs("https");
 
-  if (!mAutoFollowRedirects) {
-    // Even if redirects configured off, still allow them for HTTP Strict
-    // Transport Security (from ws://FOO to https://FOO (mapped to wss://FOO)
-
-    if (!(flags & (nsIChannelEventSink::REDIRECT_INTERNAL |
-                   nsIChannelEventSink::REDIRECT_STS_UPGRADE))) {
-      nsAutoCString newSpec;
-      rv = newuri->GetSpec(newSpec);
-      NS_ENSURE_SUCCESS(rv, rv);
+  // allow insecure->secure redirects for HTTP Strict Transport Security (from
+  // ws://FOO to https://FOO (mapped to wss://FOO)
+  if (!(flags & (nsIChannelEventSink::REDIRECT_INTERNAL |
+                 nsIChannelEventSink::REDIRECT_STS_UPGRADE))) {
+    nsAutoCString newSpec;
+    rv = newuri->GetSpec(newSpec);
+    NS_ENSURE_SUCCESS(rv, rv);
 
-      LOG(("WebSocketChannel: Redirect to %s denied by configuration\n",
-           newSpec.get()));
-      return NS_ERROR_FAILURE;
-    }
+    LOG(("WebSocketChannel: Redirect to %s denied by configuration\n",
+         newSpec.get()));
+    return NS_ERROR_FAILURE;
   }
 
   if (mEncrypted && !newuriIsHttps) {
@@ -3455,11 +3451,6 @@ WebSocketChannel::AsyncOpenNative(nsIURI* aURI, const nsACString& aOrigin,
     if (NS_SUCCEEDED(rv)) {
       mAllowPMCE = boolpref ? 1 : 0;
     }
-    rv = prefService->GetBoolPref(
-        "network.websocket.auto-follow-http-redirects", &boolpref);
-    if (NS_SUCCEEDED(rv)) {
-      mAutoFollowRedirects = boolpref ? 1 : 0;
-    }
     rv = prefService->GetIntPref("network.websocket.max-connections", &intpref);
     if (NS_SUCCEEDED(rv)) {
       mMaxConcurrentConnections = clamped(intpref, 1, 0xffff);

netwerk/protocol/websocket/WebSocketChannel.h

@@ -281,7 +281,6 @@ class WebSocketChannel : public BaseWebSocketChannel,
   // following members are accessed only on the main thread
   uint32_t mGotUpgradeOK : 1;
   uint32_t mRecvdHttpUpgradeTransport : 1;
-  uint32_t mAutoFollowRedirects : 1;
   uint32_t mAllowPMCE : 1;
   uint32_t : 0;  // ensure these aren't mixed with the next set