rproxy and servewaf replace the one-process smallwebwaf (closes #172, closes #165)

`smallwebwaf` with no command now prints the commands and exits with status 2.
The image runs rproxy, or servewaf with SMALLWEBWAF_COMMAND=servewaf. The
passing-on code, its settings and its log fields and metric go. internal/proxy
keeps the checks, answers, reports and own endpoints; its tests run through the
real rproxy. The documents describe the pair.

Judgement call: clients.json keeps token_refused, since state files refuse unknown fields.
Deviation: script/gitea-requests sets SWWAF_LOG_REQUEST_HEADERS, to label requests.

Model: opus-5-5

internal/proxy/bans.go

@@ -58,13 +58,12 @@ func (rq *request) limitBroken(now time.Time) bool {
 }
 
 // countBytes counts the request's bytes, as countedBytes gives them, for
-// the byte limits, once its response has ended, and notes the client's
-// byte totals for the log line; its requests stay there as the rate limits
-// counted them. Only a request passed to the app has them counted, and
-// only one the rate limits counted; in observe mode, not one that enforce
-// mode would have refused. Bytes that take the client over a byte limit,
-// as its limit percentage for the byte limits lowers it, break it; the
-// response was passed on whole.
+// the byte limits, once its report has come, and notes the client's byte totals
+// for the log line; its requests stay there as the rate limits counted them.
+// Only an allowed request has them counted, and only one the rate limits
+// counted; in observe mode, not one that enforce mode would have refused. Bytes
+// that take the client over a byte limit, as its limit percentage for the byte
+// limits lowers it, break it; the response was passed on whole.
 func (rq *request) countBytes() {
 	if !rq.counted || rq.line.WouldAction != "" {
 		return
@@ -84,9 +83,8 @@ func (rq *request) countBytes() {
 }
 
 // countRefusal counts the request for the error burst once it has been
-// answered, if smallwebwaf refused it after a rule file match, a trap path
-// or a Core Rule Set match, or for a missing or wrong token, and in
-// observe mode if enforce mode would have: more than
+// answered, if servewaf refused it after a rule file match, a trap path or a
+// Core Rule Set match, and in observe mode if enforce mode would have: more than
 // SWWAF_ERROR_BURST_THRESHOLD such refusals of the client within a minute
 // break a limit. A client in SWWAF_ALLOW_NETS, which the checks skip, is
 // not counted, and nothing is while the threshold is off.
@@ -96,11 +94,7 @@ func (rq *request) countRefusal() {
 		return
 	}
 
-	// In observe mode, a request that enforce mode would have refused
-	// before it reached the endpoint has had no token refused there.
-	tokenRefused := rq.tokenRefused && rq.line.WouldAction == "" &&
-		!isInside(rq.client, cfg.AllowNets)
-	if !rq.attack && !rq.ruleBlocked && !rq.wafBlocked && !tokenRefused {
+	if !rq.attack && !rq.ruleBlocked && !rq.wafBlocked {
 		return
 	}
 
@@ -127,16 +121,9 @@ func (rq *request) countRefusal() {
 
 // countedBytes returns the request's bytes, once it has ended, as the
 // byte limits and the anomaly thresholds count them: the response's body
-// bytes, the request's, or both, as SWWAF_BYTES_COUNT says. For an
-// upgraded connection, such as a WebSocket, which has closed by then, what
-// it carried from the app counts with the response's and what it carried
-// from the client with the request's.
+// bytes, the request's, or both, as SWWAF_BYTES_COUNT says.
 func (rq *request) countedBytes() int64 {
-	response, request := rq.out.bytes, rq.requestBytes()
-	if rq.upgraded != nil {
-		response += rq.upgraded.fromApp.Load()
-		request += rq.upgraded.toApp.Load()
-	}
+	response, request := rq.out.bytes, rq.requestBytes
 
 	switch rq.h.config.BytesCount {
 	case "response":
@@ -151,7 +138,7 @@ func (rq *request) countedBytes() int64 {
 // banForLimit bans the client's netblock at now for a broken limit, the
 // one hit names, notes the offence for the log line and counts the hit in
 // the metrics. status is what the client was sent, or is sent:
-// SWWAF_BAN_RESPONSE for a request over a rate limit, the app's answer for
+// SWWAF_BAN_RESPONSE for a request over a rate limit, what the report says for
 // one whose bytes broke a byte limit, the refusal for one that broke the
 // error burst. The ban's notes give the client's limit percentage for a
 // rate limit or a byte limit; the error burst is not lowered. The ban sets