Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1493563 - Part 9: Notify about trackers being unblocked when being granted a first-party exception; r=baku

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D6599
This commit is contained in:
Ehsan Akhgari 2018-09-23 02:36:04 -04:00
parent e97e383129
commit 079e3e2790
4 changed files with 102 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dom/base/nsGlobalWindowOuter.cpp
View File

@ -5282,6 +5282,7 @@ nsGlobalWindowOuter::FirePopupBlockedEvent(nsIDocument* aDoc,
void
nsGlobalWindowOuter::NotifyContentBlockingState(unsigned aState,
nsIChannel* aChannel,
bool aBlocked,
nsIURI* aURIHint)
{
nsCOMPtr<nsIDocShell> docShell = GetDocShell();
@ -5317,23 +5318,46 @@ nsGlobalWindowOuter::NotifyContentBlockingState(unsigned aState,
if (aURIHint) {
nsContentUtils::GetUTFOrigin(aURIHint, origin);
}
bool unblocked = false;
if (aState == nsIWebProgressListener::STATE_BLOCKED_TRACKING_CONTENT) {
doc->SetHasTrackingContentBlocked(true, origin);
doc->SetHasTrackingContentBlocked(aBlocked, origin);
if (!aBlocked) {
unblocked = !doc->GetHasTrackingContentBlocked();
}
} else if (aState == nsIWebProgressListener::STATE_BLOCKED_SLOW_TRACKING_CONTENT) {
doc->SetHasSlowTrackingContentBlocked(true, origin);
doc->SetHasSlowTrackingContentBlocked(aBlocked, origin);
if (!aBlocked) {
unblocked = !doc->GetHasSlowTrackingContentBlocked();
}
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_BY_PERMISSION) {
doc->SetHasCookiesBlockedByPermission(true, origin);
doc->SetHasCookiesBlockedByPermission(aBlocked, origin);
if (!aBlocked) {
unblocked = !doc->GetHasCookiesBlockedByPermission();
}
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER) {
doc->SetHasTrackingCookiesBlocked(true, origin);
doc->SetHasTrackingCookiesBlocked(aBlocked, origin);
if (!aBlocked) {
unblocked = !doc->GetHasTrackingCookiesBlocked();
}
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_ALL) {
doc->SetHasAllCookiesBlocked(true, origin);
doc->SetHasAllCookiesBlocked(aBlocked, origin);
if (!aBlocked) {
unblocked = !doc->GetHasAllCookiesBlocked();
}
} else if (aState == nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN) {
doc->SetHasForeignCookiesBlocked(true, origin);
doc->SetHasForeignCookiesBlocked(aBlocked, origin);
if (!aBlocked) {
unblocked = !doc->GetHasForeignCookiesBlocked();
}
} else {
// Ignore nsIWebProgressListener::STATE_BLOCKED_UNSAFE_CONTENT;
}
const uint32_t oldState = state;
state |= aState;
if (aBlocked) {
state |= aState;
} else if (unblocked) {
state &= ~aState;
}
eventSink->OnSecurityChange(aChannel, oldState, state, doc->GetContentBlockingLog());
}

1
dom/base/nsGlobalWindowOuter.h
View File

@ -485,6 +485,7 @@ public:
virtual void
NotifyContentBlockingState(unsigned aState,
nsIChannel* aChannel,
bool aBlocked,
nsIURI* aURIHint) override;
virtual uint32_t GetSerial() override {

1
dom/base/nsPIDOMWindow.h
View File

@ -1095,6 +1095,7 @@ public:
virtual void
NotifyContentBlockingState(unsigned aState,
nsIChannel* aChannel,
bool aBlocked = true,
nsIURI* aURIHint = nullptr) = 0;
// WebIDL-ish APIs

89
toolkit/components/antitracking/AntiTrackingCommon.cpp
View File

@ -325,6 +325,32 @@ ReportUnblockingConsole(nsPIDOMWindowInner* aWindow,
}
}
already_AddRefed<nsPIDOMWindowOuter>
GetTopWindow(nsPIDOMWindowInner* aWindow)
{
nsIDocument* document = aWindow->GetExtantDoc();
if (!document) {
return nullptr;
}
nsIChannel* channel = document->GetChannel();
if (!channel) {
return nullptr;
}
nsCOMPtr<nsPIDOMWindowOuter> pwin;
auto* outer = nsGlobalWindowOuter::Cast(aWindow->GetOuterWindow());
if (outer) {
pwin = outer->GetTopOuter();
}
if (!pwin) {
return nullptr;
}
return pwin.forget();
}
} // anonymous
/* static */ bool
@ -390,9 +416,30 @@ AntiTrackingCommon::AddFirstPartyStorageAccessGrantedFor(const nsAString& aOrigi
return StorageAccessGrantPromise::CreateAndReject(false, __func__);
}
nsCOMPtr<nsIURI> uri;
nsresult rv = NS_NewURI(getter_AddRefs(uri), trackingOrigin);
if (NS_WARN_IF(NS_FAILED(rv))) {
LOG(("Couldn't make a new URI out of the tracking origin"));
return StorageAccessGrantPromise::CreateAndReject(false, __func__);
}
nsCOMPtr<nsPIDOMWindowOuter> pwin = GetTopWindow(parentWindow);
if (!pwin) {
LOG(("Couldn't get the top window"));
return StorageAccessGrantPromise::CreateAndReject(false, __func__);
}
nsIChannel* channel =
pwin->GetCurrentInnerWindow()->GetExtantDoc()->GetChannel();
// We hardcode this block reason since the first-party storage access permission
// is granted for the purpose of blocking trackers.
const uint32_t blockReason = nsIWebProgressListener::STATE_COOKIES_BLOCKED_TRACKER;
pwin->NotifyContentBlockingState(blockReason, channel, false, uri);
NS_ConvertUTF16toUTF8 grantedOrigin(aOrigin);
ReportUnblockingConsole(aParentWindow, NS_ConvertUTF8toUTF16(trackingOrigin),
ReportUnblockingConsole(parentWindow, NS_ConvertUTF8toUTF16(trackingOrigin),
aOrigin, aReason);
if (XRE_IsParentProcess()) {
@ -1088,7 +1135,7 @@ AntiTrackingCommon::NotifyRejection(nsIChannel* aChannel,
nsCOMPtr<nsIURI> uri;
aChannel->GetURI(getter_AddRefs(uri));
pwin->NotifyContentBlockingState(aRejectedReason, aChannel, uri);
pwin->NotifyContentBlockingState(aRejectedReason, aChannel, true, uri);
ReportBlockingToConsole(pwin, uri, aRejectedReason);
}
@ -1104,30 +1151,32 @@ AntiTrackingCommon::NotifyRejection(nsPIDOMWindowInner* aWindow,
aRejectedReason == nsIWebProgressListener::STATE_COOKIES_BLOCKED_FOREIGN ||
aRejectedReason == nsIWebProgressListener::STATE_BLOCKED_SLOW_TRACKING_CONTENT);
nsIDocument* document = aWindow->GetExtantDoc();
if (!document) {
return;
}
nsIChannel* channel = document->GetChannel();
if (!channel) {
return;
}
nsCOMPtr<nsPIDOMWindowOuter> pwin;
auto* outer = nsGlobalWindowOuter::Cast(aWindow->GetOuterWindow());
if (outer) {
pwin = outer->GetTopOuter();
}
nsCOMPtr<nsPIDOMWindowOuter> pwin = GetTopWindow(aWindow);
if (!pwin) {
return;
}
nsCOMPtr<nsIURI> uri;
channel->GetURI(getter_AddRefs(uri));
nsPIDOMWindowInner* inner = pwin->GetCurrentInnerWindow();
if (!inner) {
return;
}
nsIDocument* pwinDoc = inner->GetExtantDoc();
if (!pwinDoc) {
return;
}
nsIChannel* channel = pwinDoc->GetChannel();
if (!channel) {
return;
}
pwin->NotifyContentBlockingState(aRejectedReason, channel, uri);
nsIDocument* document = aWindow->GetExtantDoc();
if (!document) {
return;
}
nsIURI* uri = document->GetDocumentURI();
pwin->NotifyContentBlockingState(aRejectedReason, channel, true, uri);
ReportBlockingToConsole(pwin, uri, aRejectedReason);
}