waf: each heuristic holds its own settings and parts (closes #441)
check / check (push) Failing after 2m18s
check / check (push) Failing after 2m18s
Every heuristic is a struct built once in newHandler with the settings and collaborators it reads; no check reads the handler. The six lists are handler fields built there. Code several heuristics share takes what it needs as arguments or lives on a struct they hold: banMaker for bans and their alerts, reputationHitNoter for reputation hits, biasedThresholds for limit percentages. The handler keeps blocklists, rateLimits, trapPaths, ruleFiles and coreRuleSet as fields too, since refusedWhateverTheAnswer and findBesideLookup use them. Model: opus-5-5
This commit is contained in:
1 parent
433d5cc0a9
commit
a46770ed58
27 files changed
+647
-334
No files matched your search
@@ -22,31 +22,42 @@ import (
|
||||
// an offence, and the request does not wait for the answer. The score is then
|
||||
// used for each address of the client. Its figures are the score and
|
||||
// SWW_WAF_ABUSEIPDB_MIN_SCORE.
|
||||
type abuseIPDB struct{}
|
||||
type abuseIPDB struct {
|
||||
abuseIPDB *reputation.AbuseIPDB
|
||||
// limiter is the table of clients the rate limits count, whose histories
|
||||
// say which clients are offenders.
|
||||
limiter *ratelimit.Limiter
|
||||
keySet bool // SWW_WAF_ABUSEIPDB_KEY is set
|
||||
minScore int64 // SWW_WAF_ABUSEIPDB_MIN_SCORE
|
||||
action config.ReputationAction // SWW_WAF_DNSBL_ABUSEIPDB_ACTION
|
||||
ipv6GroupPrefix int // SWW_WAF_IPV6_GROUP_PREFIX
|
||||
hitNoter reputationHitNoter
|
||||
}
|
||||
|
||||
func (abuseIPDB) name() string { return "abuseipdb" }
|
||||
|
||||
func (abuseIPDB) check(
|
||||
func (a abuseIPDB) check(
|
||||
ctx context.Context,
|
||||
rq *request,
|
||||
_ time.Time,
|
||||
) *verdict {
|
||||
if rq.h.config.AbuseIPDBKey == "" {
|
||||
if !a.keySet {
|
||||
return nil
|
||||
}
|
||||
|
||||
client := clientGroup(rq.h.config, rq.client)
|
||||
held, _ := rq.h.limiter.Client(client)
|
||||
client := clientGroup(a.ipv6GroupPrefix, rq.client)
|
||||
held, _ := a.limiter.Client(client)
|
||||
offender := held.History.Offences != ratelimit.Offences{}
|
||||
|
||||
score, hit := rq.h.abuseIPDB.Hit(ctx, client, rq.client, offender)
|
||||
score, hit := a.abuseIPDB.Hit(ctx, client, rq.client, offender)
|
||||
if !hit {
|
||||
return nil
|
||||
}
|
||||
|
||||
rq.abuseIPDBHit = true
|
||||
rq.addTag(config.AbuseIPDBTag)
|
||||
rq.noteHit(
|
||||
a.hitNoter.noteHit(
|
||||
rq,
|
||||
bans.ReputationHit{
|
||||
Source: reputation.AbuseIPDBSource,
|
||||
Score: &score,
|
||||
@@ -54,14 +65,14 @@ func (abuseIPDB) check(
|
||||
"scored by AbuseIPDB at or over SWW_WAF_ABUSEIPDB_MIN_SCORE",
|
||||
)
|
||||
|
||||
if rq.h.config.DNSBLAbuseIPDBAction != config.ReputationActionDeny {
|
||||
if a.action != config.ReputationActionDeny {
|
||||
return nil
|
||||
}
|
||||
|
||||
return &verdict{
|
||||
action: requestlog.ActionClientDenied,
|
||||
figures: map[string]any{
|
||||
figureScore: score, "min_score": rq.h.config.AbuseIPDBMinScore,
|
||||
figureScore: score, "min_score": a.minScore,
|
||||
},
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user