diff options
author | Rémy Coutable <remy@rymai.me> | 2019-04-15 16:30:50 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-04-15 16:30:50 +0300 |
commit | b40ea0f1e2f2a7bb804b2181b87d74a75454f62b (patch) | |
tree | fc40d8bd471b7639fa2888afa9ef2ad4c1d0a321 /spec/controllers | |
parent | b15a78dfdd497848a0fd763185e79b0361da1dbb (diff) | |
parent | e675fe4621bc5668d5d9b72961a38be72baf23dd (diff) |
Merge branch 'sh-validate-ref-name-in-commit' into 'master'
Validate refs used in controllers don't have spaces
Closes #58572 and gitaly#1425
See merge request gitlab-org/gitlab-ce!24037
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects/tree_controller_spec.rb | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/spec/controllers/projects/tree_controller_spec.rb b/spec/controllers/projects/tree_controller_spec.rb index e1d8719d8d6..7f7cabe3b0c 100644 --- a/spec/controllers/projects/tree_controller_spec.rb +++ b/spec/controllers/projects/tree_controller_spec.rb @@ -74,6 +74,26 @@ describe Projects::TreeController do end end + describe 'GET show with whitespace in ref' do + render_views + + let(:id) { "this ref/api/responses" } + + it 'does not call make a Gitaly request' do + allow(::Gitlab::GitalyClient).to receive(:call).and_call_original + expect(::Gitlab::GitalyClient).not_to receive(:call).with(anything, :commit_service, :find_commit, anything, anything) + + get(:show, + params: { + namespace_id: project.namespace.to_param, + project_id: project, + id: id + }) + + expect(response).to have_gitlab_http_status(:not_found) + end + end + describe 'GET show with blob path' do render_views |