Merge pull request #1511 from steiler/srlsshkeys

SSH Keys on SRL improvement

nodes/srl/sshkey.go

@@ -1,6 +1,7 @@
 package srl
 
 import (
+	"bytes"
 	"fmt"
 	"strings"
 
@@ -12,29 +13,24 @@ import (
 // cli config command to set the ssh public keys
 // for users.
 func catenateKeys(in []ssh.PublicKey) string {
-	var keys string
-
-	for i, k := range in {
-		// marshall the publickey in authorizedKeys format
-		// and trim spaces (cause there will be a trailing newline)
-		ks := strings.TrimSpace(string(ssh.MarshalAuthorizedKey(k)))
-		// catenate all ssh keys into a single quoted string accepted in CLI
-		keys += fmt.Sprintf("%q", ks)
-		// only add a space after the key if it is not the last one
-		if i < len(in)-1 {
-			keys += " "
-		}
+	var keys strings.Builder
+	// iterate through keys
+	for _, k := range in {
+		// extract the keys in AuthorizedKeys format (e.g. "ssh-rsa <KEY>")
+		ks := bytes.TrimSpace(ssh.MarshalAuthorizedKey(k))
+		// add a seperator, leading quote, the key string and trailing quote
+		fmt.Fprintf(&keys, " \"%s\"", ks)
 	}
-
-	return keys
+	// return all but the first leading seperator of the string builders content as string
+	return keys.String()[1:]
 }
 
 // filterSSHPubKeys removes non-rsa keys from n.sshPubKeys until srl adds support for them.
 func (n *srl) filterSSHPubKeys() {
-	filteredKeys := []ssh.PublicKey{}
+	var filteredKeys []ssh.PublicKey
 
 	for _, k := range n.sshPubKeys {
-		if k.Type() == "ssh-rsa" {
+		if k.Type() == ssh.KeyAlgoRSA {
 			filteredKeys = append(filteredKeys, k)
 		}
 	}