Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 23:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Show user info, remove some extraneous connection ids

Browse Source 
Signed-off-by: Jo Vandeginste <Jo.Vandeginste@kuleuven.be>
This commit is contained in:
Jo Vandeginste
2019-09-05 16:46:50 +02:00
committed by drakkan
parent 0737c672f5
commit bb589c6fc8
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sftpd/handler.go
View File

@@ -66,7 +66,7 @@ func (c Connection) Fileread(request *sftp.Request) (io.ReaderAt, error) {
return nil, sftp.ErrSshFxFailure 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{ transfer := Transfer{
file: file, file: file,
@@ -141,7 +141,7 @@ func (c Connection) Filecmd(request *sftp.Request) error {
return sftp.ErrSshFxOpUnsupported 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) p, target)
switch request.Method { switch request.Method {
@@ -204,7 +204,7 @@ func (c Connection) Filelist(request *sftp.Request) (sftp.ListerAt, error) {
return nil, sftp.ErrSshFxPermissionDenied 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) files, err := ioutil.ReadDir(p)
if err != nil { if err != nil {
@@ -218,7 +218,7 @@ func (c Connection) Filelist(request *sftp.Request) (sftp.ListerAt, error) {
return nil, sftp.ErrSshFxPermissionDenied 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) s, err := os.Stat(p)
if os.IsNotExist(err) { if os.IsNotExist(err) {
return nil, sftp.ErrSshFxNoSuchFile return nil, sftp.ErrSshFxNoSuchFile
@@ -392,8 +392,7 @@ func (c Connection) handleSFTPUploadToExistingFile(pflags sftp.FileOpenFlags, re
if osFlags&os.O_TRUNC == 0 { if osFlags&os.O_TRUNC == 0 {
// see https://github.com/pkg/sftp/issues/295 // 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, logger.Info(logSender, c.ID, "upload resume is not supported, returning error for file: %#v", requestPath)
c.User.Username)
return nil, sftp.ErrSshFxOpUnsupported return nil, sftp.ErrSshFxOpUnsupported
} }

6
sftpd/server.go
View File

@@ -230,6 +230,8 @@ func (c Configuration) AcceptInboundConnection(conn net.Conn, config *ssh.Server
lock: new(sync.Mutex), lock: new(sync.Mutex),
sshConn: sconn, sshConn: sconn,
} }
logger.Info(logSender, connectionID, "User id: %d, name: %#v, home_dir: %#v",
user.ID, user.Username, user.HomeDir)
go ssh.DiscardRequests(reqs) go ssh.DiscardRequests(reqs)
@@ -296,10 +298,10 @@ func (c Configuration) handleSftpConnection(channel io.ReadWriteCloser, connecti
server := sftp.NewRequestServer(channel, handler) server := sftp.NewRequestServer(channel, handler)
if err := server.Serve(); err == io.EOF { 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() server.Close()
} else if err != nil { } 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) removeConnection(connection.ID)