Fix Git over HTTP spec

* The spec has 7 failures at this point
* Specify rendered error messages
* Render the GitAccess message rather than “Access denied”
* Render the Not Found message provided by GitAccess, instead of a custom one
* Expect GitAccess to check the config for whether Git-over-HTTP pull or push is disabled, rather than doing it in the controller
* Add more thorough testing for authentication
* Dried up a lot of tests
* Fixed some broken tests

lib/gitlab/checks/change_access.rb

 module Gitlab
   module Checks
     class ChangeAccess
+      ERROR_MESSAGES = {
+        push_code: 'You are not allowed to push code to this project.',
+        delete_default_branch: 'The default branch of a project cannot be deleted.',
+        force_push_protected_branch: 'You are not allowed to force push code to a protected branch on this project.',
+        non_master_delete_protected_branch: 'You are not allowed to delete protected branches from this project. Only a project master or owner can delete a protected branch.',
+        non_web_delete_protected_branch: 'You can only delete protected branches using the web interface.',
+        merge_protected_branch: 'You are not allowed to merge code into protected branches on this project.',
+        push_protected_branch: 'You are not allowed to push code to protected branches on this project.',
+        change_existing_tags: 'You are not allowed to change existing tags on this project.',
+        update_protected_tag: 'Protected tags cannot be updated.',
+        delete_protected_tag: 'Protected tags cannot be deleted.',
+        create_protected_tag: 'You are not allowed to create this tag as it is protected.'
+      }.freeze
+
       attr_reader :user_access, :project, :skip_authorization, :protocol
       def initialize(
@@ -32,7 +46,7 @@ module Gitlab
       def push_checks
         if user_access.cannot_do_action?(:push_code)
-          "You are not allowed to push code to this project."
+          ERROR_MESSAGES[:push_code]
         end
       end
@@ -40,7 +54,7 @@ module Gitlab
         return unless @branch_name
         if deletion? && @branch_name == project.default_branch
-          return "The default branch of a project cannot be deleted."
+          return ERROR_MESSAGES[:delete_default_branch]
         end
         protected_branch_checks
@@ -50,7 +64,7 @@ module Gitlab
         return unless ProtectedBranch.protected?(project, @branch_name)
         if forced_push?
-          return "You are not allowed to force push code to a protected branch on this project."
+          return ERROR_MESSAGES[:force_push_protected_branch]
         end
         if deletion?
@@ -62,22 +76,22 @@ module Gitlab
       def protected_branch_deletion_checks
         unless user_access.can_delete_branch?(@branch_name)
-          return 'You are not allowed to delete protected branches from this project. Only a project master or owner can delete a protected branch.'
+          return ERROR_MESSAGES[:non_master_delete_protected_branch]
         end
         unless protocol == 'web'
-          'You can only delete protected branches using the web interface.'
+          ERROR_MESSAGES[:non_web_delete_protected_branch]
         end
       end
       def protected_branch_push_checks
         if matching_merge_request?
           unless user_access.can_merge_to_branch?(@branch_name) || user_access.can_push_to_branch?(@branch_name)
-            "You are not allowed to merge code into protected branches on this project."
+            ERROR_MESSAGES[:merge_protected_branch]
           end
         else
           unless user_access.can_push_to_branch?(@branch_name)
-            "You are not allowed to push code to protected branches on this project."
+            ERROR_MESSAGES[:push_protected_branch]
           end
         end
       end
@@ -86,7 +100,7 @@ module Gitlab
         return unless @tag_name
         if tag_exists? && user_access.cannot_do_action?(:admin_project)
-          return "You are not allowed to change existing tags on this project."
+          return ERROR_MESSAGES[:change_existing_tags]
         end
         protected_tag_checks
@@ -95,11 +109,11 @@ module Gitlab
       def protected_tag_checks
         return unless ProtectedTag.protected?(project, @tag_name)
-        return "Protected tags cannot be updated." if update?
-        return "Protected tags cannot be deleted." if deletion?
+        return ERROR_MESSAGES[:update_protected_tag] if update?
+        return ERROR_MESSAGES[:delete_protected_tag] if deletion?
         unless user_access.can_create_tag?(@tag_name)
-          return "You are not allowed to create this tag as it is protected."
+          return ERROR_MESSAGES[:create_protected_tag]
         end
       end

lib/gitlab/git_access.rb

@@ -9,7 +9,10 @@ module Gitlab
       download: 'You are not allowed to download code from this project.',
       deploy_key_upload:
         'This deploy key does not have write access to this project.',
-      no_repo: 'A repository for this project does not exist yet.'
+      no_repo: 'A repository for this project does not exist yet.',
+      project_not_found: 'The project you were looking for could not be found.',
+      account_blocked: 'Your account has been blocked.',
+      command_not_allowed: "The command you're trying to execute is not allowed."
     }.freeze
     DOWNLOAD_COMMANDS = %w{ git-upload-pack git-upload-archive }.freeze
@@ -73,19 +76,19 @@ module Gitlab
       return if deploy_key?
       if user && !user_access.allowed?
-        raise UnauthorizedError, "Your account has been blocked."
+        raise UnauthorizedError, ERROR_MESSAGES[:account_blocked]
       end
     end
     def check_project_accessibility!
       if project.blank? || !can_read_project?
-        raise UnauthorizedError, 'The project you were looking for could not be found.'
+        raise UnauthorizedError, ERROR_MESSAGES[:project_not_found]
       end
     end
     def check_command_existence!(cmd)
       unless ALL_COMMANDS.include?(cmd)
-        raise UnauthorizedError, "The command you're trying to execute is not allowed."
+        raise UnauthorizedError, ERROR_MESSAGES[:command_not_allowed]
       end
     end

lib/gitlab/git_access_wiki.rb

 module Gitlab
   class GitAccessWiki < GitAccess
+    ERROR_MESSAGES = {
+      write_to_wiki: "You are not allowed to write to this project's wiki."
+    }.freeze
+
     def guest_can_download_code?
       Guest.can?(:download_wiki_code, project)
     end
@@ -12,7 +16,7 @@ module Gitlab
       if user_access.can_do_action?(:create_wiki)
         build_status_object(true)
       else
-        build_status_object(false, "You are not allowed to write to this project's wiki.")
+        build_status_object(false, ERROR_MESSAGES[:write_to_wiki])
       end
     end
   end

spec/support/git_http_helpers.rb

@@ -35,9 +35,14 @@ module GitHttpHelpers
     yield response
   end
+  def download_or_upload(*args, &block)
+    download(*args, &block)
+    upload(*args, &block)
+  end
+
   def auth_env(user, password, spnego_request_token)
     env = workhorse_internal_api_request_header
-    if user && password
+    if user
       env['HTTP_AUTHORIZATION'] = ActionController::HttpAuthentication::Basic.encode_credentials(user, password)
     elsif spnego_request_token
       env['HTTP_AUTHORIZATION'] = "Negotiate #{::Base64.strict_encode64('opaque_request_token')}"
@@ -45,4 +50,16 @@ module GitHttpHelpers
     env
   end
+
+  def git_access_error(error_key)
+    Gitlab::GitAccess::ERROR_MESSAGES[error_key]
+  end
+
+  def git_access_wiki_error(error_key)
+    Gitlab::GitAccessWiki::ERROR_MESSAGES[error_key]
+  end
+
+  def change_access_error(error_key)
+    Gitlab::Checks::ChangeAccess::ERROR_MESSAGES[error_key]
+  end
 end