diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-08-14 00:22:46 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-08-14 00:22:46 +0100 |
| commit | c8bf2e7d47c3b8f34cb79847edcd5dd50b8f280e (patch) | |
| tree | cc22dc6c91f58ccaadd97fdd816159de6ec8a135 /bin/authorized_keys | |
| parent | 764f6f47fa6a8698ae033532ae49875a87030518 (diff) | |
| download | gitlab-shell-c8bf2e7d47c3b8f34cb79847edcd5dd50b8f280e.tar.gz | |
Revert "Merge branch 'ash.mckenzie/srp-refactor' into 'master'"
This reverts commit 3aaf4751e09262c53544a1987f59b1308af9b6c1, reversing
changes made to c6577e0d75f51b017f2f332838b97c3ca5b497c0.
Diffstat (limited to 'bin/authorized_keys')
| -rwxr-xr-x | bin/authorized_keys | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/authorized_keys b/bin/authorized_keys index 24484f1..ca01646 100755 --- a/bin/authorized_keys +++ b/bin/authorized_keys @@ -10,16 +10,16 @@ # command="/bin/gitlab-shell key-#",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa AAAAB3NzaC1yc2EAAAADAQA... # -full_key = ARGV[0] -abort "# No key provided" if full_key.nil? || full_key.empty? +key = ARGV[0] +abort "# No key provided" if key.nil? || key.empty? require_relative "../lib/gitlab_init" require_relative "../lib/gitlab_net" require_relative "../lib/gitlab_keys" -authorized_key = GitlabNet.new.authorized_key(full_key) +authorized_key = GitlabNet.new.authorized_key(key) if authorized_key.nil? - puts "# No key was found for #{full_key}" + puts "# No key was found for #{key}" else - puts GitlabKeys.key_line("key-#{authorized_key['id']}", authorized_key['key']) + puts GitlabKeys.key_line("key-#{authorized_key['id']}", authorized_key["key"]) end |