From 3c24cb773f61b501719ed96a3a5e360507de4ea6 Mon Sep 17 00:00:00 2001 From: Nicola Murino Date: Mon, 29 Nov 2021 10:15:46 +0100 Subject: [PATCH] SFTP: log users connections at info level uniform SFTP and FTP logs Fixes #626 --- ftpd/server.go | 3 +-- sftpd/server.go | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ftpd/server.go b/ftpd/server.go index 4941512b..cecd0610 100644 --- a/ftpd/server.go +++ b/ftpd/server.go @@ -201,8 +201,7 @@ func (s *Server) AuthUser(cc ftpserver.ClientContext, username, password string) if err != nil { return nil, err } - connection.Log(logger.LevelInfo, "User id: %d, logged in with FTP, username: %#v, home_dir: %#v remote addr: %#v", - user.ID, user.Username, user.HomeDir, ipAddr) + connection.Log(logger.LevelInfo, "User %#v logged in with %#v from ip %#v", user.Username, loginMethod, ipAddr) dataprovider.UpdateLastLogin(&user) return connection, nil } diff --git a/sftpd/server.go b/sftpd/server.go index 6307ce96..2e98ab40 100644 --- a/sftpd/server.go +++ b/sftpd/server.go @@ -406,9 +406,9 @@ func (c *Configuration) AcceptInboundConnection(conn net.Conn, config *ssh.Serve defer user.CloseFs() //nolint:errcheck - logger.Log(logger.LevelDebug, common.ProtocolSSH, connectionID, - "User %#v, logged in with: %#v, from ip: %#v, client version %#v", - user.Username, loginType, ipAddr, string(sconn.ClientVersion())) + logger.Log(logger.LevelInfo, common.ProtocolSSH, connectionID, + "User %#v logged in with %#v, from ip %#v, client version %#v", user.Username, loginType, + ipAddr, string(sconn.ClientVersion())) dataprovider.UpdateLastLogin(&user) sshConnection := common.NewSSHConnection(connectionID, conn)