diff options
author | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 18:39:27 +0000 |
---|---|---|
committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 19:09:28 -0500 |
commit | c4bb0a116efb8d95dcf7edd92424795ea919660f (patch) | |
tree | f9ff00b504186b09cc92891319f3b69eb4255059 /spec/features | |
parent | e3a5ce58bbd288063c705c57f2e7b3fcdf2b4a3b (diff) | |
download | gitlab-ce-c4bb0a116efb8d95dcf7edd92424795ea919660f.tar.gz |
Merge branch 'security-mermaid-xss' into 'master'
[master] Fix XSS in mermaid diagrams
See merge request gitlab/gitlabhq!2597
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/issues/user_comments_on_issue_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/markdown/mermaid_spec.rb | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/spec/features/issues/user_comments_on_issue_spec.rb b/spec/features/issues/user_comments_on_issue_spec.rb index ba5b80ed04b..b4b9a589ba3 100644 --- a/spec/features/issues/user_comments_on_issue_spec.rb +++ b/spec/features/issues/user_comments_on_issue_spec.rb @@ -40,6 +40,18 @@ describe "User comments on issue", :js do expect(page.find('pre code').text).to eq code_block_content end + + it "does not render html content in mermaid" do + html_content = "<img onerror=location=`javascript\\u003aalert\\u0028document.domain\\u0029` src=x>" + mermaid_content = "graph LR\n B-->D(#{html_content});" + comment = "```mermaid\n#{mermaid_content}\n```" + + add_note(comment) + + wait_for_requests + + expect(page.find('svg.mermaid')).to have_content html_content + end end context "when editing comments" do diff --git a/spec/features/markdown/mermaid_spec.rb b/spec/features/markdown/mermaid_spec.rb index a25d701ee35..7008b361394 100644 --- a/spec/features/markdown/mermaid_spec.rb +++ b/spec/features/markdown/mermaid_spec.rb @@ -18,7 +18,7 @@ describe 'Mermaid rendering', :js do visit project_issue_path(project, issue) %w[A B C D].each do |label| - expect(page).to have_selector('svg foreignObject', text: label) + expect(page).to have_selector('svg text', text: label) end end end |