From 6aa601866c66a62b4ab3db3fa55ab1b5e84e444d Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Wed, 22 Jun 2016 12:54:27 -0500 Subject: Rename ENV['PROTOCOL'] to ENV['GL_PROTOCOL'] and make it mandatory with no fallback value --- hooks/pre-receive | 2 +- lib/gitlab_access.rb | 2 +- lib/gitlab_net.rb | 2 +- lib/gitlab_shell.rb | 2 +- spec/gitlab_net_spec.rb | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hooks/pre-receive b/hooks/pre-receive index a7eeb30..a4b2e32 100755 --- a/hooks/pre-receive +++ b/hooks/pre-receive @@ -5,7 +5,7 @@ refs = $stdin.read key_id = ENV['GL_ID'] -protocol = ENV['PROTOCOL'] || 'http' +protocol = ENV['GL_PROTOCOL'] repo_path = Dir.pwd require_relative '../lib/gitlab_custom_hook' diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index bab2c4c..04806b2 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -11,7 +11,7 @@ class GitlabAccess attr_reader :config, :repo_path, :repo_name, :changes, :protocol - def initialize(repo_path, actor, changes, protocol = nil) + def initialize(repo_path, actor, changes, protocol) @config = GitlabConfig.new @repo_path = repo_path.strip @actor = actor diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 24e97be..e10a07a 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -14,7 +14,7 @@ class GitlabNet CHECK_TIMEOUT = 5 READ_TIMEOUT = 300 - def check_access(cmd, repo, actor, changes, protocol = nil) + def check_access(cmd, repo, actor, changes, protocol) project_name = repo.gsub("'", "") project_name = project_name.gsub(/\.git\Z/, "") project_name = project_name.gsub(/\A\//, "") diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 3dc10b6..1e94369 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -132,7 +132,7 @@ class GitlabShell 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'LANG' => ENV['LANG'], 'GL_ID' => @key_id, - 'PROTOCOL' => 'ssh' + 'GL_PROTOCOL' => 'ssh' } if @config.git_annex_enabled? diff --git a/spec/gitlab_net_spec.rb b/spec/gitlab_net_spec.rb index b236247..2bbf98b 100644 --- a/spec/gitlab_net_spec.rb +++ b/spec/gitlab_net_spec.rb @@ -110,7 +110,7 @@ describe GitlabNet, vcr: true do context 'ssh key with access to project' do it 'should allow pull access for dev.gitlab.org' do VCR.use_cassette("allowed-pull") do - access = gitlab_net.check_access('git-receive-pack', 'gitlab/gitlabhq.git', 'key-126', changes) + access = gitlab_net.check_access('git-receive-pack', 'gitlab/gitlabhq.git', 'key-126', changes, 'ssh') access.allowed?.should be_true end end @@ -118,13 +118,13 @@ describe GitlabNet, vcr: true do it 'adds the secret_token to the request' do VCR.use_cassette("allowed-pull") do Net::HTTP::Post.any_instance.should_receive(:set_form_data).with(hash_including(secret_token: 'a123')) - gitlab_net.check_access('git-receive-pack', 'gitlab/gitlabhq.git', 'key-126', changes) + gitlab_net.check_access('git-receive-pack', 'gitlab/gitlabhq.git', 'key-126', changes, 'ssh') end end it 'should allow push access for dev.gitlab.org' do VCR.use_cassette("allowed-push") do - access = gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'key-126', changes) + access = gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'key-126', changes, 'ssh') access.allowed?.should be_true end end @@ -169,21 +169,21 @@ describe GitlabNet, vcr: true do context 'ssh key without access to project' do it 'should deny pull access for dev.gitlab.org' do VCR.use_cassette("denied-pull") do - access = gitlab_net.check_access('git-receive-pack', 'gitlab/gitlabhq.git', 'key-2', changes) + access = gitlab_net.check_access('git-receive-pack', 'gitlab/gitlabhq.git', 'key-2', changes, 'ssh') access.allowed?.should be_false end end it 'should deny push access for dev.gitlab.org' do VCR.use_cassette("denied-push") do - access = gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'key-2', changes) + access = gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'key-2', changes, 'ssh') access.allowed?.should be_false end end it 'should deny push access for dev.gitlab.org (with user)' do VCR.use_cassette("denied-push-with-user") do - access = gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'user-1', changes) + access = gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'user-1', changes, 'ssh') access.allowed?.should be_false end end @@ -192,7 +192,7 @@ describe GitlabNet, vcr: true do it "raises an exception if the connection fails" do Net::HTTP.any_instance.stub(:request).and_raise(StandardError) expect { - gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'user-1', changes) + gitlab_net.check_access('git-upload-pack', 'gitlab/gitlabhq.git', 'user-1', changes, 'ssh') }.to raise_error(GitlabNet::ApiUnreachableError) end end -- cgit v1.2.1