summaryrefslogtreecommitdiff
path: root/lib/gitlab_projects.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-08-02 13:09:14 +0100
committerNick Thomas <nick@gitlab.com>2017-08-02 13:09:14 +0100
commita2258bafbcdb86d2da8454745f0bff037d8b4d11 (patch)
tree88a6b888195be0299797bbd77054979357c7c3f2 /lib/gitlab_projects.rb
parent09607d45510bdbd92358021eedf41968fd91129b (diff)
downloadgitlab-shell-a2258bafbcdb86d2da8454745f0bff037d8b4d11.tar.gz
Fix setting permissions of SSH key tempfiles
Diffstat (limited to 'lib/gitlab_projects.rb')
-rw-r--r--lib/gitlab_projects.rb13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
index a8f57a7..49a1d25 100644
--- a/lib/gitlab_projects.rb
+++ b/lib/gitlab_projects.rb
@@ -433,26 +433,29 @@ class GitlabProjects
options = {}
if ENV.key?('GITLAB_SHELL_SSH_KEY')
- key_file = Tempfile.new('gitlab-shell-key-file', mode: 0o400)
+ key_file = Tempfile.new('gitlab-shell-key-file')
+ key_file.chmod(0o400)
key_file.write(ENV['GITLAB_SHELL_SSH_KEY'])
key_file.close
options['IdentityFile'] = key_file.path
- options['IdentitiesOnly'] = true
+ options['IdentitiesOnly'] = 'yes'
end
if ENV.key?('GITLAB_SHELL_KNOWN_HOSTS')
- known_hosts_file = Tempfile.new('gitlab-shell-known-hosts', mode: 0o400)
+ known_hosts_file = Tempfile.new('gitlab-shell-known-hosts')
+ known_hosts_file.chmod(0o400)
known_hosts_file.write(ENV['GITLAB_SHELL_KNOWN_HOSTS'])
known_hosts_file.close
- options['StrictHostKeyChecking'] = true
+ options['StrictHostKeyChecking'] = 'yes'
options['UserKnownHostsFile'] = known_hosts_file.path
end
return yield({}) if options.empty?
- script = Tempfile.new('gitlab-shell-ssh-wrapper', mode: 0o755)
+ script = Tempfile.new('gitlab-shell-ssh-wrapper')
+ script.chmod(0o755)
script.write(custom_ssh_script(options))
script.close