diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-02 21:05:16 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-02 21:05:16 +0300 |
commit | d9f794a850202cb579b8c8e935b9e07b798ad0b6 (patch) | |
tree | c99dcb08e5e8700355f8dd0a8bcc1f9b93844fda | |
parent | 28219ea9211d6caafa34620859ff0e879ec54c12 (diff) | |
parent | 30bf2b9cc370da5936f70b827db4f53dc33d8f1f (diff) |
Merge branch 'grack-auth-new-instance' into 'master'
Avoid instance variable re-use trouble
This is the quickest/dumbest/safest way I could think of to prevent
the instance variable reuse problems we have on dev.gitlab.org now.
See merge request !1237
-rw-r--r-- | config/routes.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/backend/grack_auth.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index 920ece518ea..a98c0f8aa77 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,7 +30,7 @@ Gitlab::Application.routes.draw do end # Enable Grack support - mount Grack::Auth.new({}), at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] + mount Grack::AuthSpawner, at: '/', constraints: lambda { |request| /[-\/\w\.]+\.git\//.match(request.path_info) }, via: [:get, :post] # Help get 'help' => 'help#index' diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index aa46c9a6d49..0353b3b7ed3 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -1,6 +1,14 @@ require_relative 'shell_env' module Grack + class AuthSpawner + def self.call(env) + # Avoid issues with instance variables in Grack::Auth persisting across + # requests by creating a new instance for each request. + Auth.new({}).call(env) + end + end + class Auth < Rack::Auth::Basic attr_accessor :user, :project, :env |