From e544b57dbce2e14e7806b4101c3bdb134d4a5296 Mon Sep 17 00:00:00 2001 From: Boshi Lian Date: Tue, 8 Jan 2019 22:40:55 -0800 Subject: [PATCH] database test with pk --- sshpiperd/upstream/database/handler.go | 2 +- sshpiperd/upstream/database/handler_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sshpiperd/upstream/database/handler.go b/sshpiperd/upstream/database/handler.go index 95e18783..427668f8 100644 --- a/sshpiperd/upstream/database/handler.go +++ b/sshpiperd/upstream/database/handler.go @@ -31,7 +31,7 @@ func (p *plugin) findUpstream(conn ssh.ConnMetadata) (net.Conn, *ssh.AuthPipe, e if !d.Upstream.Server.IgnoreHostKey { - key, err := ssh.ParsePublicKey([]byte(d.Upstream.Server.HostKey.Key.Data)) + key, _, _, _, err := ssh.ParseAuthorizedKey([]byte(d.Upstream.Server.HostKey.Key.Data)) if err != nil { return nil, nil, err } diff --git a/sshpiperd/upstream/database/handler_test.go b/sshpiperd/upstream/database/handler_test.go index 17c3d52e..da0f1932 100644 --- a/sshpiperd/upstream/database/handler_test.go +++ b/sshpiperd/upstream/database/handler_test.go @@ -127,9 +127,9 @@ func TestFindUpstream(t *testing.T) { listener, err := createListener(t) defer listener.Close() - createEntry(t, db, "finddown0", "findup0", listener.Addr().String(), true) - createEntry(t, db, "finddown1", "findup1", listener.Addr().String(), true) - createEntry(t, db, "finddown2", "findup2", listener.Addr().String(), true) + createEntry(t, db, "finddown0", "findup0", listener.Addr().String(), false) + createEntry(t, db, "finddown1", "findup1", listener.Addr().String(), false) + createEntry(t, db, "finddown2", "findup2", listener.Addr().String(), false) _, auth, err := h(testconn{"finddown0"}) if err != nil { @@ -166,7 +166,7 @@ func TestPublicKeyCallback(t *testing.T) { listener, err := createListener(t) defer listener.Close() - pub, _ := createEntry(t, db, "pkdown", "pkdown", listener.Addr().String(), true) + pub, _ := createEntry(t, db, "pkdown", "pkdown", listener.Addr().String(), false) _, auth, err := h(testconn{"pkdown"}) if err != nil {