Merge branch 'safe-rm-key' into 'master'

Prevent keys with a very specific comment from accidentally being deleted.

Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-shell/issues/32.

See merge request !11

CHANGELOG

+v2.6.3
+  - Prevent keys with a very specific comment from accidentally being deleted.
+
 v2.6.2
   - Include ecdsa keys in `gitlab_keys list-keys`.
   - Refactor logic around GL_ID

VERSION

-2.6.2
+2.6.3

lib/gitlab_keys.rb

@@ -71,8 +71,12 @@ class GitlabKeys
     $stdin
   end
 
+  def key_command(key_id)
+    "#{ROOT_PATH}/bin/gitlab-shell #{key_id}"
+  end
+
   def key_line(key_id, public_key)
-    auth_line = "command=\"#{ROOT_PATH}/bin/gitlab-shell #{key_id}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty #{public_key}"
+    auth_line = "command=\"#{key_command(key_id)}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty #{public_key}"
   end
 
   def rm_key
@@ -81,7 +85,7 @@ class GitlabKeys
       Tempfile.open('authorized_keys') do |temp|
         open(auth_file, 'r+') do |current|
           current.each do |line|
-            temp.puts(line) unless line.include?("/bin/gitlab-shell #{@key_id}\"")
+            temp.puts(line) unless line.start_with?("command=\"#{key_command(@key_id)}\"")
           end
         end
         temp.close