Commit 52491575 authored by Alejandro Rodríguez's avatar Alejandro Rodríguez

Allow gl-repository strings as project identifiers in PostReceive worker

parent c45341c8
...@@ -2,27 +2,24 @@ class PostReceive ...@@ -2,27 +2,24 @@ class PostReceive
include Sidekiq::Worker include Sidekiq::Worker
include DedicatedSidekiqQueue include DedicatedSidekiqQueue
def perform(repo_path, identifier, changes) def perform(project_identifier, identifier, changes)
repo_relative_path = Gitlab::RepoPath.strip_storage_path(repo_path) 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?(' ') changes = Base64.decode64(changes) unless changes.include?(' ')
# Use Sidekiq.logger so arguments can be correlated with execution # Use Sidekiq.logger so arguments can be correlated with execution
# time and thread ID's. # time and thread ID's.
Sidekiq.logger.info "changes: #{changes.inspect}" if ENV['SIDEKIQ_LOG_ARGUMENTS'] Sidekiq.logger.info "changes: #{changes.inspect}" if ENV['SIDEKIQ_LOG_ARGUMENTS']
post_received = Gitlab::GitPostReceive.new(repo_relative_path, identifier, changes) post_received = Gitlab::GitPostReceive.new(project, identifier, changes)
if post_received.project.nil?
log("Triggered hook for non-existing project with full path \"#{repo_relative_path}\"")
return false
end
if post_received.wiki? if is_wiki
# Nothing defined here yet. # Nothing defined here yet.
elsif post_received.regular_project?
process_project_changes(post_received)
else else
log("Triggered hook for unidentifiable repository type with full path \"#{repo_relative_path}\"") process_project_changes(post_received)
false
end end
end end
...@@ -47,6 +44,14 @@ class PostReceive ...@@ -47,6 +44,14 @@ class PostReceive
private 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) def log(message)
Gitlab::GitLogger.error("POST-RECEIVE: #{message}") Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
end end
......
module Gitlab module Gitlab
class GitPostReceive class GitPostReceive
include Gitlab::Identifier include Gitlab::Identifier
attr_reader :repo_path, :identifier, :changes, :project attr_reader :project, :identifier, :changes
def initialize(repo_path, identifier, changes) def initialize(project, identifier, changes)
repo_path.gsub!(/\.git\z/, '') @project = project
repo_path.gsub!(/\A\//, '')
@repo_path = repo_path
@identifier = identifier @identifier = identifier
@changes = deserialize_changes(changes) @changes = deserialize_changes(changes)
retrieve_project_and_type
end
def wiki?
@type == :wiki
end
def regular_project?
@type == :project
end end
def identify(revision) def identify(revision)
...@@ -28,16 +15,6 @@ module Gitlab ...@@ -28,16 +15,6 @@ module Gitlab
private 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) def deserialize_changes(changes)
changes = utf8_encode_changes(changes) changes = utf8_encode_changes(changes)
changes.lines changes.lines
......
...@@ -5,6 +5,7 @@ describe PostReceive do ...@@ -5,6 +5,7 @@ describe PostReceive do
let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") } let(:wrongly_encoded_changes) { changes.encode("ISO-8859-1").force_encoding("UTF-8") }
let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) } let(:base64_changes) { Base64.encode64(wrongly_encoded_changes) }
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
let(:project_identifier) { "project-#{project.id}" }
let(:key) { create(:key, user: project.owner) } let(:key) { create(:key, user: project.owner) }
let(:key_id) { key.shell_id } let(:key_id) { key.shell_id }
...@@ -14,6 +15,26 @@ describe PostReceive do ...@@ -14,6 +15,26 @@ describe PostReceive do
end end
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 describe "#process_project_changes" do
before do before do
allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner) allow_any_instance_of(Gitlab::GitPostReceive).to receive(:identify).and_return(project.owner)
...@@ -25,7 +46,7 @@ describe PostReceive do ...@@ -25,7 +46,7 @@ describe PostReceive do
it "calls GitTagPushService" do it "calls GitTagPushService" do
expect_any_instance_of(GitPushService).to receive(:execute).and_return(true) expect_any_instance_of(GitPushService).to receive(:execute).and_return(true)
expect_any_instance_of(GitTagPushService).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
end end
...@@ -35,7 +56,7 @@ describe PostReceive do ...@@ -35,7 +56,7 @@ describe PostReceive do
it "calls GitTagPushService" do it "calls GitTagPushService" do
expect_any_instance_of(GitPushService).not_to receive(:execute) expect_any_instance_of(GitPushService).not_to receive(:execute)
expect_any_instance_of(GitTagPushService).to receive(:execute).and_return(true) 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
end end
...@@ -45,12 +66,12 @@ describe PostReceive do ...@@ -45,12 +66,12 @@ describe PostReceive do
it "does not call any of the services" do it "does not call any of the services" do
expect_any_instance_of(GitPushService).not_to receive(:execute) expect_any_instance_of(GitPushService).not_to receive(:execute)
expect_any_instance_of(GitTagPushService).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
end end
context "gitlab-ci.yml" do 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 context "creates a Ci::Pipeline for every change" do
before do before do
...@@ -74,8 +95,8 @@ describe PostReceive do ...@@ -74,8 +95,8 @@ describe PostReceive do
context "webhook" do context "webhook" do
it "fetches the correct project" do it "fetches the correct project" do
expect(Project).to receive(:find_by_full_path).with(project.path_with_namespace).and_return(project) expect(Project).to receive(:find_by).with(id: project.id.to_s)
described_class.new.perform(pwd(project), key_id, base64_changes) described_class.new.perform(project_identifier, key_id, base64_changes)
end end
it "does not run if the author is not in the project" do it "does not run if the author is not in the project" do
...@@ -85,22 +106,22 @@ describe PostReceive do ...@@ -85,22 +106,22 @@ describe PostReceive do
expect(project).not_to receive(:execute_hooks) 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 end
it "asks the project to trigger all hooks" do 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_hooks).twice
expect(project).to receive(:execute_services).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 end
it "enqueues a UpdateMergeRequestsWorker job" do 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) 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
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment