diff --git a/ee/lib/ee/gitlab/git_access.rb b/ee/lib/ee/gitlab/git_access.rb index 1a85f9c444a5e792be03bc628ed3b91a4a749156..f841003cb7893eec1d54a008a9fb429dfef0598e 100644 --- a/ee/lib/ee/gitlab/git_access.rb +++ b/ee/lib/ee/gitlab/git_access.rb @@ -52,11 +52,6 @@ def check_geo_license! def geo? actor == :geo end - - override :authed_via_jwt? - def authed_via_jwt? - geo? - end end end end diff --git a/ee/spec/requests/git_http_geo_spec.rb b/ee/spec/requests/git_http_geo_spec.rb index ed8d43c33fe0432783a07a712304e53f31905624..ebd12d845c84920be96247a98468a51aec5f82e4 100644 --- a/ee/spec/requests/git_http_geo_spec.rb +++ b/ee/spec/requests/git_http_geo_spec.rb @@ -278,37 +278,18 @@ def make_request response end - context 'when gl_id is not correctly provided via HTTP headers' do - context "as it's empty" do - where(:geo_gl_id) do - [ - nil, - '' - ] - end - - with_them do - it 'returns a 403' do - is_expected.to have_gitlab_http_status(:forbidden) - expect(response.body).to eql('You are not allowed to push code to this project.') - end - end + context 'when gl_id is incorrectly provided via HTTP headers' do + where(:geo_gl_id) do + [ + nil, + '' + ] end - context "as it's junk" do - where(:geo_gl_id) do - [ - 'junk', - 'junk-1', - 'kkey-1' - ] - end - - with_them do - it 'returns a 403' do - is_expected.to have_gitlab_http_status(:forbidden) - expect(response.body).to eql('Geo push user is invalid.') - end + with_them do + it 'returns a 403' do + is_expected.to have_gitlab_http_status(:forbidden) + expect(response.body).to eql('You are not allowed to upload code for this project.') end end end @@ -319,7 +300,10 @@ def make_request [ 'key-999', 'key-1', - 'key-999' + 'key-999', + 'junk', + 'junk-1', + 'kkey-1' ] end