From ae9e5eea3c6955d278182005808fbdfccd4d447b Mon Sep 17 00:00:00 2001
From: GitLab <example@example.com>
Date: Tue, 28 Jul 2015 15:17:06 +0200
Subject: Handle missing @user during Git HTTP requests

---
 lib/gitlab/backend/grack_auth.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb
index f7fc97651f2..5966d394b62 100644
--- a/lib/gitlab/backend/grack_auth.rb
+++ b/lib/gitlab/backend/grack_auth.rb
@@ -28,7 +28,7 @@ module Grack
       if project && authorized_request?
         if ENV['GITLAB_GRACK_AUTH_ONLY'] == '1'
           # Tell gitlab-git-http-server the request is OK, and what the GL_ID is
-          [200, { "Content-Type" => "text/plain" }, [Gitlab::ShellEnv.gl_id(@user)]]
+          render_grack_auth_ok
         else
           @app.call(env)
         end
@@ -179,6 +179,15 @@ module Grack
       end
     end
 
+    def render_grack_auth_ok
+      if @user.present?
+        body = Gitlab::ShellEnv.gl_id(@user)
+      else
+        body = ''
+      end
+      [200, { "Content-Type" => "text/plain" }, [body]]
+    end
+
     def render_not_found
       [404, { "Content-Type" => "text/plain" }, ["Not Found"]]
     end
-- 
cgit v1.2.1