Bug 1614353 - Remove the remaining usages of nsIPrincipal::GetURI() in AntiTrackingCommon.cpp; r=baku

Differential Revision: https://phabricator.services.mozilla.com/D62334 --HG-- extra : moz-landing-system : lando
2020-02-11 09:33:32 +00:00 · 2020-02-11 09:33:32 +00:00 · 9a797d2cc9
--- a/dom/ipc/BrowserChild.cpp
+++ b/dom/ipc/BrowserChild.cpp
@ -4010,7 +4010,8 @@ BrowserChild::DoesWindowSupportProtectedMedia() {
 #endif

 void BrowserChild::NotifyContentBlockingEvent(
-    uint32_t aEvent, nsIChannel* aChannel, bool aBlocked, nsIURI* aHintURI,
+    uint32_t aEvent, nsIChannel* aChannel, bool aBlocked,
+    const nsACString& aTrackingOrigin,
    const nsTArray<nsCString>& aTrackingFullHashes,
    const Maybe<mozilla::AntiTrackingCommon::StorageAccessGrantedReason>&
        aReason) {
@ -4024,8 +4025,9 @@ void BrowserChild::NotifyContentBlockingEvent(
                                            requestData);
  NS_ENSURE_SUCCESS_VOID(rv);

-  Unused << SendNotifyContentBlockingEvent(
-      aEvent, requestData, aBlocked, aHintURI, aTrackingFullHashes, aReason);
+  Unused << SendNotifyContentBlockingEvent(aEvent, requestData, aBlocked,
+                                           PromiseFlatCString(aTrackingOrigin),
+                                           aTrackingFullHashes, aReason);
 }

 BrowserChildMessageManager::BrowserChildMessageManager(
--- a/dom/ipc/BrowserChild.h
+++ b/dom/ipc/BrowserChild.h
@ -693,7 +693,8 @@ class BrowserChild final : public nsMessageManagerScriptExecutor,
  // message to the BrowserParent in the parent. The BrowserParent will find the
  // top-level WindowGlobalParent and notify the event from it.
  void NotifyContentBlockingEvent(
-      uint32_t aEvent, nsIChannel* aChannel, bool aBlocked, nsIURI* aHintURI,
+      uint32_t aEvent, nsIChannel* aChannel, bool aBlocked,
+      const nsACString& aTrackingOrigin,
      const nsTArray<nsCString>& aTrackingFullHashes,
      const Maybe<AntiTrackingCommon::StorageAccessGrantedReason>& aReason);

--- a/dom/ipc/BrowserParent.cpp
+++ b/dom/ipc/BrowserParent.cpp
@ -2665,7 +2665,7 @@ mozilla::ipc::IPCResult BrowserParent::RecvNavigationFinished() {

 mozilla::ipc::IPCResult BrowserParent::RecvNotifyContentBlockingEvent(
    const uint32_t& aEvent, const RequestData& aRequestData,
-    const bool aBlocked, nsIURI* aHintURI,
+    const bool aBlocked, const nsACString& aTrackingOrigin,
    nsTArray<nsCString>&& aTrackingFullHashes,
    const Maybe<mozilla::AntiTrackingCommon::StorageAccessGrantedReason>&
        aReason) {
@ -2693,7 +2693,7 @@ mozilla::ipc::IPCResult BrowserParent::RecvNotifyContentBlockingEvent(
      aRequestData.requestURI(), aRequestData.originalRequestURI(),
      aRequestData.matchedList(), aRequestData.elapsedLoadTimeMS());

-  wgp->NotifyContentBlockingEvent(aEvent, request, aBlocked, aHintURI,
+  wgp->NotifyContentBlockingEvent(aEvent, request, aBlocked, aTrackingOrigin,
                                  aTrackingFullHashes, aReason);

  return IPC_OK();
--- a/dom/ipc/BrowserParent.h
+++ b/dom/ipc/BrowserParent.h
@ -319,7 +319,7 @@ class BrowserParent final : public PBrowserParent,

  mozilla::ipc::IPCResult RecvNotifyContentBlockingEvent(
      const uint32_t& aEvent, const RequestData& aRequestData,
-      const bool aBlocked, nsIURI* aHintURI,
+      const bool aBlocked, const nsACString& aTrackingOrigin,
      nsTArray<nsCString>&& aTrackingFullHashes,
      const Maybe<mozilla::AntiTrackingCommon::StorageAccessGrantedReason>&
          aReason);
--- a/dom/ipc/PBrowser.ipdl
+++ b/dom/ipc/PBrowser.ipdl
@ -603,7 +603,7 @@ parent:
                           WebProgressSecurityChangeData? aSecurityChangeData);

    async NotifyContentBlockingEvent(uint32_t aEvent, RequestData aRequestData,
-                                     bool aBlocked, nsIURI aHintURI,
+                                     bool aBlocked, nsCString aTrackingOrigin,
                                     nsCString[] aTrackingFullHashes,
                                     StorageAccessGrantedReason? aReason);

--- a/dom/ipc/WindowGlobalParent.cpp
+++ b/dom/ipc/WindowGlobalParent.cpp
@ -300,11 +300,11 @@ const nsAString& WindowGlobalParent::GetRemoteType() {
 }

 void WindowGlobalParent::NotifyContentBlockingEvent(
-    uint32_t aEvent, nsIRequest* aRequest, bool aBlocked, nsIURI* aURIHint,
+    uint32_t aEvent, nsIRequest* aRequest, bool aBlocked,
+    const nsACString& aTrackingOrigin,
    const nsTArray<nsCString>& aTrackingFullHashes,
    const Maybe<AntiTrackingCommon::StorageAccessGrantedReason>& aReason) {
  MOZ_ASSERT(NS_IsMainThread());
-  MOZ_ASSERT(aURIHint);
  DebugOnly<bool> isCookiesBlockedTracker =
      aEvent == nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER ||
      aEvent == nsIWebProgressListener::STATE_COOKIES_BLOCKED_SOCIALTRACKER;
@ -320,11 +320,8 @@ void WindowGlobalParent::NotifyContentBlockingEvent(
    return;
  }

-  nsAutoCString origin;
-  nsContentUtils::GetASCIIOrigin(aURIHint, origin);
-
  Maybe<uint32_t> event = GetContentBlockingLog()->RecordLogParent(
-      origin, aEvent, aBlocked, aReason, aTrackingFullHashes);
+      aTrackingOrigin, aEvent, aBlocked, aReason, aTrackingFullHashes);

  // Notify the OnContentBlockingEvent if necessary.
  if (event) {
--- a/dom/ipc/WindowGlobalParent.h
+++ b/dom/ipc/WindowGlobalParent.h
@ -139,7 +139,8 @@ class WindowGlobalParent final : public WindowContext,
                       JS::Handle<JSObject*> aGivenProto) override;

  void NotifyContentBlockingEvent(
-      uint32_t aEvent, nsIRequest* aRequest, bool aBlocked, nsIURI* aURIHint,
+      uint32_t aEvent, nsIRequest* aRequest, bool aBlocked,
+      const nsACString& aTrackingOrigin,
      const nsTArray<nsCString>& aTrackingFullHashes,
      const Maybe<AntiTrackingCommon::StorageAccessGrantedReason>& aReason =
          Nothing());
--- a/toolkit/components/antitracking/AntiTrackingCommon.cpp
+++ b/toolkit/components/antitracking/AntiTrackingCommon.cpp
@ -895,13 +895,18 @@ bool CheckAntiTrackingPermission(nsIPrincipal* aPrincipal,
 void NotifyAllowDecisionInternal(nsIChannel* aReportingChannel,
                                 nsIChannel* aTrackingChannel, nsIURI* aURI,
                                 nsPIDOMWindowOuter* aWindow) {
+  nsAutoCString trackingOrigin;
+  if (aURI) {
+    Unused << nsContentUtils::GetASCIIOrigin(aURI, trackingOrigin);
+  }
+
  // This can be called in either the parent process or the child processes.

  // Now send the generic "cookies loaded" notifications, from the most generic
  // to the most specific.
  AntiTrackingCommon::NotifyContentBlockingEvent(
      aWindow, aReportingChannel, aTrackingChannel, false,
-      nsIWebProgressListener::STATE_COOKIES_LOADED, aURI);
+      nsIWebProgressListener::STATE_COOKIES_LOADED, trackingOrigin);

  nsCOMPtr<nsIClassifiedChannel> classifiedChannel =
      do_QueryInterface(aTrackingChannel);
@ -915,14 +920,15 @@ void NotifyAllowDecisionInternal(nsIChannel* aReportingChannel,
      nsIClassifiedChannel::ClassificationFlags::CLASSIFIED_TRACKING) {
    AntiTrackingCommon::NotifyContentBlockingEvent(
        aWindow, aReportingChannel, aTrackingChannel, false,
-        nsIWebProgressListener::STATE_COOKIES_LOADED_TRACKER, aURI);
+        nsIWebProgressListener::STATE_COOKIES_LOADED_TRACKER, trackingOrigin);
  }

  if (classificationFlags &
      nsIClassifiedChannel::ClassificationFlags::CLASSIFIED_SOCIALTRACKING) {
    AntiTrackingCommon::NotifyContentBlockingEvent(
        aWindow, aReportingChannel, aTrackingChannel, false,
-        nsIWebProgressListener::STATE_COOKIES_LOADED_SOCIALTRACKER, aURI);
+        nsIWebProgressListener::STATE_COOKIES_LOADED_SOCIALTRACKER,
+        trackingOrigin);
  }
 }

@ -941,10 +947,15 @@ void NotifyBlockingDecisionInternal(
    return;
  }

+  nsAutoCString trackingOrigin;
+  if (aURI) {
+    Unused << nsContentUtils::GetASCIIOrigin(aURI, trackingOrigin);
+  }
+
  if (aDecision == AntiTrackingCommon::BlockingDecision::eBlock) {
-    AntiTrackingCommon::NotifyContentBlockingEvent(aWindow, aReportingChannel,
-                                                   aTrackingChannel, true,
-                                                   aRejectedReason, aURI);
+    AntiTrackingCommon::NotifyContentBlockingEvent(
+        aWindow, aReportingChannel, aTrackingChannel, true, aRejectedReason,
+        trackingOrigin);

    ReportBlockingToConsole(aReportingChannel, aURI, aRejectedReason);
  }
@ -960,10 +971,15 @@ void NotifyBlockingDecisionInternal(
  // Can be called only in the parent process when there is no window.
  MOZ_ASSERT(XRE_IsParentProcess());

+  nsAutoCString trackingOrigin;
+  if (aURI) {
+    Unused << nsContentUtils::GetASCIIOrigin(aURI, trackingOrigin);
+  }
+
  if (aDecision == AntiTrackingCommon::BlockingDecision::eBlock) {
-    AntiTrackingCommon::NotifyContentBlockingEvent(nullptr, aReportingChannel,
-                                                   aTrackingChannel, true,
-                                                   aRejectedReason, aURI);
+    AntiTrackingCommon::NotifyContentBlockingEvent(
+        nullptr, aReportingChannel, aTrackingChannel, true, aRejectedReason,
+        trackingOrigin);

    ReportBlockingToConsole(aReportingChannel, aURI, aRejectedReason);
  }
@ -977,7 +993,7 @@ void NotifyBlockingDecisionInternal(
 void NotifyContentBlockingEventInChild(
    nsPIDOMWindowOuter* aWindow, nsIChannel* aReportingChannel,
    nsIChannel* aTrackingChannel, bool aBlocked, uint32_t aRejectedReason,
-    nsIURI* aURI,
+    const nsACString& aTrackingOrigin,
    const Maybe<AntiTrackingCommon::StorageAccessGrantedReason>& aReason) {
  MOZ_ASSERT(XRE_IsContentProcess());
  MOZ_ASSERT(aWindow);
@ -995,15 +1011,15 @@ void NotifyContentBlockingEventInChild(
  }

  browserChild->NotifyContentBlockingEvent(aRejectedReason, aReportingChannel,
-                                           aBlocked, aURI, trackingFullHashes,
-                                           aReason);
+                                           aBlocked, aTrackingOrigin,
+                                           trackingFullHashes, aReason);
 }

 // Update the ContentBlockingLog of the top-level WindowGlobalParent of
 // the reporting channel.
 void NotifyContentBlockingEventInParent(
    nsIChannel* aReportingChannel, nsIChannel* aTrackingChannel, bool aBlocked,
-    uint32_t aRejectedReason, nsIURI* aURI,
+    uint32_t aRejectedReason, const nsACString& aTrackingOrigin,
    const Maybe<AntiTrackingCommon::StorageAccessGrantedReason>& aReason) {
  MOZ_ASSERT(XRE_IsParentProcess());

@ -1030,7 +1046,7 @@ void NotifyContentBlockingEventInParent(
  }

  wgp->NotifyContentBlockingEvent(aRejectedReason, aReportingChannel, aBlocked,
-                                  aURI, trackingFullHashes, aReason);
+                                  aTrackingOrigin, trackingFullHashes, aReason);
 }

 }  // namespace
@ -1239,16 +1255,12 @@ AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(
    // Let's inform the parent window.
    parentWindow->StorageAccessGranted();

-    auto* basePrin = BasePrincipal::Cast(trackingPrincipal);
-    nsCOMPtr<nsIURI> trackingURI;
-    basePrin->GetURI(getter_AddRefs(trackingURI));
-
    nsIChannel* channel =
        pwin->GetCurrentInnerWindow()->GetExtantDoc()->GetChannel();

-    NotifyContentBlockingEvent(pwin, channel,
-                               parentWindow->GetExtantDoc()->GetChannel(),
-                               false, blockReason, trackingURI, Some(aReason));
+    NotifyContentBlockingEvent(
+        pwin, channel, parentWindow->GetExtantDoc()->GetChannel(), false,
+        blockReason, trackingOrigin, Some(aReason));

    ReportUnblockingToConsole(parentWindow,
                              NS_ConvertUTF8toUTF16(trackingOrigin), aReason);
@ -2361,23 +2373,29 @@ void AntiTrackingCommon::NotifyContentBlockingEvent(nsIChannel* aChannel,
  nsCOMPtr<nsIURI> uri;
  aChannel->GetURI(getter_AddRefs(uri));

+  nsAutoCString trackingOrigin;
+  if (uri) {
+    Unused << nsContentUtils::GetASCIIOrigin(uri, trackingOrigin);
+  }
+
  return AntiTrackingCommon::NotifyContentBlockingEvent(
-      nullptr, aChannel, aChannel, true, aRejectedReason, uri);
+      nullptr, aChannel, aChannel, true, aRejectedReason, trackingOrigin);
 }

 /* static */
 void AntiTrackingCommon::NotifyContentBlockingEvent(
    nsPIDOMWindowOuter* aWindow, nsIChannel* aReportingChannel,
    nsIChannel* aTrackingChannel, bool aBlocked, uint32_t aRejectedReason,
-    nsIURI* aURI, const Maybe<StorageAccessGrantedReason>& aReason) {
+    const nsACString& aTrackingOrigin,
+    const Maybe<StorageAccessGrantedReason>& aReason) {
  if (XRE_IsParentProcess()) {
    NotifyContentBlockingEventInParent(aReportingChannel, aTrackingChannel,
-                                       aBlocked, aRejectedReason, aURI,
-                                       aReason);
+                                       aBlocked, aRejectedReason,
+                                       aTrackingOrigin, aReason);
  } else {
-    NotifyContentBlockingEventInChild(aWindow, aReportingChannel,
-                                      aTrackingChannel, aBlocked,
-                                      aRejectedReason, aURI, aReason);
+    NotifyContentBlockingEventInChild(
+        aWindow, aReportingChannel, aTrackingChannel, aBlocked, aRejectedReason,
+        aTrackingOrigin, aReason);
  }
 }

@ -2459,7 +2477,6 @@ void AntiTrackingCommon::RedirectHeuristic(nsIChannel* aOldChannel,
  MOZ_ASSERT(ssm);

  nsCOMPtr<nsIPrincipal> trackingPrincipal;
-  nsCOMPtr<nsIURI> trackingURI;

  const nsTArray<nsCOMPtr<nsIRedirectHistoryEntry>>& chain =
      oldLoadInfo->RedirectChain();
@ -2470,14 +2487,7 @@ void AntiTrackingCommon::RedirectHeuristic(nsIChannel* aOldChannel,
      LOG(("Can't obtain the principal from the redirect chain"));
      return;
    }
-
-    rv = trackingPrincipal->GetURI(getter_AddRefs(trackingURI));
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      LOG(("Can't obtain the uri from the redirect chain"));
-      return;
-    }
  } else {
-    trackingURI = aOldURI;
    rv = ssm->GetChannelResultPrincipal(aOldChannel,
                                        getter_AddRefs(trackingPrincipal));
    if (NS_WARN_IF(NS_FAILED(rv))) {
@ -2486,8 +2496,6 @@ void AntiTrackingCommon::RedirectHeuristic(nsIChannel* aOldChannel,
    }
  }

-  MOZ_ASSERT(trackingURI);
-
  nsCOMPtr<nsIPrincipal> redirectedPrincipal;
  rv = ssm->GetChannelResultPrincipal(aNewChannel,
                                      getter_AddRefs(redirectedPrincipal));
@ -2505,9 +2513,9 @@ void AntiTrackingCommon::RedirectHeuristic(nsIChannel* aOldChannel,
  }

  nsAutoCString trackingOrigin;
-  rv = nsContentUtils::GetASCIIOrigin(trackingURI, trackingOrigin);
+  rv = trackingPrincipal->GetOrigin(trackingOrigin);
  if (NS_WARN_IF(NS_FAILED(rv))) {
-    LOG(("Can't get the origin from the URI"));
+    LOG(("Can't get the origin from the Principal"));
    return;
  }

--- a/toolkit/components/antitracking/AntiTrackingCommon.h
+++ b/toolkit/components/antitracking/AntiTrackingCommon.h
@ -187,7 +187,7 @@ class AntiTrackingCommon final {
  static void NotifyContentBlockingEvent(
      nsPIDOMWindowOuter* aWindow, nsIChannel* aReportingChannel,
      nsIChannel* aTrackingChannel, bool aBlocked, uint32_t aRejectedReason,
-      nsIURI* aURI,
+      const nsACString& aTrackingOrigin,
      const Maybe<StorageAccessGrantedReason>& aReason = Nothing());

  static void RedirectHeuristic(nsIChannel* aOldChannel, nsIURI* aOldURI,