From 23d37382dabe3f7c7f2e11df2731de8e939e0cab Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Fri, 19 May 2017 12:58:45 -0700
Subject: Refactor to let GitAccess errors bubble up

No external behavior change.

This allows `GitHttpController` to set the HTTP status based on the type of error. Alternatively, we could have added an attribute to GitAccessStatus, but this pattern seemed appropriate.
---
 lib/api/internal.rb | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'lib/api/internal.rb')

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 9ebd4841296..3d60d1da114 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -32,29 +32,31 @@ module API
 
         actor.update_last_used_at if actor.is_a?(Key)
 
-        access_checker = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess
-        access_status = access_checker
+        access_checker_klass = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess
+        access_checker = access_checker_klass
           .new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities)
-          .check(params[:action], params[:changes])
 
-        response = { status: access_status.status, message: access_status.message }
+        begin
+          access_status = access_checker.check(params[:action], params[:changes])
+          response = { status: access_status.status, message: access_status.message }
+        rescue Gitlab::GitAccess::UnauthorizedError, Gitlab::GitAccess::NotFoundError => e
+          return { status: false, message: e.message }
+        end
 
-        if access_status.status
-          log_user_activity(actor)
+        log_user_activity(actor)
 
-          # Project id to pass between components that don't share/don't have
-          # access to the same filesystem mounts
-          response[:gl_repository] = Gitlab::GlRepository.gl_repository(project, wiki?)
+        # Project id to pass between components that don't share/don't have
+        # access to the same filesystem mounts
+        response[:gl_repository] = Gitlab::GlRepository.gl_repository(project, wiki?)
 
-          # Return the repository full path so that gitlab-shell has it when
-          # handling ssh commands
-          response[:repository_path] =
-            if wiki?
-              project.wiki.repository.path_to_repo
-            else
-              project.repository.path_to_repo
-            end
-        end
+        # Return the repository full path so that gitlab-shell has it when
+        # handling ssh commands
+        response[:repository_path] =
+          if wiki?
+            project.wiki.repository.path_to_repo
+          else
+            project.repository.path_to_repo
+          end
 
         response
       end
-- 
cgit v1.2.1


From b50a22894d4503cf99cecb8162696f854e1b3f85 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Tue, 23 May 2017 11:34:58 -0700
Subject: Refactor construction of response

---
 lib/api/internal.rb | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

(limited to 'lib/api/internal.rb')

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 3d60d1da114..f2d41754afd 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -37,26 +37,18 @@ module API
           .new(actor, project, protocol, authentication_abilities: ssh_authentication_abilities)
 
         begin
-          access_status = access_checker.check(params[:action], params[:changes])
-          response = { status: access_status.status, message: access_status.message }
+          access_checker.check(params[:action], params[:changes])
         rescue Gitlab::GitAccess::UnauthorizedError, Gitlab::GitAccess::NotFoundError => e
           return { status: false, message: e.message }
         end
 
         log_user_activity(actor)
 
-        # Project id to pass between components that don't share/don't have
-        # access to the same filesystem mounts
-        response[:gl_repository] = Gitlab::GlRepository.gl_repository(project, wiki?)
-
-        # Return the repository full path so that gitlab-shell has it when
-        # handling ssh commands
-        response[:repository_path] =
-          if wiki?
-            project.wiki.repository.path_to_repo
-          else
-            project.repository.path_to_repo
-          end
+        response = {
+          status: true,
+          gl_repository: gl_repository,
+          repository_path: repository_path
+        }
 
         response
       end
-- 
cgit v1.2.1


From ef4e913597611ee88cfcac226a409f39873eb676 Mon Sep 17 00:00:00 2001
From: Michael Kozono <mkozono@gmail.com>
Date: Mon, 5 Jun 2017 10:39:32 -0700
Subject: Remove unnecessary variable

---
 lib/api/internal.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'lib/api/internal.rb')

diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index f2d41754afd..38631953014 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -44,13 +44,11 @@ module API
 
         log_user_activity(actor)
 
-        response = {
+        {
           status: true,
           gl_repository: gl_repository,
           repository_path: repository_path
         }
-
-        response
       end
 
       post "/lfs_authenticate" do
-- 
cgit v1.2.1