reputation: name a client on AbuseIPDB's blacklist BlacklistEntry
check / check (push) Failing after 3m48s
check / check (push) Failing after 3m48s
The type was named Listed, in a package whose DNSBL verdicts carry a field Listed and whose blocklists list clients too, so the name alone did not say which list it was on. Model: opus-5-5
This commit is contained in:
1 parent
da6667957f
commit
3060788ca3
6 files changed
+24
-18
No files matched your search
@@ -59,9 +59,9 @@ type ChecksSpent struct {
|
|||||||
Spent int
|
Spent int
|
||||||
}
|
}
|
||||||
|
|
||||||
// Listed is a client on AbuseIPDB's blacklist: its address and its abuse
|
// BlacklistEntry is a client on AbuseIPDB's blacklist: its address and its
|
||||||
// confidence score.
|
// abuse confidence score.
|
||||||
type Listed struct {
|
type BlacklistEntry struct {
|
||||||
Addr netip.Addr
|
Addr netip.Addr
|
||||||
Score int64
|
Score int64
|
||||||
}
|
}
|
||||||
@@ -90,7 +90,7 @@ type AbuseIPDBParams struct {
|
|||||||
BlacklistURL string
|
BlacklistURL string
|
||||||
Threshold int64
|
Threshold int64
|
||||||
BlacklistRefresh time.Duration
|
BlacklistRefresh time.Duration
|
||||||
Blacklisted func([]Listed)
|
Blacklisted func([]BlacklistEntry)
|
||||||
// Now tells the time, normally time.Now in UTC.
|
// Now tells the time, normally time.Now in UTC.
|
||||||
Now func() time.Time
|
Now func() time.Time
|
||||||
// ProcessLog receives each check or fetch of the blacklist that fails,
|
// ProcessLog receives each check or fetch of the blacklist that fails,
|
||||||
@@ -404,7 +404,9 @@ func (a *AbuseIPDB) ask(
|
|||||||
// Threshold or more, sending the key in the header Key. An answer other
|
// Threshold or more, sending the key in the header Key. An answer other
|
||||||
// than 200, one longer than maxListBytes or without the list, an entry
|
// than 200, one longer than maxListBytes or without the list, an entry
|
||||||
// whose address does not read, and none within fetchTimeout, fail.
|
// whose address does not read, and none within fetchTimeout, fail.
|
||||||
func (a *AbuseIPDB) fetchBlacklist(ctx context.Context) ([]Listed, error) {
|
func (a *AbuseIPDB) fetchBlacklist(
|
||||||
|
ctx context.Context,
|
||||||
|
) ([]BlacklistEntry, error) {
|
||||||
ctx, cancel := context.WithTimeout(ctx, fetchTimeout)
|
ctx, cancel := context.WithTimeout(ctx, fetchTimeout)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
@@ -447,7 +449,7 @@ func (a *AbuseIPDB) fetchBlacklist(ctx context.Context) ([]Listed, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// parseBlacklist reads body, AbuseIPDB's answer with its blacklist.
|
// parseBlacklist reads body, AbuseIPDB's answer with its blacklist.
|
||||||
func parseBlacklist(body []byte) ([]Listed, error) {
|
func parseBlacklist(body []byte) ([]BlacklistEntry, error) {
|
||||||
var answer struct {
|
var answer struct {
|
||||||
Data *[]struct {
|
Data *[]struct {
|
||||||
IPAddress string `json:"ipAddress"`
|
IPAddress string `json:"ipAddress"`
|
||||||
@@ -464,7 +466,7 @@ func parseBlacklist(body []byte) ([]Listed, error) {
|
|||||||
return nil, errNoBlacklist
|
return nil, errNoBlacklist
|
||||||
}
|
}
|
||||||
|
|
||||||
listed := make([]Listed, 0, len(*answer.Data))
|
listed := make([]BlacklistEntry, 0, len(*answer.Data))
|
||||||
|
|
||||||
for i, entry := range *answer.Data {
|
for i, entry := range *answer.Data {
|
||||||
addr, err := netip.ParseAddr(entry.IPAddress)
|
addr, err := netip.ParseAddr(entry.IPAddress)
|
||||||
@@ -478,7 +480,7 @@ func parseBlacklist(body []byte) ([]Listed, error) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
listed = append(listed, Listed{
|
listed = append(listed, BlacklistEntry{
|
||||||
Addr: addr.Unmap(), Score: entry.AbuseConfidenceScore,
|
Addr: addr.Unmap(), Score: entry.AbuseConfidenceScore,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ func TestBlacklistIsFetchedAtOnceAndEveryRefresh(t *testing.T) {
|
|||||||
`{"ipAddress":"2001:db8::9","abuseConfidenceScore":90}]}`}
|
`{"ipAddress":"2001:db8::9","abuseConfidenceScore":90}]}`}
|
||||||
got := runBlacklist(t, abuseIPDB, key, newQueue())
|
got := runBlacklist(t, abuseIPDB, key, newQueue())
|
||||||
|
|
||||||
want := []reputation.Listed{
|
want := []reputation.BlacklistEntry{
|
||||||
{Addr: netip.MustParseAddr("203.0.113.9"), Score: 100},
|
{Addr: netip.MustParseAddr("203.0.113.9"), Score: 100},
|
||||||
{Addr: netip.MustParseAddr("198.51.100.7"), Score: 95},
|
{Addr: netip.MustParseAddr("198.51.100.7"), Score: 95},
|
||||||
{Addr: netip.MustParseAddr("2001:db8::9"), Score: 90},
|
{Addr: netip.MustParseAddr("2001:db8::9"), Score: 90},
|
||||||
@@ -123,7 +123,7 @@ func TestFailedBlacklistFetchIsAlertedAndTriedAgainAtTheNextRefresh(
|
|||||||
abuseIPDB.answer(`{"data":[]}`)
|
abuseIPDB.answer(`{"data":[]}`)
|
||||||
time.Sleep(time.Hour)
|
time.Sleep(time.Hour)
|
||||||
synctest.Wait()
|
synctest.Wait()
|
||||||
got.want(t, []reputation.Listed{})
|
got.want(t, []reputation.BlacklistEntry{})
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -190,11 +190,14 @@ func (s *blacklistStandIn) answer(body string) {
|
|||||||
// blacklisted holds the clients on each blacklist given to Blacklisted.
|
// blacklisted holds the clients on each blacklist given to Blacklisted.
|
||||||
type blacklisted struct {
|
type blacklisted struct {
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
fetched [][]reputation.Listed
|
fetched [][]reputation.BlacklistEntry
|
||||||
}
|
}
|
||||||
|
|
||||||
// want checks the clients on each blacklist given so far.
|
// want checks the clients on each blacklist given so far.
|
||||||
func (b *blacklisted) want(t *testing.T, want ...[]reputation.Listed) {
|
func (b *blacklisted) want(
|
||||||
|
t *testing.T,
|
||||||
|
want ...[]reputation.BlacklistEntry,
|
||||||
|
) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
b.mu.Lock()
|
b.mu.Lock()
|
||||||
@@ -222,7 +225,7 @@ func runBlacklist(
|
|||||||
p.Threshold = 90
|
p.Threshold = 90
|
||||||
p.BlacklistRefresh = time.Hour
|
p.BlacklistRefresh = time.Hour
|
||||||
p.Alerts = queue
|
p.Alerts = queue
|
||||||
p.Blacklisted = func(listed []reputation.Listed) {
|
p.Blacklisted = func(listed []reputation.BlacklistEntry) {
|
||||||
got.mu.Lock()
|
got.mu.Lock()
|
||||||
defer got.mu.Unlock()
|
defer got.mu.Unlock()
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import (
|
|||||||
// BanForAbuseIPDB describes, and logs how many clients were listed and how
|
// BanForAbuseIPDB describes, and logs how many clients were listed and how
|
||||||
// many bans were made. Clients in one netblock make one ban, with the
|
// many bans were made. Clients in one netblock make one ban, with the
|
||||||
// highest of their scores. In observe mode it makes no ban.
|
// highest of their scores. In observe mode it makes no ban.
|
||||||
func (h *handler) banAbuseIPDBBlacklist(listed []reputation.Listed) {
|
func (h *handler) banAbuseIPDBBlacklist(listed []reputation.BlacklistEntry) {
|
||||||
scores := make(map[netip.Prefix]int64, len(listed))
|
scores := make(map[netip.Prefix]int64, len(listed))
|
||||||
|
|
||||||
for _, client := range listed {
|
for _, client := range listed {
|
||||||
|
|||||||
@@ -54,7 +54,7 @@ func TestClientsOnTheAbuseIPDBBlacklistAreBannedForTheBanDays(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// Two clients in one netblock make one ban, with the higher score.
|
// Two clients in one netblock make one ban, with the higher score.
|
||||||
server.BanAbuseIPDBBlacklist([]reputation.Listed{
|
server.BanAbuseIPDBBlacklist([]reputation.BlacklistEntry{
|
||||||
{Addr: netip.MustParseAddr(client), Score: 95},
|
{Addr: netip.MustParseAddr(client), Score: 95},
|
||||||
{Addr: netip.MustParseAddr(otherClient), Score: 100},
|
{Addr: netip.MustParseAddr(otherClient), Score: 100},
|
||||||
{Addr: netip.MustParseAddr("2001:db8:5::1"), Score: 90},
|
{Addr: netip.MustParseAddr("2001:db8:5::1"), Score: 90},
|
||||||
@@ -88,7 +88,7 @@ func TestAbuseIPDBBlacklistMakesNoBanInObserveMode(t *testing.T) {
|
|||||||
map[string]string{mode: "observe"},
|
map[string]string{mode: "observe"},
|
||||||
)
|
)
|
||||||
|
|
||||||
server.BanAbuseIPDBBlacklist([]reputation.Listed{
|
server.BanAbuseIPDBBlacklist([]reputation.BlacklistEntry{
|
||||||
{Addr: netip.MustParseAddr(client), Score: 100},
|
{Addr: netip.MustParseAddr(client), Score: 100},
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ func (s *Server) SetBesideLookupTimeLimit(limit time.Duration) {
|
|||||||
|
|
||||||
// BanAbuseIPDBBlacklist does on s what a fetch of AbuseIPDB's blacklist with
|
// BanAbuseIPDBBlacklist does on s what a fetch of AbuseIPDB's blacklist with
|
||||||
// the clients on listed does.
|
// the clients on listed does.
|
||||||
func (s *Server) BanAbuseIPDBBlacklist(listed []reputation.Listed) {
|
func (s *Server) BanAbuseIPDBBlacklist(listed []reputation.BlacklistEntry) {
|
||||||
h := s.Handler.(*handler) //nolint:forcetypeassert // New makes it one
|
h := s.Handler.(*handler) //nolint:forcetypeassert // New makes it one
|
||||||
h.banAbuseIPDBBlacklist(listed)
|
h.banAbuseIPDBBlacklist(listed)
|
||||||
}
|
}
|
||||||
@@ -206,7 +206,8 @@ func newHandler(params Params) *handler {
|
|||||||
// m, AbuseIPDB's while SWW_WAF_ABUSEIPDB_KEY is set. blacklisted receives
|
// m, AbuseIPDB's while SWW_WAF_ABUSEIPDB_KEY is set. blacklisted receives
|
||||||
// the clients on each AbuseIPDB blacklist fetched.
|
// the clients on each AbuseIPDB blacklist fetched.
|
||||||
func newReputation(
|
func newReputation(
|
||||||
params Params, m *metrics.Metrics, blacklisted func([]reputation.Listed),
|
params Params, m *metrics.Metrics,
|
||||||
|
blacklisted func([]reputation.BlacklistEntry),
|
||||||
) (*reputation.Lists, *reputation.DNSBL, *reputation.AbuseIPDB) {
|
) (*reputation.Lists, *reputation.DNSBL, *reputation.AbuseIPDB) {
|
||||||
cfg := params.Config
|
cfg := params.Config
|
||||||
lists := reputation.New(reputation.Params{
|
lists := reputation.New(reputation.Params{
|
||||||
|
|||||||
Reference in new issue
Block a user