[ci skip] Merge branch 'master' into fl-update-registry-codefl-update-registry-code

* master: (68 commits)
  Render calendar feed inline when accessed from GitLab
  Make Gitaly wiki RPC's mandatory
  Remove the ci_job_request_with_tags_matcher
  Optimised paused runners to not re-query every 3s
  [Rails5] Set request.format for artifacts_controller
  [Rails5] Fix sessions_controller_spec
  Rails5 update Gemfile.rails5.lock
  [Rails5] Fix pipeline_schedules_controller_spec
  Fix milestones disappearing when changed on MR
  Harmonize theme preferences previews
  Resolve "Wiki git clone holder and dropdown is broken"
  Resolve "Update link in GitLab cluster setup form to say "see pricing""
  Resolve "Misalignment in rows on comparison page"
  Resolve "Stop horizontal scrolling when clicking on board issue"
  Enable no-multi-assignment in JS files
  Fix ci mini graph dropdown alignment and positioning
  Remove additional border from the create project page
  Fix alert colors
  Enable display static for ci job dropdowns so that they dont move when window resizes
  Remove pointer events in favor of boundary viewport
  ...

1 files changed, 25 insertions, 0 deletions

diff --git a/spec/controllers/concerns/internal_redirect_spec.rb b/spec/controllers/concerns/internal_redirect_spec.rb
index a0ee13b2352..7e23b56356e 100644
--- a/spec/controllers/concerns/internal_redirect_spec.rb
+++ b/spec/controllers/concerns/internal_redirect_spec.rb
@@ -54,6 +54,31 @@ describe InternalRedirect do
     end
   end
 
+  describe '#sanitize_redirect' do
+    let(:valid_path) { '/hello/world?hello=world' }
+    let(:valid_url) { "http://test.host#{valid_path}" }
+
+    it 'returns `nil` for invalid paths' do
+      invalid_path = '//not/valid'
+
+      expect(controller.sanitize_redirect(invalid_path)).to eq nil
+    end
+
+    it 'returns `nil` for invalid urls' do
+      input = 'http://test.host:3000/invalid'
+
+      expect(controller.sanitize_redirect(input)).to eq nil
+    end
+
+    it 'returns input for valid paths' do
+      expect(controller.sanitize_redirect(valid_path)).to eq valid_path
+    end
+
+    it 'returns path for valid urls' do
+      expect(controller.sanitize_redirect(valid_url)).to eq valid_path
+    end
+  end
+
   describe '#host_allowed?' do
     it 'allows uris with the same host and port' do
       expect(controller.host_allowed?(URI('http://test.host/test'))).to be(true)