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

logger: add specific logs for failed attempts to initialize a connection

Browse Source 
This should allow for better integration in tools like fail2ban.

Hopefully fix #59
This commit is contained in:
Nicola Murino
2019-11-11 15:20:00 +01:00
parent 191da1ecaf
commit 4ff34b3e53
5 changed files with 79 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
logger/logger.go
View File

@@ -19,7 +19,7 @@ import (
)
const (
dateFormat = "2006-01-02T15:04.05.000" // YYYY-MM-DDTHH:MM.SS.ZZZ
dateFormat = "2006-01-02T15:04:05.000" // YYYY-MM-DDTHH:MM:SS.ZZZ
)
// LogLevel defines log levels.
@@ -61,7 +61,7 @@ func InitLogger(logFilePath string, logMaxSize int, logMaxBackups int, logMaxAge
lock: new(sync.Mutex)})
consoleLogger = zerolog.Nop()
}
logger = logger.With().Timestamp().Logger().Level(level)
logger.Level(level)
}
// DisableLogger disable the main logger.
@@ -97,22 +97,22 @@ func Log(level LogLevel, sender string, connectionID string, format string, v ..
// Debug logs at debug level for the specified sender
func Debug(sender string, connectionID string, format string, v ...interface{}) {
logger.Debug().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
logger.Debug().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
}
// Info logs at info level for the specified sender
func Info(sender string, connectionID string, format string, v ...interface{}) {
logger.Info().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
logger.Info().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
}
// Warn logs at warn level for the specified sender
func Warn(sender string, connectionID string, format string, v ...interface{}) {
logger.Warn().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
logger.Warn().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
}
// Error logs at error level for the specified sender
func Error(sender string, connectionID string, format string, v ...interface{}) {
logger.Error().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
logger.Error().Timestamp().Str("sender", sender).Str("connection_id", connectionID).Msg(fmt.Sprintf(format, v...))
}
// DebugToConsole logs at debug level to stdout
@@ -138,6 +138,7 @@ func ErrorToConsole(format string, v ...interface{}) {
// TransferLog logs an SFTP/SCP upload or download
func TransferLog(operation string, path string, elapsed int64, size int64, user string, connectionID string, protocol string) {
logger.Info().
Timestamp().
Str("sender", operation).
Int64("elapsed_ms", elapsed).
Int64("size_bytes", size).
@@ -151,6 +152,7 @@ func TransferLog(operation string, path string, elapsed int64, size int64, user
// CommandLog logs an SFTP/SCP command
func CommandLog(command string, path string, target string, user string, connectionID string, protocol string) {
logger.Info().
Timestamp().
Str("sender", command).
Str("username", user).
Str("file_path", path).
@@ -159,3 +161,18 @@ func CommandLog(command string, path string, target string, user string, connect
Str("protocol", protocol).
Msg("")
}
// ConnectionFailedLog logs failed attempts to initialize a connection.
// A connection can fail for an authentication error or other errors such as
// a client abort or a time out if the login does not happen in two minutes.
// These logs are useful for better integration with Fail2ban and similar tools.
func ConnectionFailedLog(user, ip, loginType, errorString string) {
logger.Debug().
Timestamp().
Str("sender", "connection_failed").
Str("host", ip).
Str("username", user).
Str("login_type", loginType).
Str("error", errorString).
Msg("")
}