Handle missing @user during Git HTTP requests
This commit is contained in:
parent
d3305df7aa
commit
ae9e5eea3c
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue