Bug 1649673 - Isolate speculative connections per first-party when privacy.partition.network_state is set to true, r=mayhemer,necko-reviewers

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

netwerk/protocol/http/nsHttpHandler.cpp

@@ -28,6 +28,7 @@
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_privacy.h"
+#include "mozilla/StoragePrincipalHelper.h"
 #include "nsAsyncRedirectVerifyHelper.h"
 #include "nsSocketTransportService2.h"
 #include "nsAlgorithm.h"
@@ -2508,14 +2509,16 @@ nsresult nsHttpHandler::SpeculativeConnectInternal(
 
   OriginAttributes originAttributes;
   // If the principal is given, we use the originAttributes from this
-  // principal. Otherwise, we use the originAttributes from the
-  // loadContext.
+  // principal. Otherwise, we use the originAttributes from the loadContext.
   if (aPrincipal) {
     originAttributes = aPrincipal->OriginAttributesRef();
   } else if (loadContext) {
     loadContext->GetOriginAttributes(originAttributes);
   }
 
+  StoragePrincipalHelper::UpdateOriginAttributesForNetworkState(
+      aURI, originAttributes);
+
   nsCOMPtr<nsIURI> clone;
   if (NS_SUCCEEDED(sss->IsSecureURI(nsISiteSecurityService::HEADER_HSTS, aURI,
                                     flags, originAttributes, nullptr, nullptr,

toolkit/components/antitracking/StoragePrincipalHelper.cpp

@@ -310,4 +310,14 @@ void StoragePrincipalHelper::GetOriginAttributesForNetworkState(
   aAttributes = aDocument->PartitionedPrincipal()->OriginAttributesRef();
 }
 
+// static
+void StoragePrincipalHelper::UpdateOriginAttributesForNetworkState(
+    nsIURI* aFirstPartyURI, OriginAttributes& aAttributes) {
+  if (!StaticPrefs::privacy_partition_network_state()) {
+    return;
+  }
+
+  aAttributes.SetPartitionKey(aFirstPartyURI);
+}
+
 }  // namespace mozilla

toolkit/components/antitracking/StoragePrincipalHelper.h

@@ -266,6 +266,8 @@ class StoragePrincipalHelper final {
                                                  OriginAttributes& aAttributes);
   static void GetOriginAttributesForNetworkState(dom::Document* aDocument,
                                                  OriginAttributes& aAttributes);
+  static void UpdateOriginAttributesForNetworkState(
+      nsIURI* aFirstPartyURI, OriginAttributes& aAttributes);
 };
 
 }  // namespace mozilla