From: Marios Andreopoulos <opensource@andmarios.com>
Date: Mon, 25 Aug 2014 15:54:50 +0000 (+0300)
Subject: Remove newline characters from ssh key before processing it.
X-Git-Tag: v0.9.99~1872^2~1^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=12639c577f297687539283bf8877a5583ecb8447;p=gitea.git

Remove newline characters from ssh key before processing it.
Fixes issue #370: https://github.com/gogits/gogs/issues/370
---

diff --git a/routers/user/setting.go b/routers/user/setting.go
index e091bc4381..21ff6df7c9 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 {