Merge pull request #24506 from timstclair/ssh

Automatic merge from submit-queue Don't log private SSH key Log files may have more inclusive permissions than private SSH keys, and as such we should not log the key, even if it looks invalid. I accidentally leaked my key this way when posting e2e test logs.
kubernetes · Apr 20, 2016 · 4c9bbea · 4c9bbea · k8s-teamcity-mesosphere · Apr 20, 2016
2 parents 28f968a + df42b98
commit 4c9bbea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/ssh/ssh.go b/pkg/ssh/ssh.go
@@ -265,7 +265,7 @@ func MakePrivateKeySignerFromFile(key string) (ssh.Signer, error) {
 func MakePrivateKeySignerFromBytes(buffer []byte) (ssh.Signer, error) {
 	signer, err := ssh.ParsePrivateKey(buffer)
 	if err != nil {
-		return nil, fmt.Errorf("error parsing SSH key %s: '%v'", buffer, err)
+		return nil, fmt.Errorf("error parsing SSH key: '%v'", err)
 	}
 	return signer, nil
 }