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

Bug 723808: don't allow loads in type=content docshells to inherit the system principal, r=bz

Browse Source
This commit is contained in:
Gavin Sharp
2012-01-30 18:29:44 -08:00
parent 89752ca1d5
commit 832e9370db
5 changed files with 126 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docshell/base/nsDocShell.cpp
View File

@@ -8644,9 +8644,11 @@ nsIPrincipal*
nsDocShell::GetInheritedPrincipal(bool aConsiderCurrentDocument)
{
nsCOMPtr<nsIDocument> document;
bool inheritedFromCurrent = false;
if (aConsiderCurrentDocument && mContentViewer) {
document = mContentViewer->GetDocument();
inheritedFromCurrent = true;
}
if (!document) {
@@ -8674,7 +8676,17 @@ nsDocShell::GetInheritedPrincipal(bool aConsiderCurrentDocument)
//-- Get the document's principal
if (document) {
return document->NodePrincipal();
nsIPrincipal *docPrincipal = document->NodePrincipal();
// Don't allow loads in typeContent docShells to inherit the system
// principal from existing documents.
if (inheritedFromCurrent &&
mItemType == typeContent &&
nsContentUtils::IsSystemPrincipal(docPrincipal)) {
return nsnull;
}
return docPrincipal;
}
return nsnull;