From bfa998a3d04e759be555dd8136aaa9450960a879 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 19:00:04 -0400
Subject: [PATCH] Documentation
---
src/main/java/com/gitblit/transport/ssh/gitblit/BaseKeyCommand.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/BaseKeyCommand.java b/src/main/java/com/gitblit/transport/ssh/gitblit/BaseKeyCommand.java
index 1b7bac1..56f2c35 100644
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/BaseKeyCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/BaseKeyCommand.java
@@ -22,6 +22,7 @@
import java.util.List;
import com.gitblit.transport.ssh.IPublicKeyManager;
+import com.gitblit.transport.ssh.SshKey;
import com.gitblit.transport.ssh.commands.SshCommand;
import com.google.common.base.Charsets;
@@ -35,7 +36,7 @@
protected List<String> readKeys(List<String> sshKeys)
throws UnsupportedEncodingException, IOException {
int idx = -1;
- if (sshKeys.isEmpty() || ((idx = sshKeys.indexOf("-")) >= 0)) {
+ if ((idx = sshKeys.indexOf("-")) >= 0) {
String sshKey = "";
BufferedReader br = new BufferedReader(new InputStreamReader(
in, Charsets.UTF_8));
@@ -53,6 +54,14 @@
}
protected IPublicKeyManager getKeyManager() {
- return ctx.getGitblit().getPublicKeyManager();
+ return getContext().getGitblit().getPublicKeyManager();
+ }
+
+ protected SshKey parseKey(String rawData) throws UnloggedFailure {
+ if (rawData.contains("PRIVATE")) {
+ throw new UnloggedFailure(1, "Please provide a PUBLIC key, not a PRIVATE key!");
+ }
+ SshKey key = new SshKey(rawData);
+ return key;
}
}
--
Gitblit v1.9.1