Commit 9089669f authored by Alexandru Marc's avatar Alexandru Marc Committed by amarc@mozilla.com
Browse files

Revert "Bug 1966658 - Populate the partitionedPrincipal to the... 

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

This reverts commit 52c31c4d.
parent dab3bfb9

browser/components/sessionstore/test/browser.toml

+0 −2
Original line number Diff line number Diff line
@@ -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"]

browser/components/sessionstore/test/browser_sessionHistory_partitionedPrincipalToInherit.js

deleted100644 → 0
+0 −108
Original line number Diff line number Diff line 
/* Any copyright is dedicated to the Public Domain.

 * http://creativecommons.org/publicdomain/zero/1.0/ */



"use strict";



add_task(async function test_partitioned_principal_to_inherit() {

  if (!Services.appinfo.sessionHistoryInParent) {

    ok(true, "sessionHistoryInParent is not enabled, skipping the test.");

    return;

  }



  // Create a new tab.

  let tab = await BrowserTestUtils.openNewForegroundTab(

    gBrowser,

    "https://example.com"

  );

  let browser = tab.linkedBrowser;



  // Get the last entry in the session history.

  let sh = browser.browsingContext.sessionHistory;

  let entry = sh.getEntryAtIndex(sh.count - 1);

  let partitionedPrincipalToInherit = entry.partitionedPrincipalToInherit;



  // Check that the partitioned principal to inherit is properly set.

  ok(partitionedPrincipalToInherit, "partitionedPrincipalToInherit is set");

  is(

    partitionedPrincipalToInherit.originAttributes.partitionKey,

    "(https,example.com)",

    "correct partitionKey"

  );



  BrowserTestUtils.removeTab(tab);

});



add_task(async function test_partitioned_Principal_to_inherit_in_iframe() {

  if (!Services.appinfo.sessionHistoryInParent) {

    ok(true, "sessionHistoryInParent is not enabled, skipping the test.");

    return;

  }



  // Create a new tab.

  let tab = await BrowserTestUtils.openNewForegroundTab(

    gBrowser,

    "https://example.com"

  );

  let browser = tab.linkedBrowser;



  // Load a same-origin iframe

  await SpecialPowers.spawn(browser, [], async _ => {

    let iframe = content.document.createElement("iframe");

    iframe.src = "https://example.com";



    await new content.Promise(resolve => {

      iframe.onload = resolve;

      content.document.body.appendChild(iframe);

    });

  });



  // Get the last child entry in the session history for the same-origin iframe.

  let sh = browser.browsingContext.sessionHistory;

  let entry = sh.getEntryAtIndex(sh.count - 1);

  let childEntry = entry.GetChildAt(entry.childCount - 1);

  let partitionedPrincipalToInherit = childEntry.partitionedPrincipalToInherit;



  // Check that the partitioned principal to inherit is properly set.

  ok(partitionedPrincipalToInherit, "partitionedPrincipalToInherit is set");

  is(

    partitionedPrincipalToInherit.originNoSuffix,

    "https://example.com",

    "correct originNoSuffix in the same-origin iframe"

  );

  is(

    partitionedPrincipalToInherit.originAttributes.partitionKey,

    "(https,example.com)",

    "correct partitionKey in the same-origin iframe"

  );



  // Load a cross-site iframe.

  await SpecialPowers.spawn(browser, [], async _ => {

    let iframe = content.document.createElement("iframe");

    iframe.src = "https://example.net";



    await new content.Promise(resolve => {

      iframe.onload = resolve;

      content.document.body.appendChild(iframe);

    });

  });



  // Get the last child entry in the session history for the cross-site iframe.

  entry = sh.getEntryAtIndex(sh.count - 1);

  childEntry = entry.GetChildAt(entry.childCount - 1);

  partitionedPrincipalToInherit = childEntry.partitionedPrincipalToInherit;



  // Check that the partitioned principal to inherit is properly set.

  ok(partitionedPrincipalToInherit, "partitionedPrincipalToInherit is set");

  is(

    partitionedPrincipalToInherit.originNoSuffix,

    "https://example.net",

    "correct originNoSuffix in the cross-site iframe"

  );

  is(

    partitionedPrincipalToInherit.originAttributes.partitionKey,

    "(https,example.com)",

    "correct partitionKey in the cross-site iframe"

  );



  BrowserTestUtils.removeTab(tab);

});

docshell/base/BrowsingContext.cpp

+5 −5
Original line number Diff line number Diff line
@@ -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);

  }

}

docshell/base/BrowsingContext.h

+1 −2
Original line number Diff line number Diff line
@@ -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);



  // Set a new active entry on this browsing context. This is used for

  // implementing history.pushState/replaceState and same document navigations.

docshell/base/CanonicalBrowsingContext.cpp

+1 −3
Original line number Diff line number Diff line
@@ -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);