Skip to content

Commit

Permalink
Pass relevant git environment variables while calling /allowed
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
timothyandrew committed Dec 16, 2016
1 parent 92dad7c commit fc20164
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 6 additions & 1 deletion lib/gitlab_access.rb
Expand Up @@ -22,7 +22,12 @@ def initialize(repo_path, actor, changes, protocol)

def exec
status = GitlabMetrics.measure('check-access:git-receive-pack') do
api.check_access('git-receive-pack', @repo_path, @actor, @changes, @protocol)
env = {
"GIT_ALTERNATE_OBJECT_DIRECTORIES" => ENV["GIT_ALTERNATE_OBJECT_DIRECTORIES"],
"GIT_OBJECT_DIRECTORY" => ENV["GIT_OBJECT_DIRECTORY"]
}

api.check_access('git-receive-pack', @repo_path, @actor, @changes, @protocol, env: env.to_json)
end

raise AccessDeniedError, status.message unless status.allowed?
Expand Down
5 changes: 3 additions & 2 deletions lib/gitlab_net.rb
Expand Up @@ -15,14 +15,15 @@ class ApiUnreachableError < StandardError; end
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: sanitize_path(repo),
protocol: protocol
protocol: protocol,
env: env
}

if actor =~ /\Akey\-\d+\Z/
Expand Down

0 comments on commit fc20164

Please sign in to comment.