diff --git a/.changeset/curly-bananas-do.md b/.changeset/curly-bananas-do.md new file mode 100644 index 00000000..4df000d9 --- /dev/null +++ b/.changeset/curly-bananas-do.md @@ -0,0 +1,5 @@ +--- +'preact-render-to-string': patch +--- + +Fix object and function children being rendered as `undefined` diff --git a/src/index.js b/src/index.js index 9892d218..4f5e2831 100644 --- a/src/index.js +++ b/src/index.js @@ -195,6 +195,7 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) { // Text VNodes: escape as HTML if (typeof vnode !== 'object') { + if (typeof vnode === 'function') return ''; return encodeEntities(vnode); } @@ -210,6 +211,9 @@ function _renderToString(vnode, context, isSvgMode, selectValue, parent) { return rendered; } + // VNodes have {constructor:undefined} to prevent JSON injection: + if (vnode.constructor !== undefined) return ''; + vnode[PARENT] = parent; if (options[DIFF]) options[DIFF](vnode); diff --git a/src/pretty.js b/src/pretty.js index 4d85cbc7..1c977987 100644 --- a/src/pretty.js +++ b/src/pretty.js @@ -29,6 +29,7 @@ export function _renderToStringPretty( // #text nodes if (typeof vnode !== 'object') { + if (typeof vnode === 'function') return ''; return encodeEntities(vnode); } @@ -53,6 +54,9 @@ export function _renderToStringPretty( return rendered; } + // VNodes have {constructor:undefined} to prevent JSON injection: + if (vnode.constructor !== undefined) return ''; + let nodeName = vnode.type, props = vnode.props, isComponent = false; diff --git a/test/jsx.test.js b/test/jsx.test.js index 733ebaf4..403b888b 100644 --- a/test/jsx.test.js +++ b/test/jsx.test.js @@ -163,4 +163,12 @@ describe('jsx', () => { `); }); + + it('should prevent JSON injection', () => { + expect(renderJsx(
{{ hello: 'world' }}
)).to.equal('
'); + }); + + it('should not render function children', () => { + expect(renderJsx(
{() => {}}
)).to.equal('
'); + }); }); diff --git a/test/pretty.test.js b/test/pretty.test.js index 5c6b4410..4ee901ea 100644 --- a/test/pretty.test.js +++ b/test/pretty.test.js @@ -222,4 +222,14 @@ describe('pretty', () => {

`); }); + + it('should prevent JSON injection', () => { + expect(prettyRender(
{{ hello: 'world' }}
)).to.equal( + '
' + ); + }); + + it('should not render function children', () => { + expect(prettyRender(
{() => {}}
)).to.equal('
'); + }); }); diff --git a/test/render.test.js b/test/render.test.js index 3783569c..8f234821 100644 --- a/test/render.test.js +++ b/test/render.test.js @@ -1260,4 +1260,12 @@ describe('render', () => { '' ); }); + + it('should prevent JSON injection', () => { + expect(render(
{{ hello: 'world' }}
)).to.equal('
'); + }); + + it('should not render function children', () => { + expect(render(
{() => {}}
)).to.equal('
'); + }); });