test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

Handle ssh key import better (#224) 

* Handle user ssh key input better

ssh_key: when user submitted keys had a newline at the end, strings.Split
would have created a slice with an empty last element, and the key type
check would be incorrect. Perhaps a better way is to look for 'ssh-rsa' or
'ssh-dsa' at the beginning of the string, but this is simple.

* ssh_key: correct indentation
This commit is contained in:
stroucki 2016-11-23 19:52:55 -05:00 committed by Lunny Xiao
parent cb1602840c
commit 3a3782bb7f
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/ssh_key.go
View File

@ -105,6 +105,8 @@ func extractTypeFromBase64Key(key string) (string, error) {
func parseKeyString(content string) (string, error) { func parseKeyString(content string) (string, error) {
// Transform all legal line endings to a single "\n". // Transform all legal line endings to a single "\n".
content = strings.NewReplacer("\r\n", "\n", "\r", "\n").Replace(content) content = strings.NewReplacer("\r\n", "\n", "\r", "\n").Replace(content)
// remove trailing newline (and beginning spaces too)
content = strings.TrimSpace(content)
lines := strings.Split(content, "\n") lines := strings.Split(content, "\n")
var keyType, keyContent, keyComment string var keyType, keyContent, keyComment string