Merge branch 'fix/using-uploads-in-global-snippets' into 'master'

Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085

Merge branch 'fix/using-uploads-in-global-snippets' into 'master'
Fix using link to uploads in global snippets Closes #17342, closes #17363 See merge request !4085
0cc8cee6 · Robert Speicher · 98d8e3fe · 535be93a · 0cc8cee6 · 0cc8cee6
--- a/CHANGELOG
+++ b/CHANGELOG
 Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
+  - Fix error when using link to uploads in global snippets
  - Assign labels and milestone to target project when moving issue. !3934 (Long Nguyen)
  - Use a case-insensitive comparison in sanitizing URI schemes
  - Project#open_branches has been cleaned up and no longer loads entire records into memory.

--- a/lib/banzai/filter/upload_link_filter.rb
+++ b/lib/banzai/filter/upload_link_filter.rb
@@ -8,6 +8,8 @@ module Filter
    #
    class UploadLinkFilter < HTML::Pipeline::Filter
      def call
+        return doc unless project
        doc.search('a').each do |el|
          process_link_attr el.attribute('href')
        end
@@ -31,7 +33,11 @@ def process_link_attr(html_attr)
      end
      def build_url(uri)
-        File.join(Gitlab.config.gitlab.url, context[:project].path_with_namespace, uri)
+        File.join(Gitlab.config.gitlab.url, project.path_with_namespace, uri)
+      end
+      def project
+        context[:project]
      end
      # Ensure that a :project key exists in context

--- a/spec/lib/banzai/filter/upload_link_filter_spec.rb
+++ b/spec/lib/banzai/filter/upload_link_filter_spec.rb
@@ -8,6 +8,10 @@ def filter(doc, contexts = {})
      project: project
    })
+    raw_filter(doc, contexts)
+  end
+  def raw_filter(doc, contexts = {})
    described_class.call(doc, contexts)
  end
@@ -70,4 +74,18 @@ def link(path)
      expect(doc.at_css('img')['src']).to match "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/uploads/%ED%95%9C%EA%B8%80.png"
    end
  end
+  context 'when project context does not exist' do
+    let(:upload_link) { link('/uploads/e90decf88d8f96fe9e1389afc2e4a91f/test.jpg') }
+    it 'does not raise error' do
+      expect { raw_filter(upload_link, project: nil) }.not_to raise_error
+    end
+    it 'does not rewrite link' do
+      doc = raw_filter(upload_link, project: nil)
+      expect(doc.to_html).to eq upload_link
+    end
+  end
 end