Merge branch 'bvl-allow-more-repos-per-resource-ce' into 'master'

Allow multiple repositories per project

See merge request gitlab-org/gitlab-ce!26539

6 files changed, 95 insertions, 29 deletions

diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index fe78049af87..3fd824877ae 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -5,9 +5,11 @@ module API
     module InternalHelpers
       attr_reader :redirected_path
 
-      def wiki?
-        set_project unless defined?(@wiki) # rubocop:disable Gitlab/ModuleWithInstanceVariables
-        @wiki # rubocop:disable Gitlab/ModuleWithInstanceVariables
+      delegate :wiki?, to: :repo_type
+
+      def repo_type
+        set_project unless defined?(@repo_type) # rubocop:disable Gitlab/ModuleWithInstanceVariables
+        @repo_type # rubocop:disable Gitlab/ModuleWithInstanceVariables
       end
 
       def project
@@ -67,10 +69,10 @@ module API
       # rubocop:disable Gitlab/ModuleWithInstanceVariables
       def set_project
         if params[:gl_repository]
-          @project, @wiki = Gitlab::GlRepository.parse(params[:gl_repository])
+          @project, @repo_type = Gitlab::GlRepository.parse(params[:gl_repository])
           @redirected_path = nil
         else
-          @project, @wiki, @redirected_path = Gitlab::RepoPath.parse(params[:project])
+          @project, @repo_type, @redirected_path = Gitlab::RepoPath.parse(params[:project])
         end
       end
       # rubocop:enable Gitlab/ModuleWithInstanceVariables
@@ -78,7 +80,7 @@ module API
       # Project id to pass between components that don't share/don't have
       # access to the same filesystem mounts
       def gl_repository
-        Gitlab::GlRepository.gl_repository(project, wiki?)
+        repo_type.identifier_for_subject(project)
       end
 
       def gl_project_path
@@ -92,7 +94,7 @@ module API
       # Return the repository depending on whether we want the wiki or the
       # regular repository
       def repository
-        if wiki?
+        if repo_type.wiki?
           project.wiki.repository
         else
           project.repository
diff --git a/lib/api/internal.rb b/lib/api/internal.rb
index 7f4a00f1389..cb9aa849eeb 100644
--- a/lib/api/internal.rb
+++ b/lib/api/internal.rb
@@ -59,7 +59,7 @@ module API
             actor
           end
 
-        access_checker_klass = wiki? ? Gitlab::GitAccessWiki : Gitlab::GitAccess
+        access_checker_klass = repo_type.access_checker_class
         access_checker = access_checker_klass.new(actor, project,
           protocol, authentication_abilities: ssh_authentication_abilities,
                     namespace_path: namespace_path, project_path: project_path,
diff --git a/lib/gitlab/gl_repository.rb b/lib/gitlab/gl_repository.rb
index 435b74806e7..c2be7f3d63a 100644
--- a/lib/gitlab/gl_repository.rb
+++ b/lib/gitlab/gl_repository.rb
@@ -2,23 +2,38 @@
 
 module Gitlab
   module GlRepository
-    def self.gl_repository(project, is_wiki)
-      "#{is_wiki ? 'wiki' : 'project'}-#{project.id}"
+    PROJECT = RepoType.new(
+      name: :project,
+      access_checker_class: Gitlab::GitAccess,
+      repository_accessor: -> (project) { project.repository }
+    ).freeze
+    WIKI = RepoType.new(
+      name: :wiki,
+      access_checker_class: Gitlab::GitAccessWiki,
+      repository_accessor: -> (project) { project.wiki.repository }
+    ).freeze
+
+    TYPES = {
+      PROJECT.name.to_s => PROJECT,
+      WIKI.name.to_s => WIKI
+    }.freeze
+
+    def self.types
+      TYPES
     end
 
-    # rubocop: disable CodeReuse/ActiveRecord
     def self.parse(gl_repository)
-      match_data = /\A(project|wiki)-([1-9][0-9]*)\z/.match(gl_repository)
-      unless match_data
+      type_name, _id = gl_repository.split('-').first
+      type = types[type_name]
+      subject_id = type&.fetch_id(gl_repository)
+
+      unless subject_id
         raise ArgumentError, "Invalid GL Repository \"#{gl_repository}\""
       end
 
-      type, id = match_data.captures
-      project = Project.find_by(id: id)
-      wiki = type == 'wiki'
+      project = Project.find_by_id(subject_id)
 
-      [project, wiki]
+      [project, type]
     end
-    # rubocop: enable CodeReuse/ActiveRecord
   end
 end
diff --git a/lib/gitlab/gl_repository/repo_type.rb b/lib/gitlab/gl_repository/repo_type.rb
new file mode 100644
index 00000000000..7abe6c29a25
--- /dev/null
+++ b/lib/gitlab/gl_repository/repo_type.rb
@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module GlRepository
+    class RepoType
+      attr_reader :name,
+                  :access_checker_class,
+                  :repository_accessor
+
+      def initialize(name:, access_checker_class:, repository_accessor:)
+        @name = name
+        @access_checker_class = access_checker_class
+        @repository_accessor = repository_accessor
+      end
+
+      def identifier_for_subject(subject)
+        "#{name}-#{subject.id}"
+      end
+
+      def fetch_id(identifier)
+        match = /\A#{name}-(?<id>\d+)\z/.match(identifier)
+        match[:id] if match
+      end
+
+      def wiki?
+        self == WIKI
+      end
+
+      def project?
+        self == PROJECT
+      end
+
+      def path_suffix
+        project? ? "" : ".#{name}"
+      end
+
+      def repository_for(subject)
+        repository_accessor.call(subject)
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/repo_path.rb b/lib/gitlab/repo_path.rb
index 202d310e237..207a80b7db2 100644
--- a/lib/gitlab/repo_path.rb
+++ b/lib/gitlab/repo_path.rb
@@ -5,19 +5,26 @@ module Gitlab
     NotFoundError = Class.new(StandardError)
 
     def self.parse(repo_path)
-      wiki = false
       project_path = repo_path.sub(/\.git\z/, '').sub(%r{\A/}, '')
 
-      project, was_redirected = find_project(project_path)
-
-      if project_path.end_with?('.wiki') && project.nil?
-        project, was_redirected = find_project(project_path.chomp('.wiki'))
-        wiki = true
+      # Detect the repo type based on the path, the first one tried is the project
+      # type, which does not have a suffix.
+      Gitlab::GlRepository.types.each do |_name, type|
+        # If the project path does not end with the defined suffix, try the next
+        # type.
+        # We'll always try to find a project with an empty suffix (for the
+        # `Gitlab::GlRepository::PROJECT` type.
+        next unless project_path.end_with?(type.path_suffix)
+
+        project, was_redirected = find_project(project_path.chomp(type.path_suffix))
+        redirected_path = project_path if was_redirected
+
+        # If we found a matching project, then the type was matched, no need to
+        # continue looking.
+        return [project, type, redirected_path] if project
       end
 
-      redirected_path = project_path if was_redirected
-
-      [project, wiki, redirected_path]
+      nil
     end
 
     def self.find_project(project_path)
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 265f6213a99..5d5a867c9ab 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -20,14 +20,14 @@ module Gitlab
     SECRET_LENGTH = 32
 
     class << self
-      def git_http_ok(repository, is_wiki, user, action, show_all_refs: false)
+      def git_http_ok(repository, repo_type, user, action, show_all_refs: false)
         raise "Unsupported action: #{action}" unless ALLOWED_GIT_HTTP_ACTIONS.include?(action.to_s)
 
         project = repository.project
 
         attrs = {
           GL_ID: Gitlab::GlId.gl_id(user),
-          GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki),
+          GL_REPOSITORY: repo_type.identifier_for_subject(project),
           GL_USERNAME: user&.username,
           ShowAllRefs: show_all_refs,
           Repository: repository.gitaly_repository.to_h,