Merge branch '25301-git-2.11-force-push-bug' into 'master' v4.1.1

Pass relevant git environment variables while calling `/allowed`

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.

---

- Related to gitlab-org/gitlab-ce#25301. 
- Corresponding backend MR: gitlab-org/gitlab-ce!7967
- Corresponding EE MR: gitlab-org/gitlab-ee!964

See merge request !112

4 files changed, 13 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 3bf0d5d..bae860c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+v4.1.1
+  - Send (a selection of) git environment variables while making the API call to `/allowed`, !112
+
 v4.1.0
   - Add support for global custom hooks and chained hook directories (Elan Ruusamäe, Dirk Hörner), !113, !111, !93, !89, #32
   - Clear up text with merge request after new branch push (Lisanne Fellinger)
diff --git a/VERSION b/VERSION
index ee74734..627a3f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.1.0
+4.1.1
diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb
index 34cf4b1..1b2a065 100644
--- a/lib/gitlab_access.rb
+++ b/lib/gitlab_access.rb
@@ -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?
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index ed0b705..8488adc 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: sanitize_path(repo),
-      protocol: protocol
+      protocol: protocol,
+      env: env
     }
 
     if actor =~ /\Akey\-\d+\Z/