diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2017-10-05 13:21:55 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2017-10-10 18:49:47 +0200 |
| commit | de1446d3a34c110c9cea0c6b8fb0c76826201426 (patch) | |
| tree | b6df18df77b4582e3719973dfb229332dd94f806 /lib/gitlab_access.rb | |
| parent | bbda5bd1dd2e841410d73a68fa8cd3a8425159c5 (diff) | |
| download | gitlab-shell-de1446d3a34c110c9cea0c6b8fb0c76826201426.tar.gz | |
Add relative git object dir envvars to check access requestfeature/add-pwd-envvar-to-check-access-request
Diffstat (limited to 'lib/gitlab_access.rb')
| -rw-r--r-- | lib/gitlab_access.rb | 8 |
1 files changed, 2 insertions, 6 deletions
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? |