From de1446d3a34c110c9cea0c6b8fb0c76826201426 Mon Sep 17 00:00:00 2001 From: Ahmad Sherif Date: Thu, 5 Oct 2017 13:21:55 +0200 Subject: Add relative git object dir envvars to check access request --- lib/gitlab_access.rb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/gitlab_access.rb') diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index 3cdeb3e..e1a5e35 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -3,6 +3,7 @@ require_relative 'gitlab_net' require_relative 'gitlab_access_status' require_relative 'names_helper' require_relative 'gitlab_metrics' +require_relative 'object_dirs_helper' require 'json' class GitlabAccess @@ -23,12 +24,7 @@ class GitlabAccess def exec status = GitlabMetrics.measure('check-access:git-receive-pack') do - env = { - "GIT_ALTERNATE_OBJECT_DIRECTORIES" => ENV["GIT_ALTERNATE_OBJECT_DIRECTORIES"], - "GIT_OBJECT_DIRECTORY" => ENV["GIT_OBJECT_DIRECTORY"] - } - - api.check_access('git-receive-pack', @gl_repository, @repo_path, @actor, @changes, @protocol, env: env.to_json) + api.check_access('git-receive-pack', @gl_repository, @repo_path, @actor, @changes, @protocol, env: ObjectDirsHelper.all_attributes.to_json) end raise AccessDeniedError, status.message unless status.allowed? -- cgit v1.2.1