Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6df989e67 |
No files matched your search
@@ -12,6 +12,7 @@ require (
|
|||||||
github.com/oschwald/maxminddb-golang/v2 v2.7.0
|
github.com/oschwald/maxminddb-golang/v2 v2.7.0
|
||||||
github.com/prometheus/client_golang v1.24.1
|
github.com/prometheus/client_golang v1.24.1
|
||||||
github.com/spf13/viper v1.21.0
|
github.com/spf13/viper v1.21.0
|
||||||
|
golang.org/x/sys v0.48.0
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
@@ -47,7 +48,6 @@ require (
|
|||||||
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
|
||||||
golang.org/x/net v0.60.0 // indirect
|
golang.org/x/net v0.60.0 // indirect
|
||||||
golang.org/x/sync v0.23.0 // indirect
|
golang.org/x/sync v0.23.0 // indirect
|
||||||
golang.org/x/sys v0.48.0 // indirect
|
|
||||||
golang.org/x/text v0.42.0 // indirect
|
golang.org/x/text v0.42.0 // indirect
|
||||||
google.golang.org/protobuf v1.36.11 // indirect
|
google.golang.org/protobuf v1.36.11 // indirect
|
||||||
rsc.io/binaryregexp v0.2.0 // indirect
|
rsc.io/binaryregexp v0.2.0 // indirect
|
||||||
|
|||||||
@@ -5,12 +5,15 @@ import (
|
|||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
"net/netip"
|
"net/netip"
|
||||||
|
"runtime"
|
||||||
"slices"
|
"slices"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"golang.org/x/sys/unix"
|
||||||
|
|
||||||
"sneak.berlin/go/smallwebwaf/internal/coreruleset"
|
"sneak.berlin/go/smallwebwaf/internal/coreruleset"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -302,8 +305,24 @@ func worstCaseBodies() []visitorRequest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// inspectionTime returns how long crs takes to inspect tc, and fails t unless
|
// threadCPUTime returns the processor time the calling thread has used.
|
||||||
// it reads all of tc's body and Coraza parses it.
|
func threadCPUTime(t *testing.T) time.Duration {
|
||||||
|
t.Helper()
|
||||||
|
|
||||||
|
var now unix.Timespec
|
||||||
|
|
||||||
|
err := unix.ClockGettime(unix.CLOCK_THREAD_CPUTIME_ID, &now)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("read the thread's processor time: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return time.Duration(now.Nano())
|
||||||
|
}
|
||||||
|
|
||||||
|
// inspectionTime returns the processor time crs takes to inspect tc, and
|
||||||
|
// fails t unless it reads all of tc's body and Coraza parses it. Inspect does
|
||||||
|
// its work on the calling goroutine, which stays on one thread meanwhile, so
|
||||||
|
// that thread's processor time is the inspection's.
|
||||||
func inspectionTime(
|
func inspectionTime(
|
||||||
t *testing.T, crs *coreruleset.CoreRuleSet, tc visitorRequest,
|
t *testing.T, crs *coreruleset.CoreRuleSet, tc visitorRequest,
|
||||||
) time.Duration {
|
) time.Duration {
|
||||||
@@ -318,11 +337,14 @@ func inspectionTime(
|
|||||||
req.Header.Set("Content-Type", tc.contentType)
|
req.Header.Set("Content-Type", tc.contentType)
|
||||||
}
|
}
|
||||||
|
|
||||||
began := time.Now()
|
runtime.LockOSThread()
|
||||||
|
defer runtime.UnlockOSThread()
|
||||||
|
|
||||||
|
began := threadCPUTime(t)
|
||||||
result, read, _ := crs.Inspect(
|
result, read, _ := crs.Inspect(
|
||||||
req, netip.MustParseAddr("192.0.2.1"), strings.NewReader(tc.body),
|
req, netip.MustParseAddr("192.0.2.1"), strings.NewReader(tc.body),
|
||||||
)
|
)
|
||||||
took := time.Since(began)
|
took := threadCPUTime(t) - began
|
||||||
|
|
||||||
if string(read) != tc.body {
|
if string(read) != tc.body {
|
||||||
t.Errorf("read %d bytes of %d", len(read), len(tc.body))
|
t.Errorf("read %d bytes of %d", len(read), len(tc.body))
|
||||||
@@ -336,10 +358,12 @@ func inspectionTime(
|
|||||||
return took
|
return took
|
||||||
}
|
}
|
||||||
|
|
||||||
// TestTheCoreRuleSetInspectsEachWorstCaseRequestInTime runs one at a time, so
|
// TestTheCoreRuleSetInspectsEachWorstCaseRequestInTime measures processor
|
||||||
// that the tests running in parallel do not slow it. Other work on the host
|
// time, not time on the clock, so that the time other work on the host holds
|
||||||
// can still slow one try, so a request fails only when three tries in a row
|
// the processor does not count. It runs one at a time, so that the tests
|
||||||
// take too long.
|
// running in parallel do not slow it. Other work can still slow one try a
|
||||||
|
// little, by sharing the processor's caches, so a request fails only when
|
||||||
|
// three tries in a row take too long.
|
||||||
//
|
//
|
||||||
//nolint:paralleltest // one at a time, as above
|
//nolint:paralleltest // one at a time, as above
|
||||||
func TestTheCoreRuleSetInspectsEachWorstCaseRequestInTime(t *testing.T) {
|
func TestTheCoreRuleSetInspectsEachWorstCaseRequestInTime(t *testing.T) {
|
||||||
|
|||||||
@@ -1424,14 +1424,7 @@ func TestFiveFailedAsksKeepTheNextRequestFromAskingWAF(t *testing.T) {
|
|||||||
failure(w, r)
|
failure(w, r)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
nextID := make(chan string, 1)
|
app := startApp(t, greet)
|
||||||
app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
|
|
||||||
if answering.Load() {
|
|
||||||
nextID <- r.Header.Get(requestIDHeader)
|
|
||||||
}
|
|
||||||
|
|
||||||
greet(w, r)
|
|
||||||
})
|
|
||||||
addr, out := startRProxy(
|
addr, out := startRProxy(
|
||||||
t,
|
t,
|
||||||
standIn.URL,
|
standIn.URL,
|
||||||
@@ -1441,36 +1434,19 @@ func TestFiveFailedAsksKeepTheNextRequestFromAskingWAF(t *testing.T) {
|
|||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
// An ask can time out before it reaches the stand-in, so these
|
|
||||||
// may leave fewer than five questions, or leave some late.
|
|
||||||
for range 5 {
|
for range 5 {
|
||||||
wantGreeting(t, get(t, addr, "/"))
|
wantGreeting(t, get(t, addr, "/"))
|
||||||
}
|
standIn.question(t)
|
||||||
|
|
||||||
// rproxy writes this line before it answers a request it kept
|
|
||||||
// from asking waf, so no wait is needed.
|
|
||||||
if out.has("the circuit breaker is open") {
|
|
||||||
t.Error("the circuit breaker opened before five asks failed")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
answering.Store(true)
|
answering.Store(true)
|
||||||
wantGreeting(t, get(t, addr, "/"))
|
wantGreeting(t, get(t, addr, "/"))
|
||||||
out.waitFor(t, "the circuit breaker is open")
|
out.waitFor(t, "the circuit breaker is open")
|
||||||
|
|
||||||
// Had the next request asked waf, its question would have reached
|
|
||||||
// the stand-in before the request reached the app.
|
|
||||||
var id string
|
|
||||||
select {
|
select {
|
||||||
case id = <-nextID:
|
case <-standIn.questions:
|
||||||
default:
|
t.Error("waf was asked, want it not to be")
|
||||||
t.Fatal("the app did not get the next request")
|
case <-time.After(10 * pollInterval):
|
||||||
}
|
|
||||||
|
|
||||||
for len(standIn.questions) > 0 {
|
|
||||||
asked := <-standIn.questions
|
|
||||||
if asked.header.Get(requestIDHeader) == id {
|
|
||||||
t.Error("waf was asked, want it not to be")
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user