Commit bbe0e58a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'pre-receive-wo-satellites' into 'remove-satellites'

Add support of pre-receive hooks without satellites

Implement commit transaction with pre-receive and post-receive hooks for web editor and merge
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1154
parents 69c193e7 e02cff19
...@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0' ...@@ -38,7 +38,7 @@ gem "browser", '~> 0.8.0'
# Extracting information from a git repository # Extracting information from a git repository
# Provide access to Gitlab::Git library # Provide access to Gitlab::Git library
gem "gitlab_git", '~> 7.2.12' gem "gitlab_git", '~> 7.2.13'
# Ruby/Rack Git Smart-HTTP Server Handler # Ruby/Rack Git Smart-HTTP Server Handler
# GitLab fork with a lot of changes (improved thread-safety, better memory usage etc) # GitLab fork with a lot of changes (improved thread-safety, better memory usage etc)
......
...@@ -271,7 +271,7 @@ GEM ...@@ -271,7 +271,7 @@ GEM
mime-types (~> 1.19) mime-types (~> 1.19)
gitlab_emoji (0.1.0) gitlab_emoji (0.1.0)
gemojione (~> 2.0) gemojione (~> 2.0)
gitlab_git (7.2.12) gitlab_git (7.2.13)
activesupport (~> 4.0) activesupport (~> 4.0)
charlock_holmes (~> 0.6) charlock_holmes (~> 0.6)
gitlab-linguist (~> 3.0) gitlab-linguist (~> 3.0)
...@@ -783,7 +783,7 @@ DEPENDENCIES ...@@ -783,7 +783,7 @@ DEPENDENCIES
gitlab-grack (~> 2.0.2) gitlab-grack (~> 2.0.2)
gitlab-linguist (~> 3.0.1) gitlab-linguist (~> 3.0.1)
gitlab_emoji (~> 0.1) gitlab_emoji (~> 0.1)
gitlab_git (~> 7.2.12) gitlab_git (~> 7.2.13)
gitlab_meta (= 7.0) gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.1) gitlab_omniauth-ldap (= 1.2.1)
gollum-lib (~> 4.0.2) gollum-lib (~> 4.0.2)
...@@ -875,4 +875,4 @@ DEPENDENCIES ...@@ -875,4 +875,4 @@ DEPENDENCIES
wikicloth (= 0.8.1) wikicloth (= 0.8.1)
BUNDLED WITH BUNDLED WITH
1.10.4 1.10.6
require 'securerandom'
class Repository class Repository
class PreReceiveError < StandardError; end
class CommitError < StandardError; end
include Gitlab::ShellAdapter include Gitlab::ShellAdapter
attr_accessor :raw_repository, :path_with_namespace, :project attr_accessor :raw_repository, :path_with_namespace, :project
...@@ -364,7 +369,8 @@ class Repository ...@@ -364,7 +369,8 @@ class Repository
@root_ref ||= raw_repository.root_ref @root_ref ||= raw_repository.root_ref
end end
def commit_file(user, path, content, message, ref) def commit_file(user, path, content, message, branch)
commit_with_hooks(user, branch) do |ref|
path[0] = '' if path[0] == '/' path[0] = '' if path[0] == '/'
committer = user_to_comitter(user) committer = user_to_comitter(user)
...@@ -373,7 +379,7 @@ class Repository ...@@ -373,7 +379,7 @@ class Repository
options[:author] = committer options[:author] = committer
options[:commit] = { options[:commit] = {
message: message, message: message,
branch: ref branch: ref,
} }
options[:file] = { options[:file] = {
...@@ -383,8 +389,10 @@ class Repository ...@@ -383,8 +389,10 @@ class Repository
Gitlab::Git::Blob.commit(raw_repository, options) Gitlab::Git::Blob.commit(raw_repository, options)
end end
end
def remove_file(user, path, message, ref) def remove_file(user, path, message, branch)
commit_with_hooks(user, branch) do |ref|
path[0] = '' if path[0] == '/' path[0] = '' if path[0] == '/'
committer = user_to_comitter(user) committer = user_to_comitter(user)
...@@ -402,6 +410,7 @@ class Repository ...@@ -402,6 +410,7 @@ class Repository
Gitlab::Git::Blob.remove(raw_repository, options) Gitlab::Git::Blob.remove(raw_repository, options)
end end
end
def user_to_comitter(user) def user_to_comitter(user)
{ {
...@@ -422,7 +431,7 @@ class Repository ...@@ -422,7 +431,7 @@ class Repository
end end
end end
def merge(source_sha, target_branch, options = {}) def merge(user, source_sha, target_branch, options = {})
our_commit = rugged.branches[target_branch].target our_commit = rugged.branches[target_branch].target
their_commit = rugged.lookup(source_sha) their_commit = rugged.lookup(source_sha)
...@@ -432,14 +441,16 @@ class Repository ...@@ -432,14 +441,16 @@ class Repository
merge_index = rugged.merge_commits(our_commit, their_commit) merge_index = rugged.merge_commits(our_commit, their_commit)
return false if merge_index.conflicts? return false if merge_index.conflicts?
commit_with_hooks(user, target_branch) do |ref|
actual_options = options.merge( actual_options = options.merge(
parents: [our_commit, their_commit], parents: [our_commit, their_commit],
tree: merge_index.write_tree(rugged), tree: merge_index.write_tree(rugged),
update_ref: "refs/heads/#{target_branch}" update_ref: ref
) )
Rugged::Commit.create(rugged, actual_options) Rugged::Commit.create(rugged, actual_options)
end end
end
def search_files(query, ref) def search_files(query, ref)
offset = 2 offset = 2
...@@ -479,6 +490,59 @@ class Repository ...@@ -479,6 +490,59 @@ class Repository
Gitlab::Popen.popen(args, path_to_repo) Gitlab::Popen.popen(args, path_to_repo)
end end
def commit_with_hooks(current_user, branch)
oldrev = Gitlab::Git::BLANK_SHA
ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
gl_id = Gitlab::ShellEnv.gl_id(current_user)
was_empty = empty?
# Create temporary ref
random_string = SecureRandom.hex
tmp_ref = "refs/tmp/#{random_string}/head"
unless was_empty
oldrev = find_branch(branch).target
rugged.references.create(tmp_ref, oldrev)
end
# Make commit in tmp ref
newrev = yield(tmp_ref)
unless newrev
raise CommitError.new('Failed to create commit')
end
# Run GitLab pre-receive hook
pre_receive_hook = Gitlab::Git::Hook.new('pre-receive', path_to_repo)
status = pre_receive_hook.trigger(gl_id, oldrev, newrev, ref)
if status
if was_empty
# Create branch
rugged.references.create(ref, newrev)
else
# Update head
current_head = find_branch(branch).target
# Make sure target branch was not changed during pre-receive hook
if current_head == oldrev
rugged.references.update(ref, newrev)
else
raise CommitError.new('Commit was rejected because branch received new push')
end
end
# Run GitLab post receive hook
post_receive_hook = Gitlab::Git::Hook.new('post-receive', path_to_repo)
status = post_receive_hook.trigger(gl_id, oldrev, newrev, ref)
else
# Remove tmp ref and return error to user
rugged.references.delete(tmp_ref)
raise PreReceiveError.new('Commit was rejected by pre-receive hook')
end
end
private private
def cache def cache
......
...@@ -22,21 +22,16 @@ module Files ...@@ -22,21 +22,16 @@ module Files
end end
if sha = commit if sha = commit
after_commit(sha, @target_branch)
success success
else else
error("Something went wrong. Your changes were not committed") error("Something went wrong. Your changes were not committed")
end end
rescue ValidationError => ex rescue Repository::CommitError, Repository::PreReceiveError, ValidationError => ex
error(ex.message) error(ex.message)
end end
private private
def after_commit(sha, branch)
PostCommitService.new(project, current_user).execute(sha, branch)
end
def current_branch def current_branch
@current_branch ||= params[:current_branch] @current_branch ||= params[:current_branch]
end end
......
...@@ -17,7 +17,7 @@ module MergeRequests ...@@ -17,7 +17,7 @@ module MergeRequests
end end
merge_request.in_locked_state do merge_request.in_locked_state do
if merge_changes if commit
after_merge after_merge
success success
else else
...@@ -28,12 +28,6 @@ module MergeRequests ...@@ -28,12 +28,6 @@ module MergeRequests
private private
def merge_changes
if sha = commit
after_commit(sha, merge_request.target_branch)
end
end
def commit def commit
committer = repository.user_to_comitter(current_user) committer = repository.user_to_comitter(current_user)
...@@ -43,11 +37,7 @@ module MergeRequests ...@@ -43,11 +37,7 @@ module MergeRequests
committer: committer committer: committer
} }
repository.merge(merge_request.source_sha, merge_request.target_branch, options) repository.merge(current_user, merge_request.source_sha, merge_request.target_branch, options)
end
def after_commit(sha, branch)
PostCommitService.new(project, current_user).execute(sha, branch)
end end
def after_merge def after_merge
......
class PostCommitService < BaseService
include Gitlab::Popen
attr_reader :changes, :repo_path
def execute(sha, branch)
commit = repository.commit(sha)
full_ref = Gitlab::Git::BRANCH_REF_PREFIX + branch
old_sha = commit.parent_id || Gitlab::Git::BLANK_SHA
@changes = "#{old_sha} #{sha} #{full_ref}"
@repo_path = repository.path_to_repo
post_receive
end
private
def post_receive
hook = hook_file('post-receive', repo_path)
return true if hook.nil?
call_receive_hook(hook)
end
def call_receive_hook(hook)
# function will return true if succesful
exit_status = false
vars = {
'GL_ID' => Gitlab::ShellEnv.gl_id(current_user),
'PWD' => repo_path
}
options = {
chdir: repo_path
}
# we combine both stdout and stderr as we don't know what stream
# will be used by the custom hook
Open3.popen2e(vars, hook, options) do |stdin, stdout_stderr, wait_thr|
exit_status = true
stdin.sync = true
# in git, pre- and post- receive hooks may just exit without
# reading stdin. We catch the exception to avoid a broken pipe
# warning
begin
# inject all the changes as stdin to the hook
changes.lines do |line|
stdin.puts line
end
rescue Errno::EPIPE
end
# need to close stdin before reading stdout
stdin.close
# only output stdut_stderr if scripts doesn't return 0
unless wait_thr.value == 0
exit_status = false
end
end
exit_status
end
def hook_file(hook_type, repo_path)
hook_path = File.join(repo_path.strip, 'hooks')
hook_file = "#{hook_path}/#{hook_type}"
hook_file if File.exist?(hook_file)
end
end
...@@ -28,5 +28,9 @@ Spinach.hooks.before_run do ...@@ -28,5 +28,9 @@ Spinach.hooks.before_run do
RSpec::Mocks.setup RSpec::Mocks.setup
TestEnv.init(mailer: false) TestEnv.init(mailer: false)
# skip pre-receive hook check so we can use
# web editor and merge
TestEnv.disable_pre_receive
include FactoryGirl::Syntax::Methods include FactoryGirl::Syntax::Methods
end end
module Gitlab
module Git
class Hook
attr_reader :name, :repo_path, :path
def initialize(name, repo_path)
@name = name
@repo_path = repo_path
@path = File.join(repo_path.strip, 'hooks', name)
end
def exists?
File.exist?(path)
end
def trigger(gl_id, oldrev, newrev, ref)
return true unless exists?
changes = [oldrev, newrev, ref].join(" ")
# function will return true if succesful
exit_status = false
vars = {
'GL_ID' => gl_id,
'PWD' => repo_path
}
options = {
chdir: repo_path
}
Open3.popen2(vars, path, options) do |stdin, _, wait_thr|
exit_status = true
stdin.sync = true
# in git, pre- and post- receive hooks may just exit without
# reading stdin. We catch the exception to avoid a broken pipe
# warning
begin
# inject all the changes as stdin to the hook
changes.lines do |line|
stdin.puts line
end
rescue Errno::EPIPE
end
stdin.close
unless wait_thr.value == 0
exit_status = false
end
end
exit_status
end
end
end
end
...@@ -57,6 +57,10 @@ module TestEnv ...@@ -57,6 +57,10 @@ module TestEnv
and_call_original and_call_original
end end
def disable_pre_receive
allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return(true)
end
# Clean /tmp/tests # Clean /tmp/tests
# #
# Keeps gitlab-shell and gitlab-test # Keeps gitlab-shell and gitlab-test
......
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