From 12639c577f297687539283bf8877a5583ecb8447 Mon Sep 17 00:00:00 2001
From: Marios Andreopoulos <opensource@andmarios.com>
Date: Mon, 25 Aug 2014 18:54:50 +0300
Subject: [PATCH] Remove newline characters from ssh key before processing it.
 Fixes issue #370: https://github.com/gogits/gogs/issues/370

---
 routers/user/setting.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/routers/user/setting.go b/routers/user/setting.go
index e091bc438..21ff6df7c 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -171,7 +171,10 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
 			return
 		}
 
-		if ok, err := models.CheckPublicKeyString(form.Content); !ok {
+		// Remove newline characters from form.KeyContent
+		cleanKeyContent := strings.Replace(form.KeyContent, "\n", "", -1),
+
+		if ok, err := models.CheckPublicKeyString(cleanKeyContent); !ok {
 			ctx.Flash.Error(ctx.Tr("form.invalid_ssh_key", err.Error()))
 			ctx.Redirect("/user/settings/ssh")
 			return
@@ -180,7 +183,7 @@ func SettingsSSHKeysPost(ctx *middleware.Context, form auth.AddSSHKeyForm) {
 		k := &models.PublicKey{
 			OwnerId: ctx.User.Id,
 			Name:    form.SSHTitle,
-			Content: form.Content,
+			Content: cleanKeyContent,
 		}
 		if err := models.AddPublicKey(k); err != nil {
 			if err == models.ErrKeyAlreadyExist {