Revert "Bug 1966658 - Populate the partitionedPrincipal to the SessionHistoryEntry in the parent process. r=smaug,sessionstore-reviewers,core-sessionstore-reviewers,farre"

marco-c · marco-c · commit 915ba7d8aae5 · 2025-05-28T14:53:39.000Z
This reverts commit 52c31c4da0149c5ca72b8a1dd37473c01785c484.

UltraBlame original commit: f3b0a0474e80dbe930272f69a268bb4e5e797262
diff --git a/browser/components/sessionstore/test/browser.toml b/browser/components/sessionstore/test/browser.toml
@@ -289,8 +289,6 @@ run-if = ["fission"]
 
 ["browser_searchModeSwitcher_restore.js"]
 
-["browser_sessionHistory_partitionedPrincipalToInherit.js"]
-
 ["browser_sessionHistory.js"]
 https_first_disabled = true
 support-files = ["file_sessionHistory_hashchange.html"]
diff --git a/browser/components/sessionstore/test/browser_sessionHistory_partitionedPrincipalToInherit.js b/browser/components/sessionstore/test/browser_sessionHistory_partitionedPrincipalToInherit.js
diff --git a/docshell/base/BrowsingContext.cpp b/docshell/base/BrowsingContext.cpp
@@ -3791,7 +3791,7 @@ void BrowsingContext::SessionHistoryCommit(
     const LoadingSessionHistoryInfo& aInfo, uint32_t aLoadType,
     nsIURI* aPreviousURI, SessionHistoryInfo* aPreviousActiveEntry,
     bool aPersist, bool aCloneEntryChildren, bool aChannelExpired,
-    uint32_t aCacheKey, nsIPrincipal* aPartitionedPrincipal) {
+    uint32_t aCacheKey) {
   nsID changeID = {};
   if (XRE_IsContentProcess()) {
     RefPtr<ChildSHistory> rootSH = Top()->GetChildSessionHistory();
@@ -3830,11 +3830,11 @@ void BrowsingContext::SessionHistoryCommit(
     ContentChild* cc = ContentChild::GetSingleton();
     mozilla::Unused << cc->SendHistoryCommit(
         this, aInfo.mLoadId, changeID, aLoadType, aPersist, aCloneEntryChildren,
-        aChannelExpired, aCacheKey, aPartitionedPrincipal);
+        aChannelExpired, aCacheKey);
   } else {
-    Canonical()->SessionHistoryCommit(
-        aInfo.mLoadId, changeID, aLoadType, aPersist, aCloneEntryChildren,
-        aChannelExpired, aCacheKey, aPartitionedPrincipal);
+    Canonical()->SessionHistoryCommit(aInfo.mLoadId, changeID, aLoadType,
+                                      aPersist, aCloneEntryChildren,
+                                      aChannelExpired, aCacheKey);
   }
 }
 
diff --git a/docshell/base/BrowsingContext.h b/docshell/base/BrowsingContext.h
@@ -867,8 +867,7 @@ class BrowsingContext : public nsILoadContext, public nsWrapperCache {
                             uint32_t aLoadType, nsIURI* aCurrentURI,
                             SessionHistoryInfo* aPreviousActiveEntry,
                             bool aPersist, bool aCloneEntryChildren,
-                            bool aChannelExpired, uint32_t aCacheKey,
-                            nsIPrincipal* aPartitionedPrincipal);
+                            bool aChannelExpired, uint32_t aCacheKey);
 
   
   
diff --git a/docshell/base/CanonicalBrowsingContext.cpp b/docshell/base/CanonicalBrowsingContext.cpp
@@ -1013,8 +1013,7 @@ void CanonicalBrowsingContext::CallOnTopDescendants(
 
 void CanonicalBrowsingContext::SessionHistoryCommit(
     uint64_t aLoadId, const nsID& aChangeID, uint32_t aLoadType, bool aPersist,
-    bool aCloneEntryChildren, bool aChannelExpired, uint32_t aCacheKey,
-    nsIPrincipal* aPartitionedPrincipal) {
+    bool aCloneEntryChildren, bool aChannelExpired, uint32_t aCacheKey) {
   MOZ_LOG(gSHLog, LogLevel::Verbose,
           ("CanonicalBrowsingContext::SessionHistoryCommit %p %" PRIu64, this,
            aLoadId));
@@ -1038,7 +1037,6 @@ void CanonicalBrowsingContext::SessionHistoryCommit(
         newActiveEntry->SharedInfo()->mExpired = true;
       }
 
-      newActiveEntry->SetPartitionedPrincipalToInherit(aPartitionedPrincipal);
       bool loadFromSessionHistory = !newActiveEntry->ForInitialLoad();
       newActiveEntry->SetForInitialLoad(false);
       SessionHistoryEntry::RemoveLoadId(aLoadId);
diff --git a/docshell/base/CanonicalBrowsingContext.h b/docshell/base/CanonicalBrowsingContext.h
@@ -170,8 +170,7 @@ class CanonicalBrowsingContext final : public BrowsingContext {
   void SessionHistoryCommit(uint64_t aLoadId, const nsID& aChangeID,
                             uint32_t aLoadType, bool aPersist,
                             bool aCloneEntryChildren, bool aChannelExpired,
-                            uint32_t aCacheKey,
-                            nsIPrincipal* aPartitionedPrincipal);
+                            uint32_t aCacheKey);
 
   
   
diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
@@ -9044,7 +9044,7 @@ nsresult nsDocShell::HandleSameDocumentNavigation(
           *mLoadingEntry, mLoadType, mCurrentURI, previousActiveEntry.get(),
           true, true,
           
-          false, cacheKey, doc->PartitionedPrincipal());
+          false, cacheKey);
       
 
       
@@ -9104,9 +9104,6 @@ nsresult nsDocShell::HandleSameDocumentNavigation(
       
       mActiveEntry->SetTitle(mTitle);
 
-      mActiveEntry->SetPartitionedPrincipalToInherit(
-          doc->PartitionedPrincipal());
-
       if (scrollRestorationIsManual.isSome()) {
         mActiveEntry->SetScrollRestorationIsManual(
             scrollRestorationIsManual.value());
@@ -11612,7 +11609,7 @@ nsresult nsDocShell::UpdateURLAndHistory(
                          referrerInfo,
                          aDocument->NodePrincipal(),
                         csp, title, scrollRestorationIsManual, aData,
-                        uriWasModified, aDocument->PartitionedPrincipal());
+                        uriWasModified);
     } else {
       
       
@@ -11666,7 +11663,7 @@ nsresult nsDocShell::UpdateURLAndHistory(
          referrerInfo, aDocument->NodePrincipal(),
         aDocument->GetCsp(), title,
         mActiveEntry && mActiveEntry->GetScrollRestorationIsManual(), aData,
-        uriWasModified, aDocument->PartitionedPrincipal());
+        uriWasModified);
   } else {
     
     newSHEntry = mOSHE;
@@ -12115,8 +12112,7 @@ void nsDocShell::UpdateActiveEntry(
     nsIURI* aOriginalURI, nsIReferrerInfo* aReferrerInfo,
     nsIPrincipal* aTriggeringPrincipal, nsIContentSecurityPolicy* aCsp,
     const nsAString& aTitle, bool aScrollRestorationIsManual,
-    nsIStructuredCloneContainer* aData, bool aURIWasModified,
-    nsIPrincipal* aPartitionedPrincipal) {
+    nsIStructuredCloneContainer* aData, bool aURIWasModified) {
   MOZ_ASSERT(mozilla::SessionHistoryInParent());
   MOZ_ASSERT(aURI, "uri is null");
   MOZ_ASSERT(mLoadType == LOAD_PUSHSTATE,
@@ -12151,7 +12147,6 @@ void nsDocShell::UpdateActiveEntry(
   mActiveEntry->SetStateData(static_cast<nsStructuredCloneContainer*>(aData));
   mActiveEntry->SetURIWasModified(aURIWasModified);
   mActiveEntry->SetScrollRestorationIsManual(aScrollRestorationIsManual);
-  mActiveEntry->SetPartitionedPrincipalToInherit(aPartitionedPrincipal);
 
   if (replace) {
     mBrowsingContext->ReplaceActiveSessionHistoryEntry(mActiveEntry.get());
@@ -13892,13 +13887,6 @@ void nsDocShell::MoveLoadingToActiveEntry(bool aPersist, bool aExpired,
     if (aCacheKey != 0) {
       mActiveEntry->SetCacheKey(aCacheKey);
     }
-
-    nsCOMPtr<nsIPrincipal> partitionedPrincipal;
-    RefPtr<Document> doc = GetDocument();
-    if (doc) {
-      partitionedPrincipal = doc->PartitionedPrincipal();
-    }
-    mActiveEntry->SetPartitionedPrincipalToInherit(partitionedPrincipal);
     MOZ_ASSERT(loadingEntry);
     uint32_t loadType =
         mLoadType == LOAD_ERROR_PAGE ? mFailedLoadType : mLoadType;
@@ -13909,7 +13897,7 @@ void nsDocShell::MoveLoadingToActiveEntry(bool aPersist, bool aExpired,
       
       mBrowsingContext->SessionHistoryCommit(
           *loadingEntry, loadType, aPreviousURI, previousActiveEntry.get(),
-          aPersist, false, aExpired, aCacheKey, partitionedPrincipal);
+          aPersist, false, aExpired, aCacheKey);
     }
 
     
diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h
@@ -625,8 +625,7 @@ class nsDocShell final : public nsDocLoader,
       nsIURI* aURI, nsIURI* aOriginalURI, nsIReferrerInfo* aReferrerInfo,
       nsIPrincipal* aTriggeringPrincipal, nsIContentSecurityPolicy* aCsp,
       const nsAString& aTitle, bool aScrollRestorationIsManual,
-      nsIStructuredCloneContainer* aData, bool aURIWasModified,
-      nsIPrincipal* aPartitionedPrincipal);
+      nsIStructuredCloneContainer* aData, bool aURIWasModified);
 
   nsresult AddChildSHEntry(nsISHEntry* aCloneRef, nsISHEntry* aNewEntry,
                            int32_t aChildOffset, uint32_t aLoadType,
diff --git a/docshell/shistory/SessionHistoryEntry.cpp b/docshell/shistory/SessionHistoryEntry.cpp
@@ -227,11 +227,6 @@ nsIPrincipal* SessionHistoryInfo::GetPartitionedPrincipalToInherit() const {
   return mSharedState.Get()->mPartitionedPrincipalToInherit;
 }
 
-void SessionHistoryInfo::SetPartitionedPrincipalToInherit(
-    nsIPrincipal* aPartitionedPrincipal) {
-  mSharedState.Get()->mPartitionedPrincipalToInherit = aPartitionedPrincipal;
-}
-
 nsIContentSecurityPolicy* SessionHistoryInfo::GetCsp() const {
   return mSharedState.Get()->mCsp;
 }
@@ -1670,10 +1665,12 @@ bool IPDLParamTraits<dom::SessionHistoryInfo>::Read(
                          aResult->mSharedState.Get()->mPrincipalToInherit)
                    : !aResult->mSharedState.Get()->mPrincipalToInherit,
                "We don't expect this to change!");
-    MOZ_ASSERT_IF(
-        aResult->mSharedState.Get()->mPartitionedPrincipalToInherit,
-        aResult->mSharedState.Get()->mPartitionedPrincipalToInherit->Equals(
-            partitionedPrincipalToInherit));
+    MOZ_ASSERT(
+        partitionedPrincipalToInherit
+            ? partitionedPrincipalToInherit->Equals(
+                  aResult->mSharedState.Get()->mPartitionedPrincipalToInherit)
+            : !aResult->mSharedState.Get()->mPartitionedPrincipalToInherit,
+        "We don't expect this to change!");
     MOZ_ASSERT(
         csp ? nsCSPContext::Equals(csp, aResult->mSharedState.Get()->mCsp)
             : !aResult->mSharedState.Get()->mCsp,
diff --git a/docshell/shistory/SessionHistoryEntry.h b/docshell/shistory/SessionHistoryEntry.h
@@ -141,7 +141,6 @@ class SessionHistoryInfo {
   nsIPrincipal* GetPrincipalToInherit() const;
 
   nsIPrincipal* GetPartitionedPrincipalToInherit() const;
-  void SetPartitionedPrincipalToInherit(nsIPrincipal* aPrincipal);
 
   nsIContentSecurityPolicy* GetCsp() const;
 
diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp
@@ -7527,13 +7527,7 @@ mozilla::ipc::IPCResult ContentParent::RecvHistoryCommit(
     const MaybeDiscarded<BrowsingContext>& aContext, const uint64_t& aLoadID,
     const nsID& aChangeID, const uint32_t& aLoadType, const bool& aPersist,
     const bool& aCloneEntryChildren, const bool& aChannelExpired,
-    const uint32_t& aCacheKey, nsIPrincipal* aPartitionedPrincipal) {
-  if (!ValidatePrincipal(aPartitionedPrincipal,
-                         {ValidatePrincipalOptions::AllowNullPtr,
-                          ValidatePrincipalOptions::AllowSystem})) {
-    LogAndAssertFailedPrincipalValidationInfo(aPartitionedPrincipal, __func__);
-  }
-
+    const uint32_t& aCacheKey) {
   if (!aContext.IsDiscarded()) {
     CanonicalBrowsingContext* canonical = aContext.get_canonical();
     if (!canonical) {
@@ -7542,7 +7536,7 @@ mozilla::ipc::IPCResult ContentParent::RecvHistoryCommit(
     }
     canonical->SessionHistoryCommit(aLoadID, aChangeID, aLoadType, aPersist,
                                     aCloneEntryChildren, aChannelExpired,
-                                    aCacheKey, aPartitionedPrincipal);
+                                    aCacheKey);
   }
   return IPC_OK();
 }
diff --git a/dom/ipc/ContentParent.h b/dom/ipc/ContentParent.h
@@ -1304,7 +1304,7 @@ class ContentParent final : public PContentParent,
       const MaybeDiscarded<BrowsingContext>& aContext, const uint64_t& aLoadID,
       const nsID& aChangeID, const uint32_t& aLoadType, const bool& aPersist,
       const bool& aCloneEntryChildren, const bool& aChannelExpired,
-      const uint32_t& aCacheKey, nsIPrincipal* aPartitionedPrincipal);
+      const uint32_t& aCacheKey);
 
   MOZ_CAN_RUN_SCRIPT_BOUNDARY
   mozilla::ipc::IPCResult RecvHistoryGo(
diff --git a/dom/ipc/PContent.ipdl b/dom/ipc/PContent.ipdl
@@ -1784,8 +1784,7 @@ parent:
     async HistoryCommit(MaybeDiscardedBrowsingContext aContext,
                         uint64_t aLoadID, nsID aChangeID, uint32_t aLoadType,
                         bool aPersist, bool aCloneEntryChildren,
-                        bool aChannelExpired, uint32_t aCacheKey,
-                        nullable nsIPrincipal aPartitionedPrincipal);
+                        bool aChannelExpired, uint32_t aCacheKey);
 
     async HistoryGo(MaybeDiscardedBrowsingContext aContext, int32_t aOffset,
                     uint64_t aHistoryEpoch, bool aRequireUserInteraction,
diff --git a/netwerk/ipc/DocumentLoadListener.cpp b/netwerk/ipc/DocumentLoadListener.cpp
@@ -662,8 +662,7 @@ static Result<SessionHistoryEntry*, const char*> ValidateHistoryLoad(
                    aLoadState->PrincipalToInherit())) {
     return Err("PrincipalToInherit");
   }
-  if (snapshot->GetPartitionedPrincipalToInherit() &&
-      !principalEq(snapshot->GetPartitionedPrincipalToInherit(),
+  if (!principalEq(snapshot->GetPartitionedPrincipalToInherit(),
                    aLoadState->PartitionedPrincipalToInherit())) {
     return Err("PartitionedPrincipalToInherit");
   }
diff --git a/toolkit/modules/sessionstore/SessionHistory.sys.mjs b/toolkit/modules/sessionstore/SessionHistory.sys.mjs
@@ -277,6 +277,13 @@ var SessionHistoryInternal = {
       );
     }
 
+    if (shEntry.partitionedPrincipalToInherit) {
+      entry.partitionedPrincipalToInherit_base64 =
+        lazy.E10SUtils.serializePrincipal(
+          shEntry.partitionedPrincipalToInherit
+        );
+    }
+
     entry.hasUserInteraction = shEntry.hasUserInteraction;
 
     if (shEntry.triggeringPrincipal) {
@@ -563,6 +570,12 @@ var SessionHistoryInternal = {
     );
     // As both partitionedPrincipal and principalToInherit are both not required to load
     // it's ok to keep these undefined when we don't have a previously defined principal.
+    if (entry.partitionedPrincipalToInherit_base64) {
+      shEntry.partitionedPrincipalToInherit =
+        lazy.E10SUtils.deserializePrincipal(
+          entry.partitionedPrincipalToInherit_base64
+        );
+    }
     if (entry.principalToInherit_base64) {
       shEntry.principalToInherit = lazy.E10SUtils.deserializePrincipal(
         entry.principalToInherit_base64
