summaryrefslogtreecommitdiff
path: root/lib/gitlab_net.rb
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-03-29 13:32:17 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-03-29 13:32:17 +0000
commitfda23577b96bc1fcb50e0b6e7c41df729ece68dd (patch)
tree1aa59a1778b367d406de919d1e20dc5e3eb13b21 /lib/gitlab_net.rb
parent91e722550b40bbd8214e54a01b2183b27b95bde1 (diff)
parent38b8600f93ebe40eb9211051ef64b1013d053132 (diff)
downloadgitlab-shell-fda23577b96bc1fcb50e0b6e7c41df729ece68dd.tar.gz
Merge branch 'use-ssh-key-internal-api' into 'master'
Use ssh key internal api to build the authorized-keys command on openssh 6.9 See merge request !42
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r--lib/gitlab_net.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 71e113b..8b6d33b 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -56,6 +56,13 @@ class GitlabNet
get("#{host}/check", read_timeout: CHECK_TIMEOUT)
end
+ def authorized_key(key)
+ resp = get("#{host}/authorized_keys?key=#{URI.escape(key, '+/=')}")
+ JSON.parse(resp.body) if resp.code == "200"
+ rescue
+ nil
+ end
+
protected
def config