diff options
author | Varac <varac@leap.se> | 2016-12-21 08:45:58 +0000 |
---|---|---|
committer | Varac <varac@leap.se> | 2016-12-21 08:45:58 +0000 |
commit | 4116559c43b36cf69dc128769cbae857c53f094f (patch) | |
tree | 09aa68188b268957fecfda1967b57614f1b315ee /lib/leap_cli/ssh | |
parent | 9dd91e45703e129838bdc491afceb183e4bbab02 (diff) | |
parent | e767aa460fc64a317551012f1781c2105c572158 (diff) |
Merge branch 'feature/sshkey-info' into 'master'
feature: add troubleshooting info to `leap user ls`
It is hard to get ssh key setup right. This change makes
it much easier to debug what the problem is.
See merge request !58
Diffstat (limited to 'lib/leap_cli/ssh')
-rw-r--r-- | lib/leap_cli/ssh/key.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/leap_cli/ssh/key.rb b/lib/leap_cli/ssh/key.rb index 76223b7e..108b6137 100644 --- a/lib/leap_cli/ssh/key.rb +++ b/lib/leap_cli/ssh/key.rb @@ -254,9 +254,9 @@ module LeapCli end if digest == "MD5" && encoding == :hex - return fp.scan(/../).join(':') + return fp.strip.scan(/../).join(':') else - return fp + return fp.strip end end @@ -267,11 +267,12 @@ module LeapCli Net::SSH::Buffer.from(:key, @key).to_s.split("\001\000").last.size * 8 end - def summary + def summary(type: :ssh, digest: :sha256, encoding: :hex) + fp = digest.to_s.upcase + ":" + self.fingerprint(type: type, digest: digest, encoding: encoding) if self.filename - "%s %s %s (%s)" % [self.type, self.bits, self.fingerprint, File.basename(self.filename)] + "%s %s %s (%s)" % [self.type, self.bits, fp, File.basename(self.filename)] else - "%s %s %s" % [self.type, self.bits, self.fingerprint] + "%s %s %s" % [self.type, self.bits, fp] end end |