Merge branch 'patch/refactor-post-receive' into 'master'
PostReceive refactor Back-ported PostReceive refactor made for https://gitlab.com/gitlab-org/gitlab-ee/issues/367 in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/267 See merge request !3264
This commit is contained in:
commit
69e966d9a5
|
@ -1,6 +1,5 @@
|
||||||
class PostReceive
|
class PostReceive
|
||||||
include Sidekiq::Worker
|
include Sidekiq::Worker
|
||||||
include Gitlab::Identifier
|
|
||||||
|
|
||||||
sidekiq_options queue: :post_receive
|
sidekiq_options queue: :post_receive
|
||||||
|
|
||||||
|
@ -11,51 +10,44 @@ class PostReceive
|
||||||
log("Check gitlab.yml config for correct gitlab_shell.repos_path variable. \"#{Gitlab.config.gitlab_shell.repos_path}\" does not match \"#{repo_path}\"")
|
log("Check gitlab.yml config for correct gitlab_shell.repos_path variable. \"#{Gitlab.config.gitlab_shell.repos_path}\" does not match \"#{repo_path}\"")
|
||||||
end
|
end
|
||||||
|
|
||||||
repo_path.gsub!(/\.git\z/, "")
|
post_received = Gitlab::GitPostReceive.new(repo_path, identifier, changes)
|
||||||
repo_path.gsub!(/\A\//, "")
|
|
||||||
|
|
||||||
project = Project.find_with_namespace(repo_path)
|
if post_received.project.nil?
|
||||||
|
|
||||||
if project.nil?
|
|
||||||
log("Triggered hook for non-existing project with full path \"#{repo_path} \"")
|
log("Triggered hook for non-existing project with full path \"#{repo_path} \"")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
changes = Base64.decode64(changes) unless changes.include?(" ")
|
if post_received.wiki?
|
||||||
changes = utf8_encode_changes(changes)
|
# Nothing defined here yet.
|
||||||
changes = changes.lines
|
elsif post_received.regular_project?
|
||||||
|
process_project_changes(post_received)
|
||||||
|
else
|
||||||
|
log("Triggered hook for unidentifiable repository type with full path \"#{repo_path} \"")
|
||||||
|
false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
changes.each do |change|
|
def process_project_changes(post_received)
|
||||||
|
post_received.changes.each do |change|
|
||||||
oldrev, newrev, ref = change.strip.split(' ')
|
oldrev, newrev, ref = change.strip.split(' ')
|
||||||
|
|
||||||
@user ||= identify(identifier, project, newrev)
|
@user ||= post_received.identify(newrev)
|
||||||
|
|
||||||
unless @user
|
unless @user
|
||||||
log("Triggered hook for non-existing user \"#{identifier} \"")
|
log("Triggered hook for non-existing user \"#{post_received.identifier} \"")
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
if Gitlab::Git.tag_ref?(ref)
|
if Gitlab::Git.tag_ref?(ref)
|
||||||
GitTagPushService.new.execute(project, @user, oldrev, newrev, ref)
|
GitTagPushService.new.execute(post_received.project, @user, oldrev, newrev, ref)
|
||||||
else
|
else
|
||||||
GitPushService.new(project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute
|
GitPushService.new(post_received.project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def utf8_encode_changes(changes)
|
private
|
||||||
changes = changes.dup
|
|
||||||
|
|
||||||
changes.force_encoding("UTF-8")
|
|
||||||
return changes if changes.valid_encoding?
|
|
||||||
|
|
||||||
# Convert non-UTF-8 branch/tag names to UTF-8 so they can be dumped as JSON.
|
|
||||||
detection = CharlockHolmes::EncodingDetector.detect(changes)
|
|
||||||
return changes unless detection && detection[:encoding]
|
|
||||||
|
|
||||||
CharlockHolmes::Converter.convert(changes, detection[:encoding], 'UTF-8')
|
|
||||||
end
|
|
||||||
|
|
||||||
def log(message)
|
def log(message)
|
||||||
Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
|
Gitlab::GitLogger.error("POST-RECEIVE: #{message}")
|
||||||
end
|
end
|
||||||
|
|
|
@ -0,0 +1,60 @@
|
||||||
|
module Gitlab
|
||||||
|
class GitPostReceive
|
||||||
|
include Gitlab::Identifier
|
||||||
|
attr_reader :repo_path, :identifier, :changes, :project
|
||||||
|
|
||||||
|
def initialize(repo_path, identifier, changes)
|
||||||
|
repo_path.gsub!(/\.git\z/, '')
|
||||||
|
repo_path.gsub!(/\A\//, '')
|
||||||
|
|
||||||
|
@repo_path = repo_path
|
||||||
|
@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)
|
||||||
|
super(identifier, project, revision)
|
||||||
|
end
|
||||||
|
|
||||||
|
private
|
||||||
|
|
||||||
|
def retrieve_project_and_type
|
||||||
|
@type = :project
|
||||||
|
@project = Project.find_with_namespace(@repo_path)
|
||||||
|
|
||||||
|
if @repo_path.end_with?('.wiki') && !@project
|
||||||
|
@type = :wiki
|
||||||
|
@project = Project.find_with_namespace(@repo_path.gsub(/\.wiki\z/, ''))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def deserialize_changes(changes)
|
||||||
|
changes = Base64.decode64(changes) unless changes.include?(' ')
|
||||||
|
changes = utf8_encode_changes(changes)
|
||||||
|
changes.lines
|
||||||
|
end
|
||||||
|
|
||||||
|
def utf8_encode_changes(changes)
|
||||||
|
changes = changes.dup
|
||||||
|
|
||||||
|
changes.force_encoding('UTF-8')
|
||||||
|
return changes if changes.valid_encoding?
|
||||||
|
|
||||||
|
# Convert non-UTF-8 branch/tag names to UTF-8 so they can be dumped as JSON.
|
||||||
|
detection = CharlockHolmes::EncodingDetector.detect(changes)
|
||||||
|
return changes unless detection && detection[:encoding]
|
||||||
|
|
||||||
|
CharlockHolmes::Converter.convert(changes, detection[:encoding], 'UTF-8')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue