Allow gl-repository strings as project identifiers in PostReceive worker

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,14 @@ class PostReceive
 
   private
 
+  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

lib/gitlab/git_post_receive.rb

 module Gitlab
   class GitPostReceive
     include Gitlab::Identifier
-    attr_reader :repo_path, :identifier, :changes, :project
+    attr_reader :project, :identifier, :changes
 
-    def initialize(repo_path, identifier, changes)
-      repo_path.gsub!(/\.git\z/, '')
-      repo_path.gsub!(/\A\//, '')
-
-      @repo_path = repo_path
+    def initialize(project, identifier, changes)
+      @project = project
       @identifier = identifier
       @changes = deserialize_changes(changes)
-
-      retrieve_project_and_type
-    end
-
-    def wiki?
-      @type == :wiki
-    end
-
-    def regular_project?
-      @type == :project
     end
 
     def identify(revision)
@@ -28,16 +15,6 @@ module Gitlab
 
     private
 
-    def retrieve_project_and_type
-      @type = :project
-      @project = Project.find_by_full_path(@repo_path)
-
-      if @repo_path.end_with?('.wiki') && !@project
-        @type = :wiki
-        @project = Project.find_by_full_path(@repo_path.gsub(/\.wiki\z/, ''))
-      end
-    end
-
     def deserialize_changes(changes)
       changes = utf8_encode_changes(changes)
       changes.lines

spec/workers/post_receive_spec.rb

@@ -5,6 +5,7 @@ describe PostReceive do
   let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }
   let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
   let(:project) { create(:project, :repository) }
+  let(:project_identifier) { "project-#{project.id}" }
   let(:key) { create(:key, user: project.owner) }
   let(:key_id) { key.shell_id }
 
@@ -14,6 +15,26 @@ describe PostReceive do
     end
   end
 
+  context 'with a non-existing project' do
+    let(:project_identifier) { "project-123456789" }
+    let(:error_message) do
+      "Triggered hook for non-existing project with identifier \"#{project_identifier}\""
+    end
+
+    it "returns false and logs an error" do
+      expect(Gitlab::GitLogger).to receive(:error).with("POST-RECEIVE: #{error_message}")
+      expect(described_class.new.perform(project_identifier, key_id, base64_changes)).to be(false)
+    end
+  end
+
+  context "with an absolute path as the project identifier" do
+    it "searches the project by full path" do
+      expect(Project).to receive(:find_by_full_path).with(project.full_path).and_call_original
+
+      described_class.new.perform(pwd(project), key_id, base64_changes)
+    end
+  end
+
   describe "#process_project_changes" do
     before do
       allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
@@ -25,7 +46,7 @@ describe PostReceive do
       it "calls GitTagPushService" do
         expect_any_instance_of(GitPushService).to receive(:execute).and_return(true)
         expect_any_instance_of(GitTagPushService).not_to receive(:execute)
-        described_class.new.perform(pwd(project), key_id, base64_changes)
+        described_class.new.perform(project_identifier, key_id, base64_changes)
       end
     end
 
@@ -35,7 +56,7 @@ describe PostReceive do
       it "calls GitTagPushService" do
         expect_any_instance_of(GitPushService).not_to receive(:execute)
         expect_any_instance_of(GitTagPushService).to receive(:execute).and_return(true)
-        described_class.new.perform(pwd(project), key_id, base64_changes)
+        described_class.new.perform(project_identifier, key_id, base64_changes)
       end
     end
 
@@ -45,12 +66,12 @@ describe PostReceive do
       it "does not call any of the services" do
         expect_any_instance_of(GitPushService).not_to receive(:execute)
         expect_any_instance_of(GitTagPushService).not_to receive(:execute)
-        described_class.new.perform(pwd(project), key_id, base64_changes)
+        described_class.new.perform(project_identifier, key_id, base64_changes)
       end
     end
 
     context "gitlab-ci.yml" do
-      subject { described_class.new.perform(pwd(project), key_id, base64_changes) }
+      subject { described_class.new.perform(project_identifier, key_id, base64_changes) }
 
       context "creates a Ci::Pipeline for every change" do
         before do
@@ -74,8 +95,8 @@ describe PostReceive do
 
   context "webhook" do
     it "fetches the correct project" do
-      expect(Project).to receive(:find_by_full_path).with(project.path_with_namespace).and_return(project)
-      described_class.new.perform(pwd(project), key_id, base64_changes)
+      expect(Project).to receive(:find_by).with(id: project.id.to_s)
+      described_class.new.perform(project_identifier, key_id, base64_changes)
     end
 
     it "does not run if the author is not in the project" do
@@ -85,22 +106,22 @@ describe PostReceive do
 
       expect(project).not_to receive(:execute_hooks)
 
-      expect(described_class.new.perform(pwd(project), key_id, base64_changes)).to be_falsey
+      expect(described_class.new.perform(project_identifier, key_id, base64_changes)).to be_falsey
     end
 
     it "asks the project to trigger all hooks" do
-      allow(Project).to receive(:find_by_full_path).and_return(project)
+      allow(Project).to receive(:find_by).and_return(project)
       expect(project).to receive(:execute_hooks).twice
       expect(project).to receive(:execute_services).twice
 
-      described_class.new.perform(pwd(project), key_id, base64_changes)
+      described_class.new.perform(project_identifier, key_id, base64_changes)
     end
 
     it "enqueues a UpdateMergeRequestsWorker job" do
-      allow(Project).to receive(:find_by_full_path).and_return(project)
+      allow(Project).to receive(:find_by).and_return(project)
       expect(UpdateMergeRequestsWorker).to receive(:perform_async).with(project.id, project.owner.id, any_args)
 
-      described_class.new.perform(pwd(project), key_id, base64_changes)
+      described_class.new.perform(project_identifier, key_id, base64_changes)
     end
   end