Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-12 23:12:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1625366 - Don't specify a callback for CSP redirect checks form DocumentLoadListener, so that events are handled in the parent. r=ckerschb

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D69910

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Matt Woodrow 2020-04-10 22:15:04 +00:00
parent d65755c339
commit 26bafdbf43
1 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
netwerk/ipc/DocumentLoadListener.cpp
View File

@ -1296,39 +1296,9 @@ DocumentLoadListener::AsyncOnChannelRedirect(
rv = aNewChannel->GetURI(getter_AddRefs(newUri));
NS_ENSURE_SUCCESS(rv, rv);
RefPtr<ADocumentChannelBridge> bridge = mDocumentChannelBridge;
auto callback =
[bridge, loadInfo](
nsCSPContext* aContext, mozilla::dom::Element* aTriggeringElement,
nsICSPEventListener* aCSPEventListener, nsIURI* aBlockedURI,
nsCSPContext::BlockedContentSource aBlockedContentSource,
nsIURI* aOriginalURI, const nsAString& aViolatedDirective,
uint32_t aViolatedPolicyIndex, const nsAString& aObserverSubject,
const nsAString& aSourceFile, const nsAString& aScriptSample,
uint32_t aLineNum, uint32_t aColumnNum) -> nsresult {
MOZ_ASSERT(!aTriggeringElement);
MOZ_ASSERT(!aCSPEventListener);
MOZ_ASSERT(aSourceFile.IsVoid() || aSourceFile.IsEmpty());
MOZ_ASSERT(aScriptSample.IsVoid() || aScriptSample.IsEmpty());
nsCOMPtr<nsIContentSecurityPolicy> cspToInherit =
loadInfo->GetCspToInherit();
// The CSPContext normally contains the loading Document (used
// for targeting events), but this gets lost when serializing across
// IPDL. We need to know which CSPContext we're serializing, so that
// we can find the right loading Document on the content process
// side.
bool isCspToInherit = (aContext == cspToInherit);
bridge->CSPViolation(aContext, isCspToInherit, aBlockedURI,
aBlockedContentSource, aOriginalURI,
aViolatedDirective, aViolatedPolicyIndex,
aObserverSubject);
return NS_OK;
};
Maybe<nsresult> cancelCode;
rv = CSPService::ConsultCSPForRedirect(callback, originalUri, newUri,
loadInfo, cancelCode);
rv = CSPService::ConsultCSPForRedirect(originalUri, newUri, loadInfo,
cancelCode);
if (cancelCode) {
aOldChannel->Cancel(*cancelCode);