Bug 1968644 - Part 1: Introduce triggeringFirstPartyClassificationFlags and triggeringThirdPartyClassificationFlags to LoadInfo. r=necko-reviewers,kershaw

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

Author: artines1

ipc/glue/BackgroundUtils.cpp

@@ -565,6 +565,8 @@ nsresult LoadInfoToLoadInfoArgs(nsILoadInfo* aLoadInfo,
       aLoadInfo->GetSandboxFlags(), aLoadInfo->GetTriggeringSandboxFlags(),
       aLoadInfo->GetTriggeringWindowId(),
       aLoadInfo->GetTriggeringStorageAccess(),
+      aLoadInfo->GetTriggeringFirstPartyClassificationFlags(),
+      aLoadInfo->GetTriggeringThirdPartyClassificationFlags(),
       aLoadInfo->InternalContentPolicyType(),
       static_cast<uint32_t>(aLoadInfo->GetTainting()),
       aLoadInfo->GetBlockAllMixedContent(),
@@ -860,7 +862,10 @@ nsresult LoadInfoArgsToLoadInfo(const LoadInfoArgs& loadInfoArgs,
       reservedClientInfo, initialClientInfo, controller,
       loadInfoArgs.securityFlags(), loadInfoArgs.sandboxFlags(),
       loadInfoArgs.triggeringSandboxFlags(), loadInfoArgs.triggeringWindowId(),
-      loadInfoArgs.triggeringStorageAccess(), loadInfoArgs.contentPolicyType(),
+      loadInfoArgs.triggeringStorageAccess(),
+      loadInfoArgs.triggeringFirstPartyClassificationFlags(),
+      loadInfoArgs.triggeringThirdPartyClassificationFlags(),
+      loadInfoArgs.contentPolicyType(),
       static_cast<LoadTainting>(loadInfoArgs.tainting()),
       loadInfoArgs.blockAllMixedContent(),
       loadInfoArgs.upgradeInsecureRequests(),

netwerk/base/LoadInfo.cpp

@@ -718,6 +718,10 @@ LoadInfo::LoadInfo(const LoadInfo& rhs)
       mTriggeringSandboxFlags(rhs.mTriggeringSandboxFlags),
       mTriggeringWindowId(rhs.mTriggeringWindowId),
       mTriggeringStorageAccess(rhs.mTriggeringStorageAccess),
+      mTriggeringFirstPartyClassificationFlags(
+          rhs.mTriggeringFirstPartyClassificationFlags),
+      mTriggeringThirdPartyClassificationFlags(
+          rhs.mTriggeringThirdPartyClassificationFlags),
       mInternalContentPolicyType(rhs.mInternalContentPolicyType),
       mTainting(rhs.mTainting),
       mBlockAllMixedContent(rhs.mBlockAllMixedContent),
@@ -809,9 +813,12 @@ LoadInfo::LoadInfo(
     const Maybe<ServiceWorkerDescriptor>& aController,
     nsSecurityFlags aSecurityFlags, uint32_t aSandboxFlags,
     uint32_t aTriggeringSandboxFlags, uint64_t aTriggeringWindowId,
-    bool aTriggeringStorageAccess, nsContentPolicyType aContentPolicyType,
-    LoadTainting aTainting, bool aBlockAllMixedContent,
-    bool aUpgradeInsecureRequests, bool aBrowserUpgradeInsecureRequests,
+    bool aTriggeringStorageAccess,
+    uint32_t aTriggeringFirstPartyClassificationFlags,
+    uint32_t aTriggeringThirdPartyClassificationFlags,
+    nsContentPolicyType aContentPolicyType, LoadTainting aTainting,
+    bool aBlockAllMixedContent, bool aUpgradeInsecureRequests,
+    bool aBrowserUpgradeInsecureRequests,
     bool aBrowserDidUpgradeInsecureRequests,
     bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI,
     bool aAllowInsecureRedirectToDataURI,
@@ -870,6 +877,10 @@ LoadInfo::LoadInfo(
       mTriggeringSandboxFlags(aTriggeringSandboxFlags),
       mTriggeringWindowId(aTriggeringWindowId),
       mTriggeringStorageAccess(aTriggeringStorageAccess),
+      mTriggeringFirstPartyClassificationFlags(
+          aTriggeringFirstPartyClassificationFlags),
+      mTriggeringThirdPartyClassificationFlags(
+          aTriggeringThirdPartyClassificationFlags),
       mInternalContentPolicyType(aContentPolicyType),
       mTainting(aTainting),
       mBlockAllMixedContent(aBlockAllMixedContent),
@@ -1201,6 +1212,30 @@ LoadInfo::SetTriggeringStorageAccess(bool aFlags) {
   return NS_OK;
 }
 
+NS_IMETHODIMP
+LoadInfo::GetTriggeringFirstPartyClassificationFlags(uint32_t* aResult) {
+  *aResult = mTriggeringFirstPartyClassificationFlags;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::SetTriggeringFirstPartyClassificationFlags(uint32_t aFlags) {
+  mTriggeringFirstPartyClassificationFlags = aFlags;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::GetTriggeringThirdPartyClassificationFlags(uint32_t* aResult) {
+  *aResult = mTriggeringThirdPartyClassificationFlags;
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+LoadInfo::SetTriggeringThirdPartyClassificationFlags(uint32_t aFlags) {
+  mTriggeringThirdPartyClassificationFlags = aFlags;
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 LoadInfo::GetSecurityMode(uint32_t* aFlags) {
   *aFlags = nsContentSecurityManager::ComputeSecurityMode(mSecurityFlags);

netwerk/base/LoadInfo.h

@@ -237,9 +237,12 @@ class LoadInfo final : public nsILoadInfo {
       const Maybe<mozilla::dom::ServiceWorkerDescriptor>& aController,
       nsSecurityFlags aSecurityFlags, uint32_t aSandboxFlags,
       uint32_t aTriggeringSandboxFlags, uint64_t aTriggeringWindowId,
-      bool aTriggeringStorageAccess, nsContentPolicyType aContentPolicyType,
-      LoadTainting aTainting, bool aBlockAllMixedContent,
-      bool aUpgradeInsecureRequests, bool aBrowserUpgradeInsecureRequests,
+      bool aTriggeringStorageAccess,
+      uint32_t aTriggeringFirstPartyClassificationFlags,
+      uint32_t aTriggeringThirdPartyClassificationFlags,
+      nsContentPolicyType aContentPolicyType, LoadTainting aTainting,
+      bool aBlockAllMixedContent, bool aUpgradeInsecureRequests,
+      bool aBrowserUpgradeInsecureRequests,
       bool aBrowserDidUpgradeInsecureRequests,
       bool aBrowserWouldUpgradeInsecureRequests, bool aForceAllowDataURI,
       bool aAllowInsecureRedirectToDataURI,
@@ -348,6 +351,8 @@ class LoadInfo final : public nsILoadInfo {
   uint32_t mTriggeringSandboxFlags = 0;
   uint64_t mTriggeringWindowId = 0;
   bool mTriggeringStorageAccess = false;
+  uint32_t mTriggeringFirstPartyClassificationFlags = 0;
+  uint32_t mTriggeringThirdPartyClassificationFlags = 0;
   nsContentPolicyType mInternalContentPolicyType;
   LoadTainting mTainting = LoadTainting::Basic;
   bool mBlockAllMixedContent = false;

netwerk/base/TRRLoadInfo.cpp

@@ -150,6 +150,26 @@ TRRLoadInfo::SetTriggeringStorageAccess(bool aResult) {
   return NS_ERROR_NOT_IMPLEMENTED;
 }
 
+NS_IMETHODIMP
+TRRLoadInfo::GetTriggeringFirstPartyClassificationFlags(uint32_t* aResult) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+TRRLoadInfo::SetTriggeringFirstPartyClassificationFlags(uint32_t aResult) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+TRRLoadInfo::GetTriggeringThirdPartyClassificationFlags(uint32_t* aResult) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+TRRLoadInfo::SetTriggeringThirdPartyClassificationFlags(uint32_t aResult) {
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
 NS_IMETHODIMP
 TRRLoadInfo::GetSecurityMode(uint32_t* aFlags) {
   return NS_ERROR_NOT_IMPLEMENTED;

netwerk/base/nsILoadInfo.idl

@@ -457,6 +457,24 @@ interface nsILoadInfo : nsISupports
   [infallible] attribute unsigned long long triggeringWindowId;
   [infallible] attribute boolean triggeringStorageAccess;
 
+  /**
+   * The classification flags of the first-party context responsible for causing
+   * the load to start. If the load is not triggered by a first-party context,
+   * this will be 0.
+   *
+   * See nsIClassifiedChannel.idl for the list of flags.
+   */
+  [infallible] attribute unsigned long triggeringFirstPartyClassificationFlags;
+
+  /**
+   * The classification flags of the third-party context responsible for causing
+   * the load to start. If the load is not triggered by a third-party context,
+   * this will be 0.
+   *
+   * See nsIClassifiedChannel.idl for the list of flags.
+   */
+  [infallible] attribute unsigned long triggeringThirdPartyClassificationFlags;
+
   /**
    * Allows to query only the security mode bits from above.
    */

netwerk/ipc/NeckoChannelParams.ipdlh

@@ -119,6 +119,8 @@ struct LoadInfoArgs
   uint32_t                    triggeringSandboxFlags;
   uint64_t                    triggeringWindowId;
   bool                        triggeringStorageAccess;
+  uint32_t                    triggeringFirstPartyClassificationFlags;
+  uint32_t                    triggeringThirdPartyClassificationFlags;
   nsContentPolicyType         contentPolicyType;
   uint32_t                    tainting;
   bool                        blockAllMixedContent;