diff options
author | Michał Gołębiowski-Owczarek <m.goleb@gmail.com> | 2020-06-10 16:13:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-10 16:13:22 +0200 |
commit | 9c98e4e86eda857ee063bc48adbc1a11bb5506ee (patch) | |
tree | 75c2dcd6e4be2907f48e50563785a702fd9db230 /src | |
parent | 7a6fae6a7e51ae30a9f3177e8639fbf523ed0915 (diff) | |
download | jquery-9c98e4e86eda857ee063bc48adbc1a11bb5506ee.tar.gz jquery-9c98e4e86eda857ee063bc48adbc1a11bb5506ee.zip |
Manipulation: Avoid concatenating strings in buildFragment
Concatenating HTML strings in buildFragment is a possible security risk as it
creates an opportunity of escaping the concatenated wrapper. It also makes it
impossible to support secure HTML wrappers like
[trusted types](https://web.dev/trusted-types/). It's safer to create wrapper
elements using `document.createElement` & `appendChild`.
The previous way was needed in jQuery <4 because IE <10 doesn't accept table
parts set via `innerHTML`, even if the element which contents are set is
a proper table element, e.g.:
```js
tr.innerHTML = "<td></td>";
```
The whole structure needs to be passed in one HTML string. jQuery 4 drops
support for IE <11 so this is no longer an issue; in older version we'd have
to duplicate the code paths.
IE <10 needed to have `<option>` elements wrapped in
`<select multiple="multiple">` but we no longer need that on master which
makes the `document.createElement` way shorter as we don't have to call
`setAttribute`.
All these improvements, apart from making logic more secure, decrease the
gzipped size by 58 bytes.
Closes gh-4724
Ref gh-4409
Ref angular/angular.js#17028
Co-authored-by: Richard Gibson <richard.gibson@gmail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/manipulation/buildFragment.js | 14 | ||||
-rw-r--r-- | src/manipulation/wrapMap.js | 11 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/manipulation/buildFragment.js b/src/manipulation/buildFragment.js index daf383aea..9ac71acc9 100644 --- a/src/manipulation/buildFragment.js +++ b/src/manipulation/buildFragment.js @@ -1,6 +1,7 @@ import jQuery from "../core.js"; import toType from "../core/toType.js"; import isAttached from "../core/isAttached.js"; +import arr from "../var/arr.js"; import rtagName from "./var/rtagName.js"; import rscriptType from "./var/rscriptType.js"; import wrapMap from "./wrapMap.js"; @@ -35,15 +36,16 @@ function buildFragment( elems, context, scripts, selection, ignored ) { // Deserialize a standard representation tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; + wrap = wrapMap[ tag ] || arr; - // Descend through wrappers to the right content - j = wrap[ 0 ]; - while ( j-- ) { - tmp = tmp.lastChild; + // Create wrappers & descend into them. + j = wrap.length; + while ( --j > -1 ) { + tmp = tmp.appendChild( context.createElement( wrap[ j ] ) ); } + tmp.innerHTML = jQuery.htmlPrefilter( elem ); + jQuery.merge( nodes, tmp.childNodes ); // Remember the top-level container diff --git a/src/manipulation/wrapMap.js b/src/manipulation/wrapMap.js index 01937ecc3..457902595 100644 --- a/src/manipulation/wrapMap.js +++ b/src/manipulation/wrapMap.js @@ -1,4 +1,3 @@ -// We have to close these tags to support XHTML (#13200) var wrapMap = { // Table parts need to be wrapped with `<table>` or they're @@ -6,12 +5,10 @@ var wrapMap = { // XHTML parsers do not magically insert elements in the // same way that tag soup parsers do, so we cannot shorten // this by omitting <tbody> or other required elements. - thead: [ 1, "<table>", "</table>" ], - col: [ 2, "<table><colgroup>", "</colgroup></table>" ], - tr: [ 2, "<table><tbody>", "</tbody></table>" ], - td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ], - - _default: [ 0, "", "" ] + thead: [ "table" ], + col: [ "colgroup", "table" ], + tr: [ "tbody", "table" ], + td: [ "tr", "tbody", "table" ] }; wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; |