From 48ce80a60c4d80afa555ce511e98102ff5291a31 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 26 Aug 2013 12:54:57 +0300 Subject: [PATCH] Fix issue when developers are able to push to protected branch When that branch contain a '/' in the branch name. Fix for git over HTTP --- lib/gitlab/backend/grack_auth.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/gitlab/backend/grack_auth.rb b/lib/gitlab/backend/grack_auth.rb index ddf370fba..be5c58bb5 100644 --- a/lib/gitlab/backend/grack_auth.rb +++ b/lib/gitlab/backend/grack_auth.rb @@ -15,7 +15,7 @@ module Grack @auth = Request.new(env) # Need this patch due to the rails mount - + # Need this if under RELATIVE_URL_ROOT unless Gitlab.config.gitlab.relative_url_root.empty? # If website is mounted using relative_url_root need to remove it first @@ -23,7 +23,7 @@ module Grack else @env['PATH_INFO'] = @request.path end - + @env['SCRIPT_NAME'] = "" auth! @@ -110,7 +110,7 @@ module Grack # Need to reset seek point @request.body.rewind - /refs\/heads\/([\w\.-]+)/n.match(input.force_encoding('ascii-8bit')).to_a.last + /refs\/heads\/([\/\w\.-]+)/n.match(input.force_encoding('ascii-8bit')).to_a.last end end end -- 2.11.0