diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 10:47:18 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 10:47:23 -0500 |
commit | 110f5a16547865156c5cae10d0d6171dab442029 (patch) | |
tree | 583a235f2ea915a25d7ecbae172ff19725196a6a | |
parent | b46b52af37fd8c800e8fdca5de25be31415c7d5d (diff) | |
download | gitlab-ce-dm-catch-uri-errors.tar.gz |
Catch all URI errors in ExternalLinkFilterdm-catch-uri-errors
-rw-r--r-- | changelogs/unreleased/dm-catch-uri-errors.yml | 4 | ||||
-rw-r--r-- | lib/banzai/filter/external_link_filter.rb | 2 | ||||
-rw-r--r-- | spec/lib/banzai/filter/external_link_filter_spec.rb | 7 |
3 files changed, 12 insertions, 1 deletions
diff --git a/changelogs/unreleased/dm-catch-uri-errors.yml b/changelogs/unreleased/dm-catch-uri-errors.yml new file mode 100644 index 00000000000..8b635d321b3 --- /dev/null +++ b/changelogs/unreleased/dm-catch-uri-errors.yml @@ -0,0 +1,4 @@ +--- +title: Catch all URI errors in ExternalLinkFilter +merge_request: +author: diff --git a/lib/banzai/filter/external_link_filter.rb b/lib/banzai/filter/external_link_filter.rb index 7d15a0f6d44..d6327ef31cb 100644 --- a/lib/banzai/filter/external_link_filter.rb +++ b/lib/banzai/filter/external_link_filter.rb @@ -24,7 +24,7 @@ module Banzai def uri(href) URI.parse(href) - rescue URI::InvalidURIError + rescue URI::Error nil end diff --git a/spec/lib/banzai/filter/external_link_filter_spec.rb b/spec/lib/banzai/filter/external_link_filter_spec.rb index 6f6c215be87..0f8ec8de7a0 100644 --- a/spec/lib/banzai/filter/external_link_filter_spec.rb +++ b/spec/lib/banzai/filter/external_link_filter_spec.rb @@ -55,6 +55,13 @@ describe Banzai::Filter::ExternalLinkFilter, lib: true do expect(doc.to_html).to eq(expected) end + + it 'skips improperly formatted mailtos' do + doc = filter %q(<p><a href="mailto://jblogs@example.com">Email</a></p>) + expected = %q(<p><a href="mailto://jblogs@example.com">Email</a></p>) + + expect(doc.to_html).to eq(expected) + end end context 'for links with a username' do |