Commit 33c8d487 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-shell into no-init-on-gcryptsetup

parents 979a6df4 57bc5729
v2.6.6 (unreleased)
- Do not clean LANG environment variable for the git hooks when working through the SSH-protocol
- Add git-lfs-authenticate command to white list (this command is used by git-lfs for SSO authentication through SSH-protocol)
v2.6.5
- Handle broken symlinks in create-hooks
v2.6.4 v2.6.4
- Remove keys from authorized_keys in-place - Remove keys from authorized_keys in-place
- Increase batch_add_keys lock timeout to 300 seconds - Increase batch_add_keys lock timeout to 300 seconds
......
...@@ -21,11 +21,19 @@ class GitlabProjects ...@@ -21,11 +21,19 @@ class GitlabProjects
def self.create_hooks(path) def self.create_hooks(path)
local_hooks_directory = File.join(path, 'hooks') local_hooks_directory = File.join(path, 'hooks')
real_local_hooks_directory = :not_found
begin
real_local_hooks_directory = File.realpath(local_hooks_directory)
rescue Errno::ENOENT
# real_local_hooks_directory == :not_found
end
if File.realpath(local_hooks_directory) != File.realpath(GLOBAL_HOOKS_DIRECTORY) if real_local_hooks_directory != File.realpath(GLOBAL_HOOKS_DIRECTORY)
$logger.info "Moving existing hooks directory and symlinking global hooks directory for #{path}." if File.exist?(local_hooks_directory)
FileUtils.mv(local_hooks_directory, "#{local_hooks_directory}.old.#{Time.now.to_i}") $logger.info "Moving existing hooks directory and symlinking global hooks directory for #{path}."
FileUtils.ln_s(GLOBAL_HOOKS_DIRECTORY, local_hooks_directory) FileUtils.mv(local_hooks_directory, "#{local_hooks_directory}.old.#{Time.now.to_i}")
end
FileUtils.ln_sf(GLOBAL_HOOKS_DIRECTORY, local_hooks_directory)
else else
$logger.info "Hooks already exist for #{path}." $logger.info "Hooks already exist for #{path}."
true true
......
...@@ -111,6 +111,8 @@ class GitlabShell ...@@ -111,6 +111,8 @@ class GitlabShell
$logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}." $logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}."
exec_cmd(*parsed_args) exec_cmd(*parsed_args)
elsif @git_cmd == 'git-lfs-authenticate'
exec_cmd(@origin_cmd)
else else
$logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}." $logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}."
exec_cmd(@git_cmd, repo_full_path) exec_cmd(@git_cmd, repo_full_path)
...@@ -122,6 +124,7 @@ class GitlabShell ...@@ -122,6 +124,7 @@ class GitlabShell
env = { env = {
'PATH' => ENV['PATH'], 'PATH' => ENV['PATH'],
'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'],
'LANG' => ENV['LANG'],
'GL_ID' => @key_id 'GL_ID' => @key_id
} }
......
...@@ -12,6 +12,51 @@ describe GitlabProjects do ...@@ -12,6 +12,51 @@ describe GitlabProjects do
FileUtils.rm_rf(tmp_repos_path) FileUtils.rm_rf(tmp_repos_path)
end end
describe :create_hooks do
let(:repo_path) { File.join(tmp_repos_path, 'hook-test.git') }
let(:hooks_dir) { File.join(repo_path, 'hooks') }
let(:target_hooks_dir) { File.join(ROOT_PATH, 'hooks') }
let(:existing_target) { File.join(repo_path, 'foobar') }
before do
FileUtils.rm_rf(repo_path)
FileUtils.mkdir_p(repo_path)
end
context 'hooks is a directory' do
let(:existing_file) { File.join(hooks_dir, 'my-file') }
before do
FileUtils.mkdir_p(hooks_dir)
FileUtils.touch(existing_file)
GitlabProjects.create_hooks(repo_path)
end
it { File.readlink(hooks_dir).should == target_hooks_dir }
it { Dir[File.join(repo_path, "hooks.old.*/my-file")].count.should == 1 }
end
context 'hooks is a valid symlink' do
before do
FileUtils.mkdir_p existing_target
File.symlink(existing_target, hooks_dir)
GitlabProjects.create_hooks(repo_path)
end
it { File.readlink(hooks_dir).should == target_hooks_dir }
end
context 'hooks is a broken symlink' do
before do
FileUtils.rm_f(existing_target)
File.symlink(existing_target, hooks_dir)
GitlabProjects.create_hooks(repo_path)
end
it { File.readlink(hooks_dir).should == target_hooks_dir }
end
end
describe :initialize do describe :initialize do
before do before do
argv('add-project', repo_name) argv('add-project', repo_name)
......
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