Commit 3d1ce820 authored by Mayra Cabrera's avatar Mayra Cabrera

Merge branch 'security-2682-fix-xss-for-markdown-toc-10-7' into 'security-10-7'

[10.7] Fix xss for Markdown elements where [[_TOC_]] is enabled

See merge request gitlab/gitlabhq!2406
parent c3912edd
---
title: Fix XSS vulnerability for table of content generation
merge_request:
author:
type: security
......@@ -92,7 +92,7 @@ module Banzai
def text
return '' unless node
@text ||= node.text
@text ||= EscapeUtils.escape_html(node.text)
end
private
......
......@@ -139,5 +139,14 @@ describe Banzai::Filter::TableOfContentsFilter do
expect(items[5].ancestors).to include(items[4])
end
end
context 'header text contains escaped content' do
let(:content) { '<img src="x" onerror="alert(42)">' }
let(:results) { result(header(1, content)) }
it 'outputs escaped content' do
expect(doc.inner_html).to include(content)
end
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment