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

defender: fix GetHost for blocklist entries too

Browse Source
This commit is contained in:
Nicola Murino
2021-06-20 21:57:19 +02:00
parent ac8d8a3da1
commit e09bdd43d4
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/defender.go
View File

@@ -266,11 +266,13 @@ func (d *memoryDefender) GetHost(ip string) (*DefenderEntry, error) {
defer d.RUnlock() defer d.RUnlock()
if banTime, ok := d.banned[ip]; ok { if banTime, ok := d.banned[ip]; ok {
if banTime.After(time.Now()) {
return &DefenderEntry{ return &DefenderEntry{
IP: ip, IP: ip,
BanTime: banTime, BanTime: banTime,
}, nil }, nil
} }
}
if hs, ok := d.hosts[ip]; ok { if hs, ok := d.hosts[ip]; ok {
score := 0 score := 0

12
common/defender_test.go
View File

@@ -206,14 +206,14 @@ func TestExpiredHostBans(t *testing.T) {
assert.Len(t, res, 0) assert.Len(t, res, 0)
assert.False(t, defender.IsBanned(testIP)) assert.False(t, defender.IsBanned(testIP))
entry, err := defender.GetHost(testIP) _, err = defender.GetHost(testIP)
assert.NoError(t, err) assert.Error(t, err)
assert.Equal(t, testIP, entry.IP) _, ok := defender.banned[testIP]
assert.NotEmpty(t, entry.GetBanTime()) assert.True(t, ok)
// now add an event for an expired banned ip, it should be removed // now add an event for an expired banned ip, it should be removed
defender.AddEvent(testIP, HostEventLoginFailed) defender.AddEvent(testIP, HostEventLoginFailed)
assert.False(t, defender.IsBanned(testIP)) assert.False(t, defender.IsBanned(testIP))
entry, err = defender.GetHost(testIP) entry, err := defender.GetHost(testIP)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, testIP, entry.IP) assert.Equal(t, testIP, entry.IP)
assert.Empty(t, entry.GetBanTime()) assert.Empty(t, entry.GetBanTime())
@@ -248,7 +248,7 @@ func TestExpiredHostBans(t *testing.T) {
assert.Len(t, res, 0) assert.Len(t, res, 0)
_, err = defender.GetHost(testIP) _, err = defender.GetHost(testIP)
assert.Error(t, err) assert.Error(t, err)
_, ok := defender.hosts[testIP] _, ok = defender.hosts[testIP]
assert.True(t, ok) assert.True(t, ok)
} }