Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1336213 - Part 1: Set the right principal on the documents created by DOMParser from the beginning; r=bzbarsky

Browse Source
This commit is contained in:
Ehsan Akhgari 2017-02-02 16:54:34 -05:00
parent 35ff90ed3b
commit d250dc8172
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dom/base/DOMParser.cpp
View File

@ -92,18 +92,12 @@ DOMParser::ParseFromString(const nsAString& str,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDocument> document = do_QueryInterface(domDocument);
// Keep the XULXBL state, base URL and principal setting in sync with the
// XML case
// Keep the XULXBL state in sync with the XML case.
if (nsContentUtils::IsSystemPrincipal(mOriginalPrincipal)) {
document->ForceEnableXULXBL();
}
// Make sure to give this document the right base URI
document->SetBaseURI(mBaseURI);
// And the right principal
document->SetPrincipal(mPrincipal);
rv = nsContentUtils::ParseDocumentHTML(str, document, false);
NS_ENSURE_SUCCESS(rv, rv);
@ -245,7 +239,7 @@ DOMParser::ParseFromStream(nsIInputStream *stream,
NS_NewInputStreamChannel(getter_AddRefs(parserChannel),
mDocumentURI,
nullptr, // aStream
mOriginalPrincipal,
mPrincipal,
nsILoadInfo::SEC_FORCE_INHERIT_PRINCIPAL,
nsIContentPolicy::TYPE_OTHER,
nsDependentCString(contentType));
@ -260,13 +254,11 @@ DOMParser::ParseFromStream(nsIInputStream *stream,
// Have to pass false for reset here, else the reset will remove
// our event listener. Should that listener addition move to later
// than this call? Then we wouldn't need to mess around with
// SetPrincipal, etc, probably!
// than this call?
nsCOMPtr<nsIDocument> document(do_QueryInterface(domDocument));
if (!document) return NS_ERROR_FAILURE;
// Keep the XULXBL state, base URL and principal setting in sync with the
// HTML case
// Keep the XULXBL state in sync with the HTML case
if (nsContentUtils::IsSystemPrincipal(mOriginalPrincipal)) {
document->ForceEnableXULXBL();
@ -277,12 +269,6 @@ DOMParser::ParseFromStream(nsIInputStream *stream,
getter_AddRefs(listener),
false);
// Make sure to give this document the right base URI
document->SetBaseURI(mBaseURI);
// And the right principal
document->SetPrincipal(mPrincipal);
if (NS_FAILED(rv) || !listener) {
return NS_ERROR_FAILURE;
}
@ -367,11 +353,8 @@ DOMParser::Init(nsIPrincipal* principal, nsIURI* documentURI,
}
}
}
mBaseURI = baseURI;
// Note: if mBaseURI is null, fine. Leave it like that; that will use the
// documentURI as the base. Otherwise for null principals we'll get
// nsDocument::SetBaseURI giving errors.
NS_POSTCONDITION(mPrincipal, "Must have principal");
NS_POSTCONDITION(mOriginalPrincipal, "Must have original principal");
@ -482,13 +465,9 @@ DOMParser::SetUpDocument(DocumentFlavor aFlavor, nsIDOMDocument** aResult)
NS_ASSERTION(mPrincipal, "Must have principal by now");
NS_ASSERTION(mDocumentURI, "Must have document URI by now");
// Here we have to cheat a little bit... Setting the base URI won't
// work if the document has a null principal, so use
// mOriginalPrincipal when creating the document, then reset the
// principal.
return NS_NewDOMDocument(aResult, EmptyString(), EmptyString(), nullptr,
mDocumentURI, mBaseURI,
mOriginalPrincipal,
mPrincipal,
true,
scriptHandlingObject,
aFlavor);