Only do runtime validation of tag names when createElement is not used

We introduced runtime validation of tag names because we used to generate
HTML that was supposed to be inserted into a HTML string which could've
been an XSS attack.

However, these days we use document.createElement in most cases. That
already does its internal validation in the browser which throws. We're now
double validating it. Stack still has a path where innerHTML is used and
we still need it there. However in Fiber we can remove it completely.
This commit is contained in:
Sebastian Markbage
2016-12-12 19:38:34 -08:00
parent 3092f63c6b
commit db489a4ade
4 changed files with 23 additions and 24 deletions

View File

@@ -664,6 +664,8 @@ src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
* should properly escape text content and attributes values
* unmounts children before unsetting DOM node info
* should warn about the `onScroll` issue when unsupported (IE8)
* should throw when an invalid tag name is used server-side
* should throw when an attack vector is used server-side
* should throw when an invalid tag name is used
* should throw when an attack vector is used
* should warn about props that are no longer supported

View File

@@ -279,21 +279,6 @@ var voidElementTags = {
...omittedCloseTags,
};
// We accept any tag to be rendered but since this gets injected into arbitrary
// HTML, we want to make sure that it's a safe tag.
// http://www.w3.org/TR/REC-xml/#NT-Name
var VALID_TAG_REGEX = /^[a-zA-Z][a-zA-Z:_\.\-\d]*$/; // Simplified subset
var validatedTagCache = {};
var hasOwnProperty = {}.hasOwnProperty;
function validateDangerousTag(tag) {
if (!hasOwnProperty.call(validatedTagCache, tag)) {
invariant(VALID_TAG_REGEX.test(tag), 'Invalid tag: %s', tag);
validatedTagCache[tag] = true;
}
}
function isCustomComponent(tagName, props) {
return tagName.indexOf('-') >= 0 || props.is != null;
}
@@ -488,8 +473,6 @@ var ReactDOMFiberComponent = {
rootContainerElement : Element,
parentNamespace : string | null
) : Element {
validateDangerousTag(type);
// We create tags in the namespace of their parent container, except HTML
// tags get no namespace.
var ownerDocument = rootContainerElement.ownerDocument;

View File

@@ -1207,22 +1207,36 @@ describe('ReactDOMComponent', () => {
});
describe('tag sanitization', () => {
it('should throw when an invalid tag name is used server-side', () => {
var hackzor = React.createElement('script tag');
expect(
() => ReactDOMServer.renderToString(hackzor)
).toThrowError(
'Invalid tag: script tag'
);
});
it('should throw when an attack vector is used server-side', () => {
var hackzor = React.createElement('div><img /><div');
expect(
() => ReactDOMServer.renderToString(hackzor)
).toThrowError(
'Invalid tag: div><img /><div'
);
});
it('should throw when an invalid tag name is used', () => {
var hackzor = React.createElement('script tag');
expect(
() => ReactTestUtils.renderIntoDocument(hackzor)
).toThrowError(
'Invalid tag: script tag'
);
).toThrow();
});
it('should throw when an attack vector is used', () => {
var hackzor = React.createElement('div><img /><div');
expect(
() => ReactTestUtils.renderIntoDocument(hackzor)
).toThrowError(
'Invalid tag: div><img /><div'
);
).toThrow();
});
});

View File

@@ -413,7 +413,6 @@ var globalIdCounter = 1;
*/
function ReactDOMComponent(element) {
var tag = element.type;
validateDangerousTag(tag);
this._currentElement = element;
this._tag = tag.toLowerCase();
this._namespaceURI = null;
@@ -605,6 +604,7 @@ ReactDOMComponent.Mixin = {
this._createInitialChildren(transaction, props, context, lazyTree);
mountImage = lazyTree;
} else {
validateDangerousTag(this._tag);
var tagOpen = this._createOpenTagMarkupAndPutListeners(transaction, props);
var tagContent = this._createContentMarkup(transaction, props, context);
if (!tagContent && omittedCloseTags[this._tag]) {