Skip to content

Commit

Permalink
Merge pull request #2997 from harvesthq/fix-group-label-xss-vulnerabi…
Browse files Browse the repository at this point in the history
…lity

Escape the `group_label` when rendering it
  • Loading branch information
tjschuck authored Jun 8, 2018
2 parents d8390cc + 5ae77b1 commit 77fd031
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 1 deletion.
2 changes: 1 addition & 1 deletion coffee/lib/abstract-chosen.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class AbstractChosen

choice_label: (item) ->
if @include_group_label_in_selected and item.group_label?
"<b class='group-name'>#{item.group_label}</b>#{item.html}"
"<b class='group-name'>#{this.escape_html(item.group_label)}</b>#{item.html}"
else
item.html

Expand Down
30 changes: 30 additions & 0 deletions spec/jquery/bugfixes.spec.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
describe "Bugfixes", ->
it "https://github.com/harvesthq/chosen/issues/2996 - XSS Vulnerability with `include_group_label_in_selected: true`", ->
tmpl = "
<select>
<option value=''></option>
<optgroup label='</script><script>console.log(1)</script>'>
<option>an xss option</option>
</optgroup>
</select>
"

div = $("<div>").html(tmpl)
select = div.find("select")

select.chosen
include_group_label_in_selected: true

# open the drop
container = div.find(".chosen-container")
container.trigger("mousedown")

xss_option = container.find(".active-result").last()
expect(xss_option.html()).toBe "an xss option"

# trigger the selection of the xss option
xss_option.trigger("mouseup")

# make sure the script tags are escaped correctly
label_html = container.find("a.chosen-single").html()
expect(label_html).toContain('&lt;/script&gt;&lt;script&gt;console.log(1)&lt;/script&gt;')
32 changes: 32 additions & 0 deletions spec/proto/bugfixes.spec.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
describe "Bugfixes", ->
it "https://github.com/harvesthq/chosen/issues/2996 - XSS Vulnerability with `include_group_label_in_selected: true`", ->
tmpl = "
<select>
<option value=''></option>
<optgroup id='xss' label='</script><script>console.log(1)</script>'>
<option>an xss option</option>
</optgroup>
</select>
"
div = new Element("div")
document.body.insert(div)
div.innerHTML = tmpl

select = div.down("select")
new Chosen select,
include_group_label_in_selected: true

# open the drop
container = div.down(".chosen-container")
simulant.fire(container, "mousedown") # open the drop

xss_option = container.select(".active-result").last()
expect(xss_option.innerHTML).toBe "an xss option"

# trigger the selection of the xss option
simulant.fire(xss_option, "mouseup")

# make sure the script tags are escaped correctly
label_html = container.down("a.chosen-single").innerHTML
expect(label_html).toContain('&lt;/script&gt;&lt;script&gt;console.log(1)&lt;/script&gt;')

0 comments on commit 77fd031

Please sign in to comment.