From 752536bbb48970d17f09019338a9562127ac9ff7 Mon Sep 17 00:00:00 2001 From: Timothy Andrew Date: Wed, 7 Dec 2016 13:09:47 +0530 Subject: Pass relevant git environment variables while calling `/allowed` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. Starting version 2.11, git changed the way the pre-receive flow works. - Previously, the new potential objects would be added to the main repo. If the pre-receive passes, the new objects stay in the repo but are linked up. If the pre-receive fails, the new objects stay orphaned in the repo, and are cleaned up during the next `git gc`. - In 2.11, the new potential objects are added to a temporary "alternate object directory", that git creates for this purpose. If the pre-receive passes, the objects from the alternate object directory are migrated to the main repo. If the pre-receive fails the alternate object directory is simply deleted. 2. In our workflow, the pre-recieve script calls the `/allowed` endpoint on the rails server. This `/allowed` endpoint calls out directly to git to perform various checks. These direct calls to git do _not_ have the necessary environment variables set which allow access to the "alternate object directory" (explained above). Therefore these calls to git are not able to access any of the new potential objects to be added during this push. 3. We fix this by passing the relevant environment variables (GIT_ALTERNATE_OBJECT_DIRECTORIES, GIT_OBJECT_DIRECTORY, and GIT_QUARANTINE_PATH) to the `/allowed` endpoint, which will then include these environment variables while calling out to git. Signed-off-by: Rémy Coutable --- lib/gitlab_access.rb | 7 ++++++- lib/gitlab_net.rb | 5 +++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index 04806b2..717a6b6 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -21,7 +21,12 @@ class GitlabAccess end def exec - status = api.check_access('git-receive-pack', @repo_name, @actor, @changes, @protocol) + env = { + "GIT_ALTERNATE_OBJECT_DIRECTORIES" => ENV["GIT_ALTERNATE_OBJECT_DIRECTORIES"], + "GIT_OBJECT_DIRECTORY" => ENV["GIT_OBJECT_DIRECTORY"] + } + + status = api.check_access('git-receive-pack', @repo_path, @actor, @changes, @protocol, env: env.to_json) raise AccessDeniedError, status.message unless status.allowed? diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index 994f8d5..30fe5c4 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -15,14 +15,15 @@ class GitlabNet CHECK_TIMEOUT = 5 READ_TIMEOUT = 300 - def check_access(cmd, repo, actor, changes, protocol) + def check_access(cmd, repo, actor, changes, protocol, env: {}) changes = changes.join("\n") unless changes.kind_of?(String) params = { action: cmd, changes: changes, project: project_name(repo), - protocol: protocol + protocol: protocol, + env: env } if actor =~ /\Akey\-\d+\Z/ -- cgit v1.2.1 From a812dc29035147322a6361bcc26f4626dd57eaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 6 Feb 2017 09:50:50 +0100 Subject: Add 3.6.7 CHANGELOG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 0e96dc5..f3e4fe3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +v3.6.7 + - Send (a selection of) git environment variables while making the API call to `/allowed`, !112 + v3.6.6 - Re-use the default logger when logging metrics data -- cgit v1.2.1 From f85d650e67d199f43259a9181d7c0406571f4bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Mon, 6 Feb 2017 09:51:05 +0100 Subject: Bump VERSION to 3.6.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- VERSION | 2 +- lib/gitlab_access.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4f2c1d1..5b34131 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.6.6 +3.6.7 diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index 717a6b6..c1b30b0 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -26,7 +26,7 @@ class GitlabAccess "GIT_OBJECT_DIRECTORY" => ENV["GIT_OBJECT_DIRECTORY"] } - status = api.check_access('git-receive-pack', @repo_path, @actor, @changes, @protocol, env: env.to_json) + status = api.check_access('git-receive-pack', @repo_name, @actor, @changes, @protocol, env: env.to_json) raise AccessDeniedError, status.message unless status.allowed? -- cgit v1.2.1