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

allow IPs in defender safe list to exceed max per-host connections

Browse Source 
Signed-off-by: Nicola Murino <nicola.murino@gmail.com>
This commit is contained in:
Nicola Murino
2024-02-27 18:22:21 +01:00
parent 12f599fd65
commit 799fdd7098
9 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/common/common.go
View File

@@ -383,13 +383,14 @@ func GetDefenderScore(ip string) (int, error) {
return Config.defender.GetScore(ip)
}
// AddDefenderEvent adds the specified defender event for the given IP
func AddDefenderEvent(ip, protocol string, event HostEvent) {
// AddDefenderEvent adds the specified defender event for the given IP.
// Returns true if the IP is in the defender's safe list.
func AddDefenderEvent(ip, protocol string, event HostEvent) bool {
if Config.defender == nil {
return
return false
}
Config.defender.AddEvent(ip, protocol, event)
return Config.defender.AddEvent(ip, protocol, event)
}
func startPeriodicChecks(duration time.Duration, isShared int) {
@@ -1191,9 +1192,12 @@ func (conns *ActiveConnections) IsNewConnectionAllowed(ipAddr, protocol string)
if Config.MaxPerHostConnections > 0 {
if total := conns.clients.getTotalFrom(ipAddr); total > Config.MaxPerHostConnections {
logger.Info(logSender, "", "active connections from %s %d/%d", ipAddr, total, Config.MaxPerHostConnections)
AddDefenderEvent(ipAddr, protocol, HostEventLimitExceeded)
return ErrConnectionDenied
if !AddDefenderEvent(ipAddr, protocol, HostEventLimitExceeded) {
logger.Warn(logSender, "", "connection denied, active connections from IP %q: %d/%d",
ipAddr, total, Config.MaxPerHostConnections)
return ErrConnectionDenied
}
logger.Info(logSender, "", "active connections from safe IP %q: %d", ipAddr, total)
}
}