From bb589c6fc85d08af049df1996c5552c7b57efb95 Mon Sep 17 00:00:00 2001 From: Jo Vandeginste Date: Thu, 5 Sep 2019 16:46:50 +0200 Subject: [PATCH] Show user info, remove some extraneous connection ids Signed-off-by: Jo Vandeginste --- sftpd/handler.go | 11 +++++------ sftpd/server.go | 6 ++++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/sftpd/handler.go b/sftpd/handler.go index 5ce02356..f0dc01ec 100644 --- a/sftpd/handler.go +++ b/sftpd/handler.go @@ -66,7 +66,7 @@ func (c Connection) Fileread(request *sftp.Request) (io.ReaderAt, error) { return nil, sftp.ErrSshFxFailure } - logger.Debug(logSender, c.ID, "fileread requested for path: %#v, user: %v", p, c.User.Username) + logger.Debug(logSender, c.ID, "fileread requested for path: %#v", p) transfer := Transfer{ file: file, @@ -141,7 +141,7 @@ func (c Connection) Filecmd(request *sftp.Request) error { return sftp.ErrSshFxOpUnsupported } - logger.Debug(logSender, c.ID, "new cmd, method: %v user: %v sourcePath: %#v, targetPath: %#v", request.Method, c.User.Username, + logger.Debug(logSender, c.ID, "new cmd, method: %v, sourcePath: %#v, targetPath: %#v", request.Method, p, target) switch request.Method { @@ -204,7 +204,7 @@ func (c Connection) Filelist(request *sftp.Request) (sftp.ListerAt, error) { return nil, sftp.ErrSshFxPermissionDenied } - logger.Debug(logSender, c.ID, "requested list file for dir: %#v user: %v", p, c.User.Username) + logger.Debug(logSender, c.ID, "requested list file for dir: %#v", p) files, err := ioutil.ReadDir(p) if err != nil { @@ -218,7 +218,7 @@ func (c Connection) Filelist(request *sftp.Request) (sftp.ListerAt, error) { return nil, sftp.ErrSshFxPermissionDenied } - logger.Debug(logSender, c.ID, "requested stat for file: %#v user: %v", p, c.User.Username) + logger.Debug(logSender, c.ID, "requested stat for file: %#v", p) s, err := os.Stat(p) if os.IsNotExist(err) { return nil, sftp.ErrSshFxNoSuchFile @@ -392,8 +392,7 @@ func (c Connection) handleSFTPUploadToExistingFile(pflags sftp.FileOpenFlags, re if osFlags&os.O_TRUNC == 0 { // see https://github.com/pkg/sftp/issues/295 - logger.Info(logSender, c.ID, "upload resume is not supported, returning error for file: %#v user: %v", requestPath, - c.User.Username) + logger.Info(logSender, c.ID, "upload resume is not supported, returning error for file: %#v", requestPath) return nil, sftp.ErrSshFxOpUnsupported } diff --git a/sftpd/server.go b/sftpd/server.go index bc7b4460..24e8439e 100644 --- a/sftpd/server.go +++ b/sftpd/server.go @@ -230,6 +230,8 @@ func (c Configuration) AcceptInboundConnection(conn net.Conn, config *ssh.Server lock: new(sync.Mutex), sshConn: sconn, } + logger.Info(logSender, connectionID, "User id: %d, name: %#v, home_dir: %#v", + user.ID, user.Username, user.HomeDir) go ssh.DiscardRequests(reqs) @@ -296,10 +298,10 @@ func (c Configuration) handleSftpConnection(channel io.ReadWriteCloser, connecti server := sftp.NewRequestServer(channel, handler) if err := server.Serve(); err == io.EOF { - logger.Debug(logSender, connection.ID, "connection closed, id: %v", connection.ID) + logger.Debug(logSender, connection.ID, "connection closed") server.Close() } else if err != nil { - logger.Error(logSender, connection.ID, "sftp connection closed with error id %v: %v", connection.ID, err) + logger.Error(logSender, connection.ID, "sftp connection closed with error: %v", err) } removeConnection(connection.ID)