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

Bug 1696229 - Don't report wrong errors for expanded principals in CheckLoadURIWithPrincipal. r=ckerschb

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D107101
This commit is contained in:
Tom Schuster
2021-03-08 20:57:08 +00:00
parent 97628adeac
commit 2a2c19b86e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
caps/nsScriptSecurityManager.cpp
View File

@@ -622,16 +622,21 @@ nsScriptSecurityManager::CheckLoadURIWithPrincipal(nsIPrincipal* aPrincipal,
if (!sourceURI) {
if (basePrin->Is<ExpandedPrincipal>()) {
auto expanded = basePrin->As<ExpandedPrincipal>();
for (auto& prin : expanded->AllowList()) {
nsresult rv =
CheckLoadURIWithPrincipal(prin, aTargetURI, aFlags, aInnerWindowID);
const auto& allowList = expanded->AllowList();
// Only report errors when all principals fail.
uint32_t flags = aFlags | nsIScriptSecurityManager::DONT_REPORT_ERRORS;
for (size_t i = 0; i < allowList.Length() - 1; i++) {
nsresult rv = CheckLoadURIWithPrincipal(allowList[i], aTargetURI, flags,
aInnerWindowID);
if (NS_SUCCEEDED(rv)) {
// Allow access if it succeeded with one of the allowlisted principals
return NS_OK;
}
}
// None of our allowlisted principals worked.
return NS_ERROR_DOM_BAD_URI;
// Report errors (if requested) for the last principal.
return CheckLoadURIWithPrincipal(allowList.LastElement(), aTargetURI,
aFlags, aInnerWindowID);
}
NS_ERROR(
"Non-system principals or expanded principal passed to "