From d698d3e846c83f49cd363291dd811220c338c8e9 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Mon, 25 Apr 2016 18:05:05 +0200
Subject: [PATCH] =?UTF-8?q?More=20changes=20suggested=20by=20R=C3=A9my?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projects/git_http_controller.rb           | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index e38552218ec..fafd9e445b5 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -1,7 +1,9 @@
 class Projects::GitHttpController < Projects::ApplicationController
+  attr_reader :user
+
   skip_before_action :repository
   before_action :authenticate_user
-  before_action :ensure_project_found?
+  before_action :ensure_project_found!
 
   # GET /foo/bar.git/info/refs?service=git-upload-pack (git pull)
   # GET /foo/bar.git/info/refs?service=git-receive-pack (git push)
@@ -47,29 +49,29 @@ class Projects::GitHttpController < Projects::ApplicationController
     end
   end
 
-  def ensure_project_found?
+  def ensure_project_found!
     render_not_found if project.blank?
   end
 
   def valid_ci_request?(login, password)
     matched_login = /(?<service>^[a-zA-Z]*-ci)-token$/.match(login)
 
-    if project && matched_login.present? && upload_pack?
-      underscored_service = matched_login['service'].underscore
-
-      if underscored_service == 'gitlab_ci'
-        return project && project.valid_build_token?(password)
-      elsif Service.available_services_names.include?(underscored_service)
-        # We treat underscored_service as a trusted input because it is included
-        # in the Service.available_services_names whitelist.
-        service_method = "#{underscored_service}_service"
-        service = project.send(service_method)
-
-        return service && service.activated? && service.valid_token?(password)
-      end
+    unless project && matched_login.present? && upload_pack?
+      return false
     end
 
-    false
+    underscored_service = matched_login['service'].underscore
+
+    if underscored_service == 'gitlab_ci'
+      project && project.valid_build_token?(password)
+    elsif Service.available_services_names.include?(underscored_service)
+      # We treat underscored_service as a trusted input because it is included
+      # in the Service.available_services_names whitelist.
+      service_method = "#{underscored_service}_service"
+      service = project.send(service_method)
+
+      service && service.activated? && service.valid_token?(password)
+    end
   end
 
   def oauth_access_token_check(login, password)
@@ -185,10 +187,6 @@ class Projects::GitHttpController < Projects::ApplicationController
     !!@ci
   end
 
-  def user
-    @user
-  end
-
   def upload_pack_allowed?
     if !Gitlab.config.gitlab_shell.upload_pack
       false