From 8621be4f655ea222dd1f0063c8e65085f0b78caa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 07 Mar 2015 10:57:27 -0500
Subject: [PATCH] Restore tab conversion to 4 spaces in HTML diff output
---
src/main/java/com/gitblit/transport/ssh/SshKey.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshKey.java b/src/main/java/com/gitblit/transport/ssh/SshKey.java
index c2fc91c..9c99d1a 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshKey.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshKey.java
@@ -27,6 +27,7 @@
import com.gitblit.Constants.AccessPermission;
import com.gitblit.utils.StringUtils;
+import com.google.common.base.Joiner;
/**
* Class that encapsulates a public SSH key and it's metadata.
@@ -51,7 +52,8 @@
private AccessPermission permission;
public SshKey(String data) {
- this.rawData = data;
+ // strip out line breaks (issue-571)
+ this.rawData = Joiner.on("").join(data.replace("\r\n", "\n").split("\n"));
this.permission = AccessPermission.PUSH;
}
@@ -72,7 +74,7 @@
try {
publicKey = new Buffer(bin).getRawPublicKey();
} catch (SshException e) {
- e.printStackTrace();
+ throw new RuntimeException(e);
}
}
return publicKey;
--
Gitblit v1.9.1