Patch GRack class instead of reopening them

Author: root

Diff for: lib/grack/auth.rb renamed to lib/grack/auth_patch.rb

@@ -1,12 +1,10 @@
 module Grack
-  class Auth < Rack::Auth::Basic
-
-    attr_accessor :user, :env
+  module AuthPatch
 
     def call(env)
       @env = env
       @request = Rack::Request.new(env)
-      @auth = Request.new(env)
+      @auth = Rack::Auth::Basic::Request.new(env)
 
       # Need this patch due to the rails mount
 
@@ -41,7 +39,7 @@ def auth!
         end
 
         if authorized_request?
-          @app.call(env)
+          @app.call(@env)
         else
           unauthorized
         end
@@ -57,8 +55,8 @@ def authenticate_user(login, password)
       def authorized_request?
         case git_cmd
         when *RedmineGitHosting::GitAccess::DOWNLOAD_COMMANDS
-          if user
-            RedmineGitHosting::GitAccess.new.download_access_check(user, repository, is_ssl?).allowed?
+          if @user
+            RedmineGitHosting::GitAccess.new.download_access_check(@user, repository, is_ssl?).allowed?
           elsif repository.public_project? || repository.public_repo?
             # Allow clone/fetch for public projects
             true
@@ -70,8 +68,8 @@ def authorized_request?
           if !is_ssl?
             logger.error('SmartHttp : your are trying to push data without SSL!, exiting !')
             false
-          elsif user
-            RedmineGitHosting::GitAccess.new.upload_access_check(user, repository).allowed?
+          elsif @user
+            RedmineGitHosting::GitAccess.new.upload_access_check(@user, repository).allowed?
           else
             false
           end
@@ -136,3 +134,7 @@ def logger
 
   end
 end
+
+unless Grack::Auth.included_modules.include?(Grack::AuthPatch)
+  Grack::Auth.send(:prepend, Grack::AuthPatch)
+end

Diff for: lib/grack/server.rb renamed to lib/grack/server_patch.rb

@@ -1,50 +1,5 @@
 module Grack
-  class Server
-
-    # Override original *service_rpc* method to fix compatibility with Ruby 1.9.3 IO.popen.
-    #
-    # Between Ruby 1.9 and Ruby 2.0 the method signature has changed :
-    # Ruby 1.9.x : popen(cmd, mode="r" [, opt])
-    # Ruby 2.x   : popen([env,] cmd, mode="r" [, opt])
-    #
-    # Hence we need to remove the *popen_env* hash from IO.popen args.
-    #
-    # See :
-    #  - https://github.com/jbox-web/redmine_git_hosting/issues/345
-    #  - http://ruby-doc.org//core-1.9.3/IO.html#method-c-popen
-    #  - http://ruby-doc.org//core-2.1.0/IO.html#method-c-popen
-    #
-    # Notes :
-    # Given that some people use the Debian package to install Redmine which depends on Ruby 1.9.3
-    # this patch will stay until the release of Debian Jessie which will provide Ruby 2.1 .
-    # You're still strongly encouraged to move to Ruby 2.x .
-    #
-    if RUBY_VERSION.split('.')[0] == '1'
-      def service_rpc
-        return render_no_access if !has_access(@rpc, true)
-        input = read_body
-
-        @res = Rack::Response.new
-        @res.status = 200
-        @res['Content-Type']      = "application/x-git-#{@rpc}-result"
-        @res['Transfer-Encoding'] = 'chunked'
-        @res['Cache-Control']     = 'no-cache'
-
-        @res.finish do
-          command = git_command(%W(#{@rpc} --stateless-rpc #{@dir}))
-          IO.popen(command, File::RDWR, popen_options) do |pipe|
-            pipe.write(input)
-            pipe.close_write
-            while !pipe.eof?
-              block = pipe.read(8192)           # 8KB at a time
-              @res.write encode_chunk(block)    # stream it to the client
-            end
-            @res.write terminating_chunk
-          end
-        end
-      end
-    end
-
+  module ServerPatch
 
     # Override original *get_git_dir* method because the path is relative
     # and accessed via Sudo.
@@ -172,3 +127,7 @@ def repository_object
 
   end
 end
+
+unless Grack::Server.included_modules.include?(Grack::ServerPatch)
+  Grack::Server.send(:prepend, Grack::ServerPatch)
+end

Diff for: lib/redmine_git_hosting.rb

@@ -80,8 +80,8 @@ def loglevel
   require_dependency 'redmine/scm/adapters/xitolite_adapter'
 
   ## Gitlab Grack for Git SmartHTTP
-  require_dependency 'grack/auth'
-  require_dependency 'grack/server'
+  require_dependency 'grack/auth_patch'
+  require_dependency 'grack/server_patch'
 
   ## Hrack for Git Hooks
   require 'hrack/init'