corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1498510 - Move nsICSPEventListener out of CSP object, r=ckerschb

Browse Source
This commit is contained in:
Andrea Marchesini
2018-10-23 08:17:13 +02:00
parent 2f8c38bb48
commit 57bd031744
28 changed files with 181 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dom/workers/ScriptLoader.cpp
View File

@@ -221,6 +221,7 @@ ChannelFromScriptURL(nsIPrincipal* principal,
nullptr, // aCallbacks
aLoadFlags,
ios);
NS_ENSURE_SUCCESS(rv, rv);
} else {
// We must have a loadGroup with a load context for the principal to
// traverse the channel correctly.
@@ -228,8 +229,10 @@ ChannelFromScriptURL(nsIPrincipal* principal,
MOZ_ASSERT(NS_LoadGroupMatchesPrincipal(loadGroup, principal));
RefPtr<PerformanceStorage> performanceStorage;
nsCOMPtr<nsICSPEventListener> cspEventListener;
if (aWorkerPrivate && !aIsMainScript) {
performanceStorage = aWorkerPrivate->GetPerformanceStorage();
cspEventListener = aWorkerPrivate->CSPEventListener();
}
if (aClientInfo.isSome()) {
@@ -257,9 +260,19 @@ ChannelFromScriptURL(nsIPrincipal* principal,
aLoadFlags,
ios);
}
}
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_SUCCESS(rv, rv);
if (cspEventListener) {
nsCOMPtr<nsILoadInfo> loadInfo = channel->GetLoadInfo();
if (NS_WARN_IF(!loadInfo)) {
return NS_ERROR_UNEXPECTED;
}
rv = loadInfo->SetCspEventListener(cspEventListener);
NS_ENSURE_SUCCESS(rv, rv);
}
}
if (nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(channel)) {
mozilla::net::ReferrerPolicy referrerPolicy = parentDoc ?
@@ -1229,6 +1242,7 @@ private:
wcsp->LogViolationDetails(
nsIContentSecurityPolicy::VIOLATION_TYPE_REQUIRE_SRI_FOR_SCRIPT,
nullptr, // triggering element
mWorkerPrivate->CSPEventListener(),
aLoadInfo.mURL, EmptyString(), 0, 0, EmptyString(), EmptyString());
}
return NS_ERROR_SRI_CORRUPT;