From c8ec0aaa7c2fac31330dbb110cce5da8e0f41be4 Mon Sep 17 00:00:00 2001 From: Dan Torczynski Date: Mon, 14 Mar 2022 13:16:07 -0700 Subject: [PATCH 1/2] always error --- managedserver.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/managedserver.go b/managedserver.go index 8d7a09bc..f0b9f628 100644 --- a/managedserver.go +++ b/managedserver.go @@ -105,6 +105,7 @@ func (m ManagedServer) Start(port int, rawPrivateKeys [][]byte, ciphers, macs [] MACs: macs, }, PasswordCallback: func(c ssh.ConnMetadata, pass []byte) (*ssh.Permissions, error) { + m.lg.InfoD("handshake-failure-username-password", meta{"username": c.User()}) driver = m.driverGenerator(LoginRequest{ Username: c.User(), Password: string(pass), @@ -117,6 +118,7 @@ func (m ManagedServer) Start(port int, rawPrivateKeys [][]byte, ciphers, macs [] return nil, nil }, PublicKeyCallback: func(c ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) { + m.lg.InfoD("handshake-failure-username-publickey", meta{"username": c.User()}) driver = m.driverGenerator(LoginRequest{ Username: c.User(), Password: "", From 932ecca0589ec60b60f2b29f4f3641746dd076c6 Mon Sep 17 00:00:00 2001 From: Dan Torczynski Date: Tue, 15 Mar 2022 11:19:19 -0700 Subject: [PATCH 2/2] log IP --- managedserver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/managedserver.go b/managedserver.go index f0b9f628..aeac529e 100644 --- a/managedserver.go +++ b/managedserver.go @@ -138,7 +138,7 @@ func (m ManagedServer) Start(port int, rawPrivateKeys [][]byte, ciphers, macs [] _, newChan, requestChan, err := ssh.NewServerConn(conn, config) if err != nil { if err != io.EOF { - m.errorAndAlert("handshake-failure", meta{"error": err.Error()}) + m.errorAndAlert("handshake-failure", meta{"error": err.Error(), "IP": conn.RemoteAddr()}) } return }