wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-08 08:48:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Bug 1182569: Update ContentSecurityManager to handle docshell loads

Browse source
This commit is contained in:
janekptacijarabaci 2018-04-30 21:04:56 +02:00 • committed by Roy Tam
commit 846daf6d3b
2 changed files with 68 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
netwerk/base/nsNetUtil.cpp
View file

@ -1285,16 +1285,10 @@ NS_HasBeenCrossOrigin(nsIChannel* aChannel, bool aReport)
nsCOMPtr<nsILoadInfo> loadInfo = aChannel->GetLoadInfo();
MOZ_RELEASE_ASSERT(loadInfo, "Origin tracking only works for channels created with a loadinfo");
#ifdef DEBUG
// Don't enforce TYPE_DOCUMENT assertions for loads
// initiated by javascript tests.
bool skipContentTypeCheck = false;
skipContentTypeCheck = Preferences::GetBool("network.loadinfo.skip_type_assertion");
#endif
MOZ_ASSERT(skipContentTypeCheck ||
loadInfo->GetExternalContentPolicyType() != nsIContentPolicy::TYPE_DOCUMENT,
"calling NS_HasBeenCrossOrigin on a top level load");
// TYPE_DOCUMENT loads have a null LoadingPrincipal and can not be cross origin.
if (!loadInfo->LoadingPrincipal()) {
return false;
}
// Always treat tainted channels as cross-origin.
if (loadInfo->GetTainting() != LoadTainting::Basic) {