Skip to content
Snippets Groups Projects

Pass relevant git environment variables while calling `/allowed`

Merged username-removed-407765 requested to merge 25301-git-2.11-force-push-bug into master
2 files
+ 9
3
Compare changes
  • Side-by-side
  • Inline
Files
2
  • 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.
+ 6
1
@@ -22,7 +22,12 @@ class GitlabAccess
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?
Loading