Revert "Bug 1968644 - Part 10: Store JSCallingLocation and set the JSCallingLocation fallback for Media loads. r=emilio" for causing valgrid failures.

This reverts commit efd9a5b.

Revert "Bug 1968644 - Part 9: Add more tests for loads triggered by tracking scripts. r=valentin,anti-tracking-reviewers,emz"

This reverts commit 7d5c3e1.

Revert "Bug 1968644 - Part 8: Populate the triggeringFirstPartyClassificationFlags and triggeringThirdPartyClassificationFlags for WebSocket requests. r=valentin,necko-reviewers"

This reverts commit 53a783a.

Revert "Bug 1968644 - Part 7: Add tests. r=necko-reviewers,anti-tracking-reviewers,emz,valentin"

This reverts commit e52f034.

Revert "Bug 1968644 - Part 6: Populate triggeringFirstPartyClassificationFlags and triggeringThirdPartyClassificationFlags during channel creation. r=necko-reviewers,kershaw"

This reverts commit f564c21.

Revert "Bug 1968644 - Part 5: Populate triggeringFirstPartyClassificationFlags and triggeringThirdPartyClassificationFlags for CSS loads. r=emilio"

This reverts commit 8a8fd7b.

Revert "Bug 1968644 - Part 4: Populate triggeringFirstPartyClassificationFlags and triggeringThirdPartyClassificationFlags for loads. r=smaug,necko-reviewers"

This reverts commit 7b3ba3b.

Revert "Bug 1968644 - Part 3: Populate the triggeringFirstPartyClassificationFlags and triggeringThirdPartyClassificationFlags for fetch requests. r=valentin,smaug"

This reverts commit 08f0902.

Revert "Bug 1968644 - Part 2: Intorduce the ClassificationFlags to nsIClassifiedChannel.idl. r=dimi,necko-reviewers,valentin"

This reverts commit b8c01cd.

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

This reverts commit a7619a7.

Author: agoloman

docshell/base/nsDocShell.cpp

@@ -107,7 +107,6 @@
 #include "nsICaptivePortalService.h"
 #include "nsIChannel.h"
 #include "nsIChannelEventSink.h"
-#include "nsIClassifiedChannel.h"
 #include "nsIClassOfService.h"
 #include "nsIConsoleReportCollector.h"
 #include "nsIContent.h"
@@ -4134,8 +4133,6 @@ nsresult nsDocShell::ReloadDocument(nsDocShell* aDocShell, Document* aDocument,
   uint32_t triggeringSandboxFlags = aDocument->GetSandboxFlags();
   uint64_t triggeringWindowId = aDocument->InnerWindowID();
   bool triggeringStorageAccess = aDocument->UsingStorageAccess();
-  net::ClassificationFlags triggeringClassificationFlags =
-      aDocument->GetScriptTrackingFlags();
 
   nsAutoString contentTypeHint;
   aDocument->GetContentType(contentTypeHint);
@@ -4184,7 +4181,6 @@ nsresult nsDocShell::ReloadDocument(nsDocShell* aDocShell, Document* aDocument,
   loadState->SetTriggeringSandboxFlags(triggeringSandboxFlags);
   loadState->SetTriggeringWindowId(triggeringWindowId);
   loadState->SetTriggeringStorageAccess(triggeringStorageAccess);
-  loadState->SetTriggeringClassificationFlags(triggeringClassificationFlags);
   loadState->SetPrincipalToInherit(triggeringPrincipal);
   loadState->SetCsp(csp);
   loadState->SetInternalLoadFlags(flags);
@@ -5167,7 +5163,6 @@ nsDocShell::ForceRefreshURI(nsIURI* aURI, nsIPrincipal* aPrincipal,
   loadState->SetTriggeringSandboxFlags(doc->GetSandboxFlags());
   loadState->SetTriggeringWindowId(doc->InnerWindowID());
   loadState->SetTriggeringStorageAccess(doc->UsingStorageAccess());
-  loadState->SetTriggeringClassificationFlags(doc->GetScriptTrackingFlags());
 
   loadState->SetPrincipalIsExplicit(true);
 
@@ -6775,19 +6770,6 @@ nsresult nsDocShell::CreateAboutBlankDocumentViewer(
       // after being set here.
       blankDoc->SetSandboxFlags(sandboxFlags);
 
-      // We inherit the classification flags from the parent document if the
-      // principal matches.
-      nsCOMPtr<nsIDocShellTreeItem> parentItem;
-      GetInProcessSameTypeParent(getter_AddRefs(parentItem));
-      if (parentItem) {
-        RefPtr<Document> parentDocument = parentItem->GetDocument();
-        if (parentDocument && principal &&
-            principal->Equals(parentDocument->NodePrincipal())) {
-          blankDoc->SetClassificationFlags(
-              parentDocument->GetClassificationFlags());
-        }
-      }
-
       // create a content viewer for us and the new document
       docFactory->CreateInstanceForDocument(
           NS_ISUPPORTS_CAST(nsIDocShell*, this), blankDoc, "view",
@@ -7989,19 +7971,6 @@ nsresult nsDocShell::CreateDocumentViewer(const nsACString& aContentType,
                                       nullptr, nullptr, nullptr, true, false);
   }
 
-  // We inherit the classification flags from the parent document if the
-  // document is about:blank and the principal matches.
-  nsCOMPtr<nsIDocShellTreeItem> parentItem;
-  GetInProcessSameTypeParent(getter_AddRefs(parentItem));
-  if (parentItem && finalURI && NS_IsAboutBlank(finalURI)) {
-    RefPtr<Document> doc = viewer->GetDocument();
-    RefPtr<Document> parentDocument = parentItem->GetDocument();
-    if (parentDocument && doc &&
-        doc->NodePrincipal()->Equals(parentDocument->NodePrincipal())) {
-      doc->SetClassificationFlags(parentDocument->GetClassificationFlags());
-    }
-  }
-
   // let's try resetting the load group if we need to...
   nsCOMPtr<nsILoadGroup> currentLoadGroup;
   NS_ENSURE_SUCCESS(
@@ -8604,8 +8573,6 @@ nsresult nsDocShell::PerformRetargeting(nsDocShellLoadState* aLoadState) {
       loadState->SetTriggeringWindowId(aLoadState->TriggeringWindowId());
       loadState->SetTriggeringStorageAccess(
           aLoadState->TriggeringStorageAccess());
-      loadState->SetTriggeringClassificationFlags(
-          aLoadState->TriggeringClassificationFlags());
       loadState->SetCsp(aLoadState->Csp());
       loadState->SetInheritPrincipal(aLoadState->HasInternalLoadFlags(
           INTERNAL_LOAD_FLAGS_INHERIT_PRINCIPAL));
@@ -10808,9 +10775,6 @@ nsresult nsDocShell::DoURILoad(nsDocShellLoadState* aLoadState,
   loadInfo->SetTriggeringWindowId(aLoadState->TriggeringWindowId());
   loadInfo->SetTriggeringStorageAccess(aLoadState->TriggeringStorageAccess());
   loadInfo->SetTriggeringSandboxFlags(aLoadState->TriggeringSandboxFlags());
-  net::ClassificationFlags flags = aLoadState->TriggeringClassificationFlags();
-  loadInfo->SetTriggeringFirstPartyClassificationFlags(flags.firstPartyFlags);
-  loadInfo->SetTriggeringThirdPartyClassificationFlags(flags.thirdPartyFlags);
   loadInfo->SetIsMetaRefresh(aLoadState->IsMetaRefresh());
 
   uint32_t cacheKey = 0;
@@ -13275,8 +13239,6 @@ nsresult nsDocShell::OnLinkClick(
       ownerDoc->ConsumeTextDirectiveUserActivation() ||
       hasValidUserGestureActivation);
   loadState->SetUserNavigationInvolvement(aUserInvolvement);
-  loadState->SetTriggeringClassificationFlags(
-      ownerDoc->GetScriptTrackingFlags());
 
   nsCOMPtr<nsIRunnable> ev = new OnLinkClickEvent(
       this, aContent, loadState, noOpenerImplied, aTriggeringPrincipal);

docshell/base/nsDocShellLoadState.cpp

@@ -93,7 +93,6 @@ nsDocShellLoadState::nsDocShellLoadState(
   mTriggeringSandboxFlags = aLoadState.TriggeringSandboxFlags();
   mTriggeringWindowId = aLoadState.TriggeringWindowId();
   mTriggeringStorageAccess = aLoadState.TriggeringStorageAccess();
-  mTriggeringClassificationFlags = aLoadState.TriggeringClassificationFlags();
   mTriggeringRemoteType = aLoadState.TriggeringRemoteType();
   mSchemelessInput = aLoadState.SchemelessInput();
   mHttpsUpgradeTelemetry = aLoadState.HttpsUpgradeTelemetry();
@@ -162,7 +161,6 @@ nsDocShellLoadState::nsDocShellLoadState(const nsDocShellLoadState& aOther)
       mTriggeringSandboxFlags(aOther.mTriggeringSandboxFlags),
       mTriggeringWindowId(aOther.mTriggeringWindowId),
       mTriggeringStorageAccess(aOther.mTriggeringStorageAccess),
-      mTriggeringClassificationFlags(aOther.mTriggeringClassificationFlags),
       mCsp(aOther.mCsp),
       mKeepResultPrincipalURIIfSet(aOther.mKeepResultPrincipalURIIfSet),
       mLoadReplace(aOther.mLoadReplace),
@@ -224,7 +222,6 @@ nsDocShellLoadState::nsDocShellLoadState(nsIURI* aURI, uint64_t aLoadIdentifier)
       mTriggeringSandboxFlags(0),
       mTriggeringWindowId(0),
       mTriggeringStorageAccess(false),
-      mTriggeringClassificationFlags({0, 0}),
       mKeepResultPrincipalURIIfSet(false),
       mLoadReplace(false),
       mInheritPrincipal(false),
@@ -483,9 +480,6 @@ nsresult nsDocShellLoadState::CreateFromLoadURIOptions(
   loadState->SetTriggeringWindowId(aLoadURIOptions.mTriggeringWindowId);
   loadState->SetTriggeringStorageAccess(
       aLoadURIOptions.mTriggeringStorageAccess);
-  // The load is assumed to be first-party, so the triggering classification
-  // should be both zero.
-  loadState->SetTriggeringClassificationFlags({0, 0});
   loadState->SetPostDataStream(postData);
   loadState->SetHeadersStream(aLoadURIOptions.mHeaders);
   loadState->SetBaseURI(aLoadURIOptions.mBaseURI);
@@ -625,16 +619,6 @@ bool nsDocShellLoadState::TriggeringStorageAccess() const {
   return mTriggeringStorageAccess;
 }
 
-mozilla::net::ClassificationFlags
-nsDocShellLoadState::TriggeringClassificationFlags() const {
-  return mTriggeringClassificationFlags;
-}
-
-void nsDocShellLoadState::SetTriggeringClassificationFlags(
-    mozilla::net::ClassificationFlags aFlags) {
-  mTriggeringClassificationFlags = aFlags;
-}
-
 bool nsDocShellLoadState::InheritPrincipal() const { return mInheritPrincipal; }
 
 void nsDocShellLoadState::SetInheritPrincipal(bool aInheritPrincipal) {
@@ -1380,7 +1364,6 @@ DocShellLoadStateInit nsDocShellLoadState::Serialize(
   loadState.TriggeringSandboxFlags() = mTriggeringSandboxFlags;
   loadState.TriggeringWindowId() = mTriggeringWindowId;
   loadState.TriggeringStorageAccess() = mTriggeringStorageAccess;
-  loadState.TriggeringClassificationFlags() = mTriggeringClassificationFlags;
   loadState.TriggeringRemoteType() = mTriggeringRemoteType;
   loadState.SchemelessInput() = mSchemelessInput;
   loadState.HttpsUpgradeTelemetry() = mHttpsUpgradeTelemetry;

docshell/base/nsDocShellLoadState.h

@@ -12,7 +12,6 @@
 #include "mozilla/dom/SessionHistoryEntry.h"
 #include "mozilla/dom/UserNavigationInvolvement.h"
 
-#include "nsIClassifiedChannel.h"
 #include "nsILoadInfo.h"
 
 // Helper Classes
@@ -128,10 +127,6 @@ class nsDocShellLoadState final {
 
   void SetTriggeringStorageAccess(bool aTriggeringStorageAccess);
 
-  mozilla::net::ClassificationFlags TriggeringClassificationFlags() const;
-  void SetTriggeringClassificationFlags(
-      mozilla::net::ClassificationFlags aFlags);
-
   nsIContentSecurityPolicy* Csp() const;
 
   void SetCsp(nsIContentSecurityPolicy* aCsp);
@@ -489,10 +484,6 @@ class nsDocShellLoadState final {
   uint64_t mTriggeringWindowId;
   bool mTriggeringStorageAccess;
 
-  // The classification flags of the context responsible for causing
-  // the load to start.
-  mozilla::net::ClassificationFlags mTriggeringClassificationFlags;
-
   // The CSP of the load, that is, the CSP of the entity responsible for causing
   // the load to occur. Most likely this is the CSP of the document that started
   // the load. In case the entity starting the load did not use a CSP, then mCsp

dom/base/Document.cpp

@@ -342,7 +342,6 @@
 #include "nsICSSLoaderObserver.h"
 #include "nsICategoryManager.h"
 #include "nsICertOverrideService.h"
-#include "nsIClassifiedChannel.h"
 #include "nsIContent.h"
 #include "nsIContentInlines.h"
 #include "nsIContentPolicy.h"
@@ -1507,7 +1506,6 @@ Document::Document(const char* aContentType)
       mThrowOnDynamicMarkupInsertionCounter(0),
       mIgnoreOpensDuringUnloadCounter(0),
       mSavedResolution(1.0f),
-      mClassificationFlags({0, 0}),
       mGeneration(0),
       mCachedTabSizeGeneration(0),
       mNextFormNumber(0),
@@ -3671,15 +3669,6 @@ nsresult Document::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
     WarnIfSandboxIneffective(docShell, mSandboxFlags, GetChannel());
   }
 
-  nsCOMPtr<nsIClassifiedChannel> classifiedChannel =
-      do_QueryInterface(aChannel);
-
-  if (classifiedChannel) {
-    mClassificationFlags = {
-        classifiedChannel->GetFirstPartyClassificationFlags(),
-        classifiedChannel->GetThirdPartyClassificationFlags()};
-  }
-
   // Set the opener policy for the top level content document.
   nsCOMPtr<nsIHttpChannelInternal> httpChan = do_QueryInterface(mChannel);
   nsILoadInfo::CrossOriginOpenerPolicy policy =
@@ -4538,10 +4527,9 @@ nsresult Document::Dispatch(already_AddRefed<nsIRunnable>&& aRunnable) const {
 }
 
 void Document::NoteScriptTrackingStatus(const nsACString& aURL,
-                                        net::ClassificationFlags& aFlags) {
-  // If the script is not tracking, we don't need to do anything.
-  if (aFlags.firstPartyFlags || aFlags.thirdPartyFlags) {
-    mTrackingScripts.InsertOrUpdate(aURL, aFlags);
+                                        bool aIsTracking) {
+  if (aIsTracking) {
+    mTrackingScripts.Insert(aURL);
   }
   // Ideally, whether a given script is tracking or not should be consistent,
   // but there is a race so that it is not, when loading real sites in debug
@@ -4554,27 +4542,7 @@ bool Document::IsScriptTracking(JSContext* aCx) const {
   if (!JS::DescribeScriptedCaller(&filename, aCx)) {
     return false;
   }
-
-  auto entry = mTrackingScripts.Lookup(nsDependentCString(filename.get()));
-  if (!entry) {
-    return false;
-  }
-
-  return net::UrlClassifierCommon::IsTrackingClassificationFlag(
-      entry.Data().thirdPartyFlags, IsInPrivateBrowsing());
-}
-
-net::ClassificationFlags Document::GetScriptTrackingFlags() const {
-  if (auto loc = JSCallingLocation::Get()) {
-    if (auto entry = mTrackingScripts.Lookup(loc.FileName())) {
-      return entry.Data();
-    }
-  }
-
-  // If the currently executing script is not a tracker, return the
-  // classification flags of the document.
-
-  return mClassificationFlags;
+  return mTrackingScripts.Contains(nsDependentCString(filename.get()));
 }
 
 void Document::GetContentType(nsAString& aContentType) {

dom/base/Document.h

@@ -71,7 +71,6 @@
 #include "nsHashKeys.h"
 #include "nsIChannel.h"
 #include "nsIChannelEventSink.h"
-#include "nsIClassifiedChannel.h"
 #include "nsID.h"
 #include "nsIDocumentViewer.h"
 #include "nsIInterfaceRequestor.h"
@@ -3889,24 +3888,11 @@ class Document : public nsINode,
   // The URLs passed to this function should match what
   // JS::DescribeScriptedCaller() returns, since this API is used to
   // determine whether some code is being called from a tracking script.
-  void NoteScriptTrackingStatus(const nsACString& aURL,
-                                net::ClassificationFlags& aFlags);
+  void NoteScriptTrackingStatus(const nsACString& aURL, bool isTracking);
   // The JSContext passed to this method represents the context that we want to
   // determine if it belongs to a tracker.
   bool IsScriptTracking(JSContext* aCx) const;
 
-  // Acquires the script tracking flags for the currently executing script. If
-  // the currently executing script is not a tracker, it will return the
-  // classification flags of the document.
-  net::ClassificationFlags GetScriptTrackingFlags() const;
-
-  net::ClassificationFlags GetClassificationFlags() {
-    return mClassificationFlags;
-  }
-  void SetClassificationFlags(net::ClassificationFlags aFlags) {
-    mClassificationFlags = aFlags;
-  }
-
   // ResizeObserver usage.
   void AddResizeObserver(ResizeObserver& aObserver) {
     MOZ_ASSERT(!mResizeObservers.Contains(&aObserver));
@@ -5313,10 +5299,10 @@ class Document : public nsINode,
 
   RefPtr<nsCommandManager> mMidasCommandManager;
 
-  // The hashmap of all the tracking script URLs.  URLs are added to this map by
+  // The set of all the tracking script URLs.  URLs are added to this set by
   // calling NoteScriptTrackingStatus().  Currently we assume that a URL not
-  // existing in the map means the corresponding script isn't a tracking script.
-  nsTHashMap<nsCStringHashKey, net::ClassificationFlags> mTrackingScripts;
+  // existing in the set means the corresponding script isn't a tracking script.
+  nsTHashSet<nsCString> mTrackingScripts;
 
   // Pointer to our parser if we're currently in the process of being
   // parsed into.
@@ -5546,8 +5532,6 @@ class Document : public nsINode,
 
   bool mHasStoragePermission;
 
-  net::ClassificationFlags mClassificationFlags;
-
   // Document generation. Gets incremented everytime it changes.
   int32_t mGeneration;
 

dom/base/LocationBase.cpp

@@ -7,7 +7,6 @@
 #include "mozilla/dom/LocationBase.h"
 #include "nsIScriptSecurityManager.h"
 #include "nsIScriptContext.h"
-#include "nsIClassifiedChannel.h"
 #include "nsDocShellLoadState.h"
 #include "nsIWebNavigation.h"
 #include "nsNetUtil.h"
@@ -114,7 +113,6 @@ already_AddRefed<nsDocShellLoadState> LocationBase::CheckURL(
       loadState->HasValidUserGestureActivation());
   loadState->SetTriggeringWindowId(doc->InnerWindowID());
   loadState->SetTriggeringStorageAccess(doc->UsingStorageAccess());
-  loadState->SetTriggeringClassificationFlags(doc->GetScriptTrackingFlags());
 
   return loadState.forget();
 }

dom/base/nsFrameLoader.cpp

@@ -715,8 +715,6 @@ nsresult nsFrameLoader::ReallyStartLoadingInternal() {
     if (ownerDoc) {
       loadState->SetTriggeringStorageAccess(ownerDoc->UsingStorageAccess());
       loadState->SetTriggeringWindowId(ownerDoc->InnerWindowID());
-      loadState->SetTriggeringClassificationFlags(
-          ownerDoc->GetScriptTrackingFlags());
     }
 
     // If we're loading the default about:blank document in a <browser> element,