diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-28 17:03:22 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-28 17:03:22 +0300 |
commit | d7a9df68329bee42a4f2c4934351022c949f7c71 (patch) | |
tree | bda5012b23e698083fc6f8656307f1e5b93f7a65 | |
parent | e0a8447e06bbeb1c42598ed360fcb6ec0f7bb678 (diff) | |
parent | 3a43cf426af6433ec8d5597da902f1081866796d (diff) |
Merge branch '44649-reference-parsing-conflicting-with-auto-linking' into 'master'
Resolve "Reference parsing conflicting with auto-linking"
Closes #44649
See merge request gitlab-org/gitlab-ce!18045
-rw-r--r-- | changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml | 5 | ||||
-rw-r--r-- | lib/banzai/filter/autolink_filter.rb | 8 | ||||
-rw-r--r-- | spec/lib/banzai/filter/autolink_filter_spec.rb | 9 |
3 files changed, 20 insertions, 2 deletions
diff --git a/changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml b/changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml new file mode 100644 index 00000000000..a64b0efa1ed --- /dev/null +++ b/changelogs/unreleased/44649-reference-parsing-conflicting-with-auto-linking.yml @@ -0,0 +1,5 @@ +--- +title: Fix autolinking URLs containing ampersands +merge_request: 18045 +author: +type: fixed diff --git a/lib/banzai/filter/autolink_filter.rb b/lib/banzai/filter/autolink_filter.rb index ce401c1c31c..4a143baeef6 100644 --- a/lib/banzai/filter/autolink_filter.rb +++ b/lib/banzai/filter/autolink_filter.rb @@ -105,8 +105,12 @@ module Banzai end end - options = link_options.merge(href: match) - content_tag(:a, match.html_safe, options) + dropped + # match has come from node.to_html above, so we know it's encoded + # correctly. + html_safe_match = match.html_safe + options = link_options.merge(href: html_safe_match) + + content_tag(:a, html_safe_match, options) + dropped end def autolink_filter(text) diff --git a/spec/lib/banzai/filter/autolink_filter_spec.rb b/spec/lib/banzai/filter/autolink_filter_spec.rb index cbb0089bde7..a50329473ad 100644 --- a/spec/lib/banzai/filter/autolink_filter_spec.rb +++ b/spec/lib/banzai/filter/autolink_filter_spec.rb @@ -167,6 +167,15 @@ describe Banzai::Filter::AutolinkFilter do expect(actual).to eq(expected_complicated_link) end + it 'does not double-encode HTML entities' do + encoded_link = "#{link}?foo=bar&baz=quux" + expected_encoded_link = %Q{<a href="#{encoded_link}">#{encoded_link}</a>} + actual = unescape(filter(encoded_link).to_html) + + expect(actual).to eq(Rinku.auto_link(encoded_link)) + expect(actual).to eq(expected_encoded_link) + end + it 'does not include trailing HTML entities' do doc = filter("See <<<#{link}>>>") |