waf: test the blacklist through the server's own wiring
No test fetched the blacklist through the server: the waf tests handed clients to the ban code directly, so a wrong key, threshold or URL in newReputation, or no Blacklisted at all, left every test green. Model: opus-5-5
This commit is contained in:
1 parent
20d069782e
commit
da6667957f
3 files changed
+60
-9
No files matched your search
@@ -1,6 +1,7 @@
|
|||||||
package waf_test
|
package waf_test
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"context"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/netip"
|
"net/netip"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -15,6 +16,36 @@ import (
|
|||||||
// blacklist lasts, in days.
|
// blacklist lasts, in days.
|
||||||
const abuseIPDBBanDays = "SWW_WAF_ABUSEIPDB_BAN_DAYS"
|
const abuseIPDBBanDays = "SWW_WAF_ABUSEIPDB_BAN_DAYS"
|
||||||
|
|
||||||
|
func TestClientOnTheFetchedAbuseIPDBBlacklistIsRefused(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
s, clk, server := startWithClock(t, "", map[string]string{
|
||||||
|
abuseIPDBKey: accountKey,
|
||||||
|
})
|
||||||
|
|
||||||
|
ctx, cancel := context.WithCancel(t.Context())
|
||||||
|
stopped := make(chan struct{})
|
||||||
|
|
||||||
|
go func() {
|
||||||
|
server.AbuseIPDB.RunBlacklist(ctx)
|
||||||
|
close(stopped)
|
||||||
|
}()
|
||||||
|
|
||||||
|
t.Cleanup(func() {
|
||||||
|
cancel()
|
||||||
|
<-stopped
|
||||||
|
})
|
||||||
|
|
||||||
|
waitUntil(func() bool {
|
||||||
|
active, _ := server.Ledger.Count(clk.Now())
|
||||||
|
|
||||||
|
return active == 1
|
||||||
|
})
|
||||||
|
|
||||||
|
s.get(client, http.StatusForbidden, requestlog.ActionTemporarilyBanned)
|
||||||
|
s.get(otherClient, http.StatusOK, requestlog.ActionForward)
|
||||||
|
}
|
||||||
|
|
||||||
func TestClientsOnTheAbuseIPDBBlacklistAreBannedForTheBanDays(t *testing.T) {
|
func TestClientsOnTheAbuseIPDBBlacklistAreBannedForTheBanDays(t *testing.T) {
|
||||||
t.Parallel()
|
t.Parallel()
|
||||||
|
|
||||||
|
|||||||
@@ -424,7 +424,8 @@ func startRProxy(
|
|||||||
// With no geojsURL, there is no stand-in for GeoJS to look clients up at, and
|
// With no geojsURL, there is no stand-in for GeoJS to look clients up at, and
|
||||||
// SWW_WAF_LOOKUP_SOURCE is off unless env sets it. While it is file, the lookup
|
// SWW_WAF_LOOKUP_SOURCE is off unless env sets it. While it is file, the lookup
|
||||||
// database SWW_WAF_LOOKUP_DB_PATH names is read. Clients are checked with AbuseIPDB
|
// database SWW_WAF_LOOKUP_DB_PATH names is read. Clients are checked with AbuseIPDB
|
||||||
// at abuseIPDBURL while env sets SWW_WAF_ABUSEIPDB_KEY.
|
// at abuseIPDBURL while env sets SWW_WAF_ABUSEIPDB_KEY, and its blacklist is
|
||||||
|
// fetched from abuseIPDBBlacklistURL.
|
||||||
// SWW_WAF_CORE_RULE_SET_MODE is off unless env sets it, so that only the tests of the
|
// SWW_WAF_CORE_RULE_SET_MODE is off unless env sets it, so that only the tests of the
|
||||||
// Core Rule Set have their requests inspected by it.
|
// Core Rule Set have their requests inspected by it.
|
||||||
func newWAF(
|
func newWAF(
|
||||||
@@ -510,6 +511,8 @@ func newWAFWith(
|
|||||||
Now: now,
|
Now: now,
|
||||||
Rules: ruleFiles,
|
Rules: ruleFiles,
|
||||||
Alerts: alertQueue,
|
Alerts: alertQueue,
|
||||||
|
|
||||||
|
AbuseIPDBBlacklistURL: abuseIPDBBlacklistURL,
|
||||||
})
|
})
|
||||||
|
|
||||||
// The race detector and a busy host can slow the Core Rule Set's
|
// The race detector and a busy host can slow the Core Rule Set's
|
||||||
|
|||||||
@@ -822,22 +822,39 @@ const abuseipdb = reputation.AbuseIPDBSource
|
|||||||
// through which AbuseIPDB is asked.
|
// through which AbuseIPDB is asked.
|
||||||
const abuseIPDBURL = "abuseipdb://stand-in/api/v2/check"
|
const abuseIPDBURL = "abuseipdb://stand-in/api/v2/check"
|
||||||
|
|
||||||
|
// abuseIPDBBlacklistURL is where newWAF has AbuseIPDB's blacklist fetched
|
||||||
|
// from: at abuseIPDBStandIn too.
|
||||||
|
const abuseIPDBBlacklistURL = "abuseipdb://stand-in/api/v2/blacklist"
|
||||||
|
|
||||||
// abuseIPDBStandIn is a stand-in for AbuseIPDB that gives every client the
|
// abuseIPDBStandIn is a stand-in for AbuseIPDB that gives every client the
|
||||||
// score 100, at once and without the network.
|
// score 100, at once and without the network. Its blacklist lists client
|
||||||
|
// alone, with the score 100, to a fetch with accountKey that asks for the
|
||||||
|
// clients scored 90 or more, the default threshold; it refuses any other
|
||||||
|
// fetch of it with 400.
|
||||||
type abuseIPDBStandIn struct{}
|
type abuseIPDBStandIn struct{}
|
||||||
|
|
||||||
// RoundTrip answers req with the score 100.
|
// RoundTrip answers req with the score 100, or with the blacklist.
|
||||||
func (abuseIPDBStandIn) RoundTrip(
|
func (abuseIPDBStandIn) RoundTrip(
|
||||||
req *http.Request,
|
req *http.Request,
|
||||||
) (*http.Response, error) {
|
) (*http.Response, error) {
|
||||||
|
status, body := http.StatusOK, `{"data":{"abuseConfidenceScore":100}}`
|
||||||
|
|
||||||
|
if req.URL.Path == "/api/v2/blacklist" {
|
||||||
|
body = `{"data":[{"ipAddress":"` + client +
|
||||||
|
`","abuseConfidenceScore":100}]}`
|
||||||
|
|
||||||
|
if req.Header.Get("Key") != accountKey ||
|
||||||
|
req.URL.RawQuery != "confidenceMinimum=90" {
|
||||||
|
status, body = http.StatusBadRequest, `{"errors":[]}`
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return &http.Response{
|
return &http.Response{
|
||||||
StatusCode: http.StatusOK,
|
StatusCode: status,
|
||||||
Status: "200 OK",
|
Status: fmt.Sprintf("%d %s", status, http.StatusText(status)),
|
||||||
Header: http.Header{},
|
Header: http.Header{},
|
||||||
Body: io.NopCloser(
|
Body: io.NopCloser(strings.NewReader(body)),
|
||||||
strings.NewReader(`{"data":{"abuseConfidenceScore":100}}`),
|
Request: req,
|
||||||
),
|
|
||||||
Request: req,
|
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user