Adam Eijdenberg
7e9105388e
SSH host certificates are expected to contain hostnames only, not "host:port" format. This change allows Go clients to connect to OpenSSH servers that use host certificates. Note, this change will break any clients that use ssh.NewClientConn() with an `addr` that is not in `host:port` format (they will see a "missing port in address" error). Fixes bug 20273. Change-Id: I5a306c6b7b419a737e1f0f9c5ca8c585e21a45a4 Reviewed-on: https://go-review.googlesource.com/43475 Reviewed-by: Han-Wen Nienhuys <hanwen@google.com> Run-TryBot: Han-Wen Nienhuys <hanwen@google.com> TryBot-Result: Gobot Gobot <gobot@golang.org>
78 lines
2.0 KiB
Go
78 lines
2.0 KiB
Go
// Copyright 2014 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// +build darwin dragonfly freebsd linux netbsd openbsd
|
|
|
|
package test
|
|
|
|
import (
|
|
"bytes"
|
|
"crypto/rand"
|
|
"testing"
|
|
|
|
"golang.org/x/crypto/ssh"
|
|
)
|
|
|
|
// Test both logging in with a cert, and also that the certificate presented by an OpenSSH host can be validated correctly
|
|
func TestCertLogin(t *testing.T) {
|
|
s := newServer(t)
|
|
defer s.Shutdown()
|
|
|
|
// Use a key different from the default.
|
|
clientKey := testSigners["dsa"]
|
|
caAuthKey := testSigners["ecdsa"]
|
|
cert := &ssh.Certificate{
|
|
Key: clientKey.PublicKey(),
|
|
ValidPrincipals: []string{username()},
|
|
CertType: ssh.UserCert,
|
|
ValidBefore: ssh.CertTimeInfinity,
|
|
}
|
|
if err := cert.SignCert(rand.Reader, caAuthKey); err != nil {
|
|
t.Fatalf("SetSignature: %v", err)
|
|
}
|
|
|
|
certSigner, err := ssh.NewCertSigner(cert, clientKey)
|
|
if err != nil {
|
|
t.Fatalf("NewCertSigner: %v", err)
|
|
}
|
|
|
|
conf := &ssh.ClientConfig{
|
|
User: username(),
|
|
HostKeyCallback: (&ssh.CertChecker{
|
|
IsHostAuthority: func(pk ssh.PublicKey, addr string) bool {
|
|
return bytes.Equal(pk.Marshal(), testPublicKeys["ca"].Marshal())
|
|
},
|
|
}).CheckHostKey,
|
|
}
|
|
conf.Auth = append(conf.Auth, ssh.PublicKeys(certSigner))
|
|
|
|
for _, test := range []struct {
|
|
addr string
|
|
succeed bool
|
|
}{
|
|
{addr: "host.example.com:22", succeed: true},
|
|
{addr: "host.example.com:10000", succeed: true}, // non-standard port must be OK
|
|
{addr: "host.example.com", succeed: false}, // port must be specified
|
|
{addr: "host.ex4mple.com:22", succeed: false}, // wrong host
|
|
} {
|
|
client, err := s.TryDialWithAddr(conf, test.addr)
|
|
|
|
// Always close client if opened successfully
|
|
if err == nil {
|
|
client.Close()
|
|
}
|
|
|
|
// Now evaluate whether the test failed or passed
|
|
if test.succeed {
|
|
if err != nil {
|
|
t.Fatalf("TryDialWithAddr: %v", err)
|
|
}
|
|
} else {
|
|
if err == nil {
|
|
t.Fatalf("TryDialWithAddr, unexpected success")
|
|
}
|
|
}
|
|
}
|
|
}
|