Commit 2d59bd09 authored by Douwe Maan's avatar Douwe Maan

Include ecdsa keys in `gitlab_keys list-keys`.

parent fd677db7
v2.6.2
- Include ecdsa keys in `gitlab_keys list-keys`.
v2.6.1 v2.6.1
- Write errors to stderr to get git to abort and show them as such. - Write errors to stderr to get git to abort and show them as such.
......
...@@ -46,7 +46,7 @@ class GitlabKeys ...@@ -46,7 +46,7 @@ class GitlabKeys
# key_id & public_key # key_id & public_key
# command=".../bin/gitlab-shell key-741" ... ssh-rsa AAAAB3NzaDAxx2E\n # command=".../bin/gitlab-shell key-741" ... ssh-rsa AAAAB3NzaDAxx2E\n
# ^^^^^^^ ^^^^^^^^^^^^^^^ # ^^^^^^^ ^^^^^^^^^^^^^^^
matches = /^command=\".+?\s+(.+?)\".+?ssh-rsa\s(.+)\s*.*\n*$/.match(line) matches = /^command=\".+?\s+(.+?)\".+?(?:ssh|ecdsa)-.*?\s(.+)\s*.*\n*$/.match(line)
keys << "#{matches[1]} #{matches[2]}\n" unless matches.nil? keys << "#{matches[1]} #{matches[2]}\n" unless matches.nil?
end end
keys keys
......
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