From 7e25ff3047bc1dab59d30aeb6334842ad2acb100 Mon Sep 17 00:00:00 2001
From: Brett Walker <bwalker@gitlab.com>
Date: Mon, 4 Feb 2019 10:23:27 -0600
Subject: [PATCH] Catch possible Addressable::URI::InvalidURIError

---
 .../57227-absolute-uri-missing-hierarchical-segment.yml    | 5 +++++
 lib/banzai/filter/autolink_filter.rb                       | 6 +++++-
 spec/lib/banzai/filter/autolink_filter_spec.rb             | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/unreleased/57227-absolute-uri-missing-hierarchical-segment.yml

diff --git a/changelogs/unreleased/57227-absolute-uri-missing-hierarchical-segment.yml b/changelogs/unreleased/57227-absolute-uri-missing-hierarchical-segment.yml
new file mode 100644
index 00000000000..3a663ce2132
--- /dev/null
+++ b/changelogs/unreleased/57227-absolute-uri-missing-hierarchical-segment.yml
@@ -0,0 +1,5 @@
+---
+title: Fix potential Addressable::URI::InvalidURIError
+merge_request: 24908
+author:
+type: fixed
diff --git a/lib/banzai/filter/autolink_filter.rb b/lib/banzai/filter/autolink_filter.rb
index f3061bad4ff..086adf59d2b 100644
--- a/lib/banzai/filter/autolink_filter.rb
+++ b/lib/banzai/filter/autolink_filter.rb
@@ -114,7 +114,11 @@ module Banzai
         # Since this came from a Text node, make sure the new href is encoded.
         # `commonmarker` percent encodes the domains of links it handles, so
         # do the same (instead of using `normalized_encode`).
-        href_safe = Addressable::URI.encode(match).html_safe
+        begin
+          href_safe = Addressable::URI.encode(match).html_safe
+        rescue Addressable::URI::InvalidURIError
+          return uri.to_s
+        end
 
         html_safe_match = match.html_safe
         options         = link_options.merge(href: href_safe)
diff --git a/spec/lib/banzai/filter/autolink_filter_spec.rb b/spec/lib/banzai/filter/autolink_filter_spec.rb
index 6217381c491..4972c4b4bd2 100644
--- a/spec/lib/banzai/filter/autolink_filter_spec.rb
+++ b/spec/lib/banzai/filter/autolink_filter_spec.rb
@@ -121,6 +121,13 @@ describe Banzai::Filter::AutolinkFilter do
       expect(doc.to_s).to eq("See #{link}")
     end
 
+    it 'does not autolink bad URLs after we remove trailing punctuation' do
+      link = 'http://]'
+      doc = filter("See #{link}")
+
+      expect(doc.to_s).to eq("See #{link}")
+    end
+
     it 'does not include trailing punctuation' do
       ['.', ', ok?', '...', '?', '!', ': is that ok?'].each do |trailing_punctuation|
         doc = filter("See #{link}#{trailing_punctuation}")
-- 
GitLab