tor-browser

commit c59b9d464b8fdd3b43445e8900f4eb8911fc3717
parent cde214eee7e361af6f55816e3043ab13d9d1a6e1
Author: Randell Jesup <rjesup@mozilla.com>
Date:   Fri, 17 Oct 2025 13:07:46 +0000

Bug 1994472: Strip Content-Encoding when saving a decompressed cache item that's a dictionary r=necko-reviewers,valentin,kershaw

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

Diffstat:
M
netwerk/protocol/http/HttpBaseChannel.cpp
 | 
30
+++++++++++++++++++++---------
M
netwerk/protocol/http/HttpBaseChannel.h
 | 
5
+++++
M
netwerk/protocol/http/nsHttpChannel.cpp
 | 
8
++++----

3 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/netwerk/protocol/http/HttpBaseChannel.cpp b/netwerk/protocol/http/HttpBaseChannel.cpp
@@ -1384,7 +1384,8 @@ HttpBaseChannel::SetApplyConversion(bool value) {
 
 nsresult HttpBaseChannel::DoApplyContentConversions(
     nsIStreamListener* aNextListener, nsIStreamListener** aNewNextListener) {
-  return DoApplyContentConversions(aNextListener, aNewNextListener, nullptr);
+  return DoApplyContentConversionsInternal(aNextListener, aNewNextListener,
+                                           false, nullptr);
 }
 
 // create a listener chain that looks like this
@@ -1465,12 +1466,22 @@ NS_IMETHODIMP
 HttpBaseChannel::DoApplyContentConversions(nsIStreamListener* aNextListener,
                                            nsIStreamListener** aNewNextListener,
                                            nsISupports* aCtxt) {
+  return DoApplyContentConversionsInternal(aNextListener, aNewNextListener,
+                                           false, aCtxt);
+}
+
+nsresult HttpBaseChannel::DoApplyContentConversionsInternal(
+    nsIStreamListener* aNextListener, nsIStreamListener** aNewNextListener,
+    bool aRemoveEncodings, nsISupports* aCtxt) {
   *aNewNextListener = nullptr;
   if (!mResponseHead || !aNextListener) {
     return NS_OK;
   }
 
-  LOG(("HttpBaseChannel::DoApplyContentConversions [this=%p]\n", this));
+  LOG(
+      ("HttpBaseChannel::DoApplyContentConversions [this=%p], "
+       "removeEncodings=%d\n",
+       this, aRemoveEncodings));
 
 #ifdef DEBUG
   {
@@ -1521,7 +1532,6 @@ HttpBaseChannel::DoApplyContentConversions(nsIStreamListener* aNextListener,
 
   char* cePtr = contentEncoding.BeginWriting();
   uint32_t count = 0;
-  bool removeEncodings = false;
   while (char* val = nsCRT::strtok(cePtr, HTTP_LWS ",", &cePtr)) {
     if (++count > 16) {
       // For compatibility with old code, we will just carry on without
@@ -1561,10 +1571,11 @@ HttpBaseChannel::DoApplyContentConversions(nsIStreamListener* aNextListener,
         }
         glean::http::content_encoding.AccumulateSingleSample(mode);
       }
+#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
       if (from.EqualsLiteral("dcb") || from.EqualsLiteral("dcz")) {
-        MOZ_ASSERT(XRE_IsParentProcess());
-        removeEncodings = true;
+        MOZ_DIAGNOSTIC_ASSERT(XRE_IsParentProcess());
       }
+#endif
       nextListener = converter;
     } else {
       if (val) {
@@ -1583,10 +1594,11 @@ HttpBaseChannel::DoApplyContentConversions(nsIStreamListener* aNextListener,
   // Content-Encoding: gzip.   We won't do that; we'll remove all compressors
   // if we need to remove any.
   // This double compression of course is silly, but supported by the spec.
-  if (removeEncodings) {
-    // if we have dcb or dcz, all content-encodings in the header should
-    // be removed as we're decompressing before the tee in the parent
-    // process
+  if (aRemoveEncodings) {
+    // If we have dcb or dcz, all content-encodings in the header should be
+    // removed as we're decompressing before the tee in the parent
+    // process. Also we should remove any encodings if it's a dictionary
+    // so we can load it quickly
     LOG(("Changing Content-Encoding from '%s' to ''", contentEncoding.get()));
     // Can't use SetHeader; we need to overwrite the current value
     rv = mResponseHead->SetHeaderOverride(nsHttp::Content_Encoding, ""_ns);
diff --git a/netwerk/protocol/http/HttpBaseChannel.h b/netwerk/protocol/http/HttpBaseChannel.h
@@ -169,6 +169,7 @@ class HttpBaseChannel : public nsHashPropertyBag,
   NS_IMETHOD GetApplyConversion(bool* value) override;
   NS_IMETHOD SetApplyConversion(bool value) override;
   NS_IMETHOD GetContentEncodings(nsIUTF8StringEnumerator** aEncodings) override;
+  // Note: Doesn't modify the Content-Encoding
   NS_IMETHOD DoApplyContentConversions(nsIStreamListener* aNextListener,
                                        nsIStreamListener** aNewNextListener,
                                        nsISupports* aCtxt) override;
@@ -508,6 +509,10 @@ class HttpBaseChannel : public nsHashPropertyBag,
   static bool ShouldRewriteRedirectToGET(
       uint32_t httpStatus, nsHttpRequestHead::ParsedMethodType method);
 
+  [[nodiscard]] nsresult DoApplyContentConversionsInternal(
+      nsIStreamListener* aNextListener, nsIStreamListener** aNewNextListener,
+      bool aRemoveEncodings, nsISupports* aCtxt);
+
   // Like nsIEncodedChannel::DoApplyConversions except context is set to
   // mListenerContext.
   [[nodiscard]] nsresult DoApplyContentConversions(
diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3614,8 +3614,8 @@ nsresult nsHttpChannel::ContinueProcessNormal(nsresult rv) {
       // otherwise we won't convert in the parent process
       // XXX may be redundant, but safe
       SetApplyConversion(true);
-      rv = DoApplyContentConversions(mListener, getter_AddRefs(listener),
-                                     nullptr);
+      rv = DoApplyContentConversionsInternal(
+          mListener, getter_AddRefs(listener), true, nullptr);
       if (NS_FAILED(rv)) {
         return rv;
       }
@@ -6306,8 +6306,8 @@ nsresult nsHttpChannel::DoInstallCacheListener(bool aIsDictionaryCompressed,
     nsCOMPtr<nsIStreamListener> listener;
     // otherwise we won't convert in the parent process
     SetApplyConversion(true);
-    rv =
-        DoApplyContentConversions(mListener, getter_AddRefs(listener), nullptr);
+    rv = DoApplyContentConversionsInternal(mListener, getter_AddRefs(listener),
+                                           true, nullptr);
     if (NS_FAILED(rv)) {
       return rv;
     }