Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stor…

…ed in different location

Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stor…
…ed in different location
Dmitriy Zaporozhets
1 parent 02e39563
Showing 3 changed files with 12 additions and 4 deletions Show diff stats
lib/gitlab/backend/shell.rb
lib/tasks/gitlab/check.rake
lib/tasks/gitlab/shell.rake
@@ -139,6 +139,15 @@ module Gitlab
       system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "rm-key", key_id, key_content
     end
  
+    # Remove all ssh keys from gitlab shell
+    #
+    # Ex.
+    #   remmove_all_keys
+    #
+    def remove_all_keys
+      system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "clear"
+    end
+
     # Add empty directory for storing repositories
     #
     # Ex.
@@ -657,7 +657,7 @@ namespace :gitlab do
   end
  
   def check_gitlab_shell
-    required_version = Gitlab::VersionInfo.new(1, 6, 0)
+    required_version = Gitlab::VersionInfo.new(1, 7, 0)
     current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
  
     print "GitLab Shell version >= #{required_version} ? ... "
@@ -25,15 +25,14 @@ namespace :gitlab do
   def setup
     warn_user_is_not_gitlab
  
-    gitlab_shell_authorized_keys = File.join(File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}"),'.ssh/authorized_keys')
     unless ENV['force'] == 'yes'
       puts "This will rebuild an authorized_keys file."
-      puts "You will lose any data stored in #{gitlab_shell_authorized_keys}."
+      puts "You will lose any data stored in authorized_keys file."
       ask_to_continue
       puts ""
     end
  
-    system("echo '# Managed by gitlab-shell' > #{gitlab_shell_authorized_keys}")
+    Gitlab::Shell.new.remove_all_keys
  
     Key.find_each(batch_size: 1000) do |key|
       if Gitlab::Shell.new.add_key(key.shell_id, key.key)
...	...	@@ -139,6 +139,15 @@ module Gitlab
139	139	system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "rm-key", key_id, key_content
140	140	end
141	141
	142	+ # Remove all ssh keys from gitlab shell
	143	+ #
	144	+ # Ex.
	145	+ # remmove_all_keys
	146	+ #
	147	+ def remove_all_keys
	148	+ system "#{gitlab_shell_user_home}/gitlab-shell/bin/gitlab-keys", "clear"
	149	+ end
	150	+
142	151	# Add empty directory for storing repositories
143	152	#
144	153	# Ex.
...	...
...	...	@@ -657,7 +657,7 @@ namespace :gitlab do
657	657	end
658	658
659	659	def check_gitlab_shell
660		- required_version = Gitlab::VersionInfo.new(1, 6, 0)
	660	+ required_version = Gitlab::VersionInfo.new(1, 7, 0)
661	661	current_version = Gitlab::VersionInfo.parse(gitlab_shell_version)
662	662
663	663	print "GitLab Shell version >= #{required_version} ? ... "
...	...
...	...	@@ -25,15 +25,14 @@ namespace :gitlab do
25	25	def setup
26	26	warn_user_is_not_gitlab
27	27
28		- gitlab_shell_authorized_keys = File.join(File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}"),'.ssh/authorized_keys')
29	28	unless ENV['force'] == 'yes'
30	29	puts "This will rebuild an authorized_keys file."
31		- puts "You will lose any data stored in #{gitlab_shell_authorized_keys}."
	30	+ puts "You will lose any data stored in authorized_keys file."
32	31	ask_to_continue
33	32	puts ""
34	33	end
35	34
36		- system("echo '# Managed by gitlab-shell' > #{gitlab_shell_authorized_keys}")
	35	+ Gitlab::Shell.new.remove_all_keys
37	36
38	37	Key.find_each(batch_size: 1000) do \|key\|
39	38	if Gitlab::Shell.new.add_key(key.shell_id, key.key)
...	...