diff options
| -rwxr-xr-x | bin/gitlab-shell-authorized-keys-check | 2 | ||||
| -rwxr-xr-x | bin/gitlab-shell-authorized-principals-check | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/gitlab-shell-authorized-keys-check b/bin/gitlab-shell-authorized-keys-check index a46495a..b2cd24c 100755 --- a/bin/gitlab-shell-authorized-keys-check +++ b/bin/gitlab-shell-authorized-keys-check @@ -5,7 +5,7 @@ # command for a given ssh key fingerprint # # Ex. -# bin/gitlab-shell-authorized-keys-check <username> <public-key> +# bin/gitlab-shell-authorized-keys-check <expected-username> <actual-username> <public-key> # # Returns # command="/bin/gitlab-shell key-#",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty ssh-rsa AAAA... diff --git a/bin/gitlab-shell-authorized-principals-check b/bin/gitlab-shell-authorized-principals-check index 25ee612..4b39cac 100755 --- a/bin/gitlab-shell-authorized-principals-check +++ b/bin/gitlab-shell-authorized-principals-check @@ -6,7 +6,7 @@ # the right options. # # Ex. -# bin/gitlab-shell-authorized-keys-check <key-id> <principal1> [<principal2>...] +# bin/gitlab-shell-authorized-principals-check <key-id> <principal1> [<principal2>...] # # Returns one line per principal passed in, e.g.: # command="/bin/gitlab-shell username-{KEY_ID}",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty {PRINCIPAL} @@ -23,9 +23,9 @@ key_id = ARGV[0] abort '# No key_id provided' if key_id.nil? || key_id == '' principals = ARGV[1..-1] -principals.each { |principal| +principals.each do |principal| abort '# An invalid principal was provided' if principal.nil? || principal == '' -} +end require_relative '../lib/gitlab_init' require_relative '../lib/gitlab_net' |