nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1827267 - prevent encoding head attributes with raw plus body-only. r=kmag

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D175275
This commit is contained in:
Sean Burke 2023-04-19 16:13:13 +00:00
parent 880780f9d1
commit 987ac54be3
3 changed files with 78 additions and 0 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

70
dom/base/test/unit/test_htmlserializer.js Normal file
View file

@ -0,0 +1,70 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
add_task(async function testAttrsOutsideBodyWithRawBodyOnly() {
// Create a simple HTML document in which the header contains a tag with set
// attributes
const htmlString = `<html><head><link rel="stylesheet" href="foo"/></head><body>some content</body></html>`;
const parser = new DOMParser();
const doc = parser.parseFromString(htmlString, "text/html");
// Sanity check
const linkElems = doc.head.getElementsByTagName("link");
Assert.equal(
linkElems.length,
1,
"document header should contain one link element"
);
Assert.equal(
linkElems[0].rel,
"stylesheet",
"link element should have rel attribute set"
);
// Verify that the combination of raw output and body-only does not allow
// attributes from header elements to creep into the output string
const encoder = Cu.createDocumentEncoder("text/html");
encoder.init(
doc,
"text/html",
Ci.nsIDocumentEncoder.OutputRaw | Ci.nsIDocumentEncoder.OutputBodyOnly
);
const result = encoder.encodeToString();
Assert.equal(
result,
"<body>some content</body>",
"output should not contain attributes from head elements"
);
});
add_task(async function testAttrsInsideBodyWithRawBodyOnly() {
// Create a simple HTML document in which the body contains a tag with set
// attributes
const htmlString = `<html><head><link rel="stylesheet" href="foo"/></head><body><span id="foo">some content</span></body></html>`;
const parser = new DOMParser();
const doc = parser.parseFromString(htmlString, "text/html");
// Sanity check
const spanElem = doc.getElementById("foo");
Assert.ok(spanElem, "should be able to get span element by ID");
// Verify that the combination of raw output and body-only does not strip
// tag attributes inside the body
const encoder = Cu.createDocumentEncoder("text/html");
encoder.init(
doc,
"text/html",
Ci.nsIDocumentEncoder.OutputRaw | Ci.nsIDocumentEncoder.OutputBodyOnly
);
const result = encoder.encodeToString();
Assert.equal(
result,
`<body><span id="foo">some content</span></body>`,
"output should not contain attributes from head elements"
);
});

1
dom/base/test/unit/xpcshell.ini
View file

@ -35,6 +35,7 @@ skip-if =
run-sequentially = Hardcoded 4444 port. run-sequentially = Hardcoded 4444 port.
# Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs # Bug 1018414: hardcoded localhost doesn't work properly on some OS X installs
skip-if = os == 'mac' skip-if = os == 'mac'
[test_htmlserializer.js]
[test_isequalnode.js] [test_isequalnode.js]
head = head_xml.js head = head_xml.js
[test_nodelist.js] [test_nodelist.js]

7
dom/serializers/nsXMLContentSerializer.cpp
View file

@ -589,6 +589,13 @@ bool nsXMLContentSerializer::SerializeAttr(const nsAString& aPrefix,
const nsAString& aValue, const nsAString& aValue,
nsAString& aStr, nsAString& aStr,
bool aDoEscapeEntities) { bool aDoEscapeEntities) {
// Because this method can short-circuit AppendToString for raw output, we
// need to make sure that we're not inappropriately serializing attributes
// from outside the body
if (mBodyOnly && !mInBody) {
return true;
}
nsAutoString attrString_; nsAutoString attrString_;
// For innerHTML we can do faster appending without // For innerHTML we can do faster appending without
// temporary strings. // temporary strings.