github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

ssh pubkey parsing: prevent segfault

Browse Source 
Fixes an issue where the apiserver would segfault when parsing an ssh
public key that isn't PEM encoded.
This commit is contained in:
Mikkel Oscar Lyderik 2016-10-21 22:00:19 +02:00
parent 6bda989d54
commit 1b5aa2c09c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/ssh/ssh.go
View File

@ -277,6 +277,9 @@ func ParsePublicKeyFromFile(keyFile string) (*rsa.PublicKey, error) {
return nil, fmt.Errorf("error reading SSH key %s: '%v'", keyFile, err) return nil, fmt.Errorf("error reading SSH key %s: '%v'", keyFile, err)
} }
keyBlock, _ := pem.Decode(buffer) keyBlock, _ := pem.Decode(buffer)
if keyBlock == nil {
return nil, fmt.Errorf("error parsing SSH key %s: 'invalid PEM format'", keyFile)
}
key, err := x509.ParsePKIXPublicKey(keyBlock.Bytes) key, err := x509.ParsePKIXPublicKey(keyBlock.Bytes)
if err != nil { if err != nil {
return nil, fmt.Errorf("error parsing SSH key %s: '%v'", keyFile, err) return nil, fmt.Errorf("error parsing SSH key %s: '%v'", keyFile, err)