commit c9afc9ed01dbc6b74ecb2734d2cd7ed943b5d643
author James Moger <james.moger@gitblit.com> Sat Mar 07 08:30:58 2015 -0600
committer James Moger <james.moger@gitblit.com> Sat Mar 07 08:30:58 2015 -0600
tree 51f0e05fd6d8135c4b9b187bd6761f8372f53343
parent 77f7a62b2d36fca3ca81e567bfce67217136a992
parent 8b70d52151e825e3711c2283861a919a14dc3a7b

Merged #245 "Strip line breaks from pasted SSH keys"

src/main/java/com/gitblit/transport/ssh/SshKey.java

diff --git a/src/main/java/com/gitblit/transport/ssh/SshKey.java b/src/main/java/com/gitblit/transport/ssh/SshKey.java
index ab44854..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;
 	}