Merge branch '29925-gitlab-shell-hooks-can-no-longer-send-absolute-paths-to-gitlab-ce' into 'master'

Generate and handle a gl_repository param to pass around components

Closes #29925

See merge request !10992

2 files changed, 26 insertions, 14 deletions

diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb
index 10adddb4636..9e4edcae101 100644
--- a/app/controllers/projects/git_http_controller.rb
+++ b/app/controllers/projects/git_http_controller.rb
@@ -59,7 +59,7 @@ class Projects::GitHttpController < Projects::GitHttpClientController
 
   def render_ok
     set_workhorse_internal_api_content_type
-    render json: Gitlab::Workhorse.git_http_ok(repository, user, action_name)
+    render json: Gitlab::Workhorse.git_http_ok(repository, wiki?, user, action_name)
   end
 
   def render_http_not_allowed
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 015a41b6e82..127d8dfbb61 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -2,27 +2,24 @@ class PostReceive
   include Sidekiq::Worker
   include DedicatedSidekiqQueue
 
-  def perform(repo_path, identifier, changes)
-    repo_relative_path = Gitlab::RepoPath.strip_storage_path(repo_path)
+  def perform(project_identifier, identifier, changes)
+    project, is_wiki = parse_project_identifier(project_identifier)
+
+    if project.nil?
+      log("Triggered hook for non-existing project with identifier \"#{project_identifier}\"")
+      return false
+    end
 
     changes = Base64.decode64(changes) unless changes.include?(' ')
     # Use Sidekiq.logger so arguments can be correlated with execution
     # time and thread ID's.
     Sidekiq.logger.info "changes: #{changes.inspect}" if ENV['SIDEKIQ_LOG_ARGUMENTS']
-    post_received = Gitlab::GitPostReceive.new(repo_relative_path, identifier, changes)
-
-    if post_received.project.nil?
-      log("Triggered hook for non-existing project with full path \"#{repo_relative_path}\"")
-      return false
-    end
+    post_received = Gitlab::GitPostReceive.new(project, identifier, changes)
 
-    if post_received.wiki?
+    if is_wiki
       # Nothing defined here yet.
-    elsif post_received.regular_project?
-      process_project_changes(post_received)
     else
-      log("Triggered hook for unidentifiable repository type with full path \"#{repo_relative_path}\"")
-      false
+      process_project_changes(post_received)
     end
   end
 
@@ -47,6 +44,21 @@ class PostReceive
 
   private
 
+  # To maintain backwards compatibility, we accept both gl_repository or
+  # repository paths as project identifiers. Our plan is to migrate to
+  # gl_repository only with the following plan:
+  # 9.2: Handle both possible values. Keep Gitlab-Shell sending only repo paths
+  # 9.3 (or patch release): Make GitLab Shell pass gl_repository if present
+  # 9.4 (or patch release): Make GitLab Shell always pass gl_repository
+  # 9.5 (or patch release): Handle only gl_repository as project identifier on this method
+  def parse_project_identifier(project_identifier)
+    if project_identifier.start_with?('/')
+      Gitlab::RepoPath.parse(project_identifier)
+    else
+      Gitlab::GlRepository.parse(project_identifier)
+    end
+  end
+
   def log(message)
     Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
   end