check / check (push) Successful in 6m30s
The request log's `action` values now say what they mean, as sneak named them: `request_header_too_large`, `client_is_rate_limited`, `blocked_by_block_rule` and `client_denied`, with no aliases. `banned` splits into `temporarily_banned` and `permanently_banned`, by whether the ban runs out. When a permanent ban also covers a client, that ban is the one reported. Trips a reader: a request over a rate limit stays `client_is_rate_limited` even when the ban it makes is permanent. Disclosure: the offence key `rule_blocked` is renamed in `clients.json` too, so an existing file holding it stops the start and must be removed. Its `version` stays 1. Model: opus-5-5
42 lines
1.4 KiB
Go
42 lines
1.4 KiB
Go
package discriminator
|
|
|
|
// The heuristic byte_limits. It reads SWW_BYTES_COUNT, and the byte limits
|
|
// and biased thresholds through the limiter and limitPercentages.
|
|
|
|
import (
|
|
"context"
|
|
"time"
|
|
)
|
|
|
|
// byteLimits counts the request's bytes, as countedBytes gives them, for 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, which bans the client; the response was passed on whole.
|
|
// Its figures are the window, the count and the limit.
|
|
type byteLimits struct{}
|
|
|
|
func (byteLimits) name() string { return "byte_limits" }
|
|
|
|
func (byteLimits) check(_ context.Context, rq *request, now time.Time) *verdict {
|
|
if !rq.counted || rq.line.WouldAction != "" {
|
|
return nil
|
|
}
|
|
|
|
counts, hit, over := rq.h.limiter.CountBytes(rq.h.clientGroup(rq.client), now,
|
|
rq.countedBytes(), rq.bytesPercent.percent)
|
|
rq.line.Counts.MinuteBytes = counts.MinuteBytes
|
|
rq.line.Counts.HourBytes = counts.HourBytes
|
|
rq.line.Counts.DayBytes = counts.DayBytes
|
|
|
|
if !over {
|
|
return nil
|
|
}
|
|
|
|
rq.banForLimit(now, hit, rq.out.status)
|
|
|
|
return &verdict{figures: limitFigures(hit)}
|
|
}
|