From d500429a1d7a47da3bcd22880b53dce806ba9300 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:10 -0400
Subject: [PATCH] Refactored regex list command into a subclass
---
src/main/java/com/gitblit/transport/ssh/gitblit/KeysDispatcher.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/KeysDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/KeysDispatcher.java
index b8c18a0..3422f50 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/KeysDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/KeysDispatcher.java
@@ -142,10 +142,6 @@
IPublicKeyManager keyManager = getContext().getGitblit().getPublicKeyManager();
String username = getContext().getClient().getUsername();
List<SshKey> keys = keyManager.getKeys(username);
- if (keys == null || keys.isEmpty()) {
- stdout.println("You have not registered any public keys for ssh authentication.");
- return;
- }
if (showRaw) {
asRaw(keys);
@@ -156,6 +152,9 @@
/* output in the same format as authorized_keys */
protected void asRaw(List<SshKey> keys) {
+ if (keys == null) {
+ return;
+ }
for (SshKey key : keys) {
stdout.println(key.getRawData());
}
@@ -163,15 +162,16 @@
protected void asTable(List<SshKey> keys) {
String[] headers = { "#", "Fingerprint", "Comment", "Type" };
- String[][] data = new String[keys.size()][];
- for (int i = 0; i < keys.size(); i++) {
+ int len = keys == null ? 0 : keys.size();
+ String[][] data = new String[len][];
+ for (int i = 0; i < len; i++) {
// show 1-based index numbers with the fingerprint
// this is useful for comparing with "ssh-add -l"
SshKey k = keys.get(i);
data[i] = new String[] { "" + (i + 1), k.getFingerprint(), k.getComment(), k.getAlgorithm() };
}
- stdout.println(FlipTable.of(headers, data, Borders.BODY_COLS));
+ stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
}
}
}
--
Gitblit v1.9.1