Rename the settings whose names do not say what they control (closes #234)

Applies the setting renames of the naming audit under the SWW_WAF_ and
SWW_RPROXY_ prefixes, with sneak's names for the IP reputation cache
time and the two time limits, which now take milliseconds. The rproxy
log field default_disposition becomes waf_backend_no_answer, and
config.Config and config.FromEnvironment become config.WAF and
config.WAFFromEnvironment. Go fields, test names and prose follow. No
aliases; nothing reads the old names.

Model: opus-5-5

internal/waf/proxy.go

@@ -47,7 +47,7 @@ const ClientsPath = "/_sww/clients/"
 
 // Params are what New needs.
 type Params struct {
-	Config *config.Config
+	Config *config.WAF
 	// RequestLog receives two JSON lines per question, one at its decision and
 	// one when its report comes, and one per request to waf's own
 	// endpoints.
@@ -77,7 +77,7 @@ type Params struct {
 	// permanent, for each count over an anomaly threshold, for each request
 	// whose client a blocklist, the CrowdSec decision list, a DNSBL zone or
 	// AbuseIPDB lists, for each request the Core Rule Set scores at or over
-	// SWW_WAF_CORE_RULE_SET_ANOMALY_THRESHOLD, and for GeoJS failing, a fetch of a list
+	// SWW_WAF_CORE_RULE_SET_SCORE_THRESHOLD, and for GeoJS failing, a fetch of a list
 	// failing, a query to a DNSBL zone or a check with AbuseIPDB failing,
 	// or the day's AbuseIPDB checks used up.
 	Alerts *alerts.Queue
@@ -106,7 +106,10 @@ type Server struct {
 // newHandler returns the handler with what every request shares, as the
 // settings in params make it.
 func newHandler(params Params) *handler {
-	m := metrics.New(params.Config.MetricsTopN, params.Config.InstanceName)
+	m := metrics.New(
+		params.Config.MetricsBusiestCountriesAndASNs,
+		params.Config.InstanceName,
+	)
 	lists, dnsbl, abuseIPDB := newReputation(params, m)
 
 	awaitingReport, err := lru.New[string, *decision](maxAwaitingReport)
@@ -130,21 +133,21 @@ func newHandler(params Params) *handler {
 			BytesPerDay:    params.Config.BytesLimitPerDay,
 		}, params.Config.MaxTrackedClients),
 		ledger: bans.New(bans.Params{
-			LimitBanDuration:     params.Config.LimitBanDuration,
-			LimitBanRepeatWindow: params.Config.LimitBanRepeatWindow,
-			MaxBanDuration:       params.Config.MaxBanDuration,
-			AttackBanDuration:    params.Config.AttackBanDuration,
-			MaxBans:              params.Config.MaxBans,
+			LimitBanDuration:       params.Config.LimitBanDuration,
+			LimitBanRepeatWindow:   params.Config.LimitBanRepeatWindow,
+			LimitBanPermanentAbove: params.Config.LimitBanPermanentAbove,
+			AttackBanDuration:      params.Config.AttackBanDuration,
+			MaxBans:                params.Config.MaxBans,
 		}),
 		anomalies: anomaly.New(anomaly.Params{
 			Client:         params.Config.AnomalyClient,
 			Net:            params.Config.AnomalyNet,
 			ASN:            params.Config.AnomalyASN,
 			Total:          params.Config.AnomalyTotal,
-			Watch:          params.Config.AnomalyWatch,
+			WatchedNet:     params.Config.AnomalyWatchedNet,
 			NetV4Prefix:    params.Config.AnomalyNetV4Prefix,
 			NetV6Prefix:    params.Config.AnomalyNetV6Prefix,
-			NamedNetblocks: params.Config.WatchNets,
+			NamedNetblocks: params.Config.AnomalyWatchedNets,
 			Alerts:         params.Alerts,
 		}),
 		lookupFile:  params.LookupFile,
@@ -163,7 +166,7 @@ func newHandler(params Params) *handler {
 
 	h.geojs = lookup.New(lookup.Params{
 		URL:     params.GeoJSURL,
-		Timeout: params.Config.LookupTimeout,
+		Timeout: params.Config.ASNAndCountryLookupTimeout,
 		// The country list, the headers, the tag settings that name an asn=
 		// or country= tag and the biased thresholds act on the answer before
 		// the request goes on.
@@ -198,14 +201,15 @@ func newReputation(
 		Now: params.Now, ProcessLog: params.ProcessLog, Alerts: params.Alerts,
 	})
 	dnsbl := reputation.NewDNSBL(reputation.DNSBLParams{
-		Zones: cfg.DNSBLZones, Resolver: cfg.DNSBLResolver, CacheTTL: cfg.ReputationCacheTTL,
-		Timeout: cfg.ReputationTimeout, Now: params.Now, ProcessLog: params.ProcessLog,
+		Zones: cfg.DNSBLZones, Resolver: cfg.DNSBLResolver,
+		CacheTTL: cfg.IPReputationCacheTTL,
+		Timeout:  cfg.DNSBLAbuseIPDBTimeout, Now: params.Now, ProcessLog: params.ProcessLog,
 		Alerts: params.Alerts,
 	})
 	abuseIPDB := reputation.NewAbuseIPDB(reputation.AbuseIPDBParams{
 		URL: params.AbuseIPDBURL, Key: cfg.AbuseIPDBKey, MinScore: cfg.AbuseIPDBMinScore,
-		DailyBudget: cfg.AbuseIPDBDailyBudget, CacheTTL: cfg.ReputationCacheTTL,
-		Timeout: cfg.ReputationTimeout, Now: params.Now, ProcessLog: params.ProcessLog,
+		DailyBudget: cfg.AbuseIPDBDailyBudget, CacheTTL: cfg.IPReputationCacheTTL,
+		Timeout: cfg.DNSBLAbuseIPDBTimeout, Now: params.Now, ProcessLog: params.ProcessLog,
 		Alerts: params.Alerts,
 	})
 
@@ -220,7 +224,7 @@ func newReputation(
 
 // NewCoreRuleSet returns the Core Rule Set at SWW_WAF_CORE_RULE_SET_PARANOIA_LEVEL,
 // without the rules SWW_WAF_CORE_RULE_SET_DISABLED_RULES switches off, reading bodies
-// up to SWW_WAF_CORE_RULE_SET_BODY_LIMIT, with the exclusions in
+// up to SWW_WAF_CORE_RULE_SET_BODY_INSPECTION_SIZE, with the exclusions in
 // SWW_WAF_CORE_RULE_SET_EXCLUSIONS_FILE and the fixes of the apps in SWW_WAF_APPS,
 // or nil while SWW_WAF_CORE_RULE_SET_MODE is off. It
 // reads at most QuestionBodyMaxBytes less one byte: a question's body of
@@ -228,15 +232,19 @@ func newReputation(
 // JSON or XML body over its limit. An exclusions file that coreruleset.New refuses is
 // an error in every mode. While the mode is off, a set file is loaded with the
 // Core Rule Set only to check it.
-func NewCoreRuleSet(cfg *config.Config) (*coreruleset.CoreRuleSet, error) {
-	if cfg.WAFMode == config.WAFModeOff &&
+func NewCoreRuleSet(cfg *config.WAF) (*coreruleset.CoreRuleSet, error) {
+	if cfg.CoreRuleSetMode == config.CoreRuleSetModeOff &&
 		cfg.CoreRuleSetExclusionsFile == "" {
 		return nil, nil //nolint:nilnil // off is no Core Rule Set, and no error
 	}
 
 	coreRuleSet, err := coreruleset.New(coreruleset.Params{
-		ParanoiaLevel: cfg.WAFParanoiaLevel, DisabledRules: cfg.WAFDisabledRules,
-		BodyLimit:      min(cfg.WAFBodyLimit, QuestionBodyMaxBytes-1),
+		ParanoiaLevel: cfg.CoreRuleSetParanoiaLevel,
+		DisabledRules: cfg.CoreRuleSetDisabledRules,
+		BodyInspectionSize: min(
+			cfg.CoreRuleSetBodyInspectionSize,
+			QuestionBodyMaxBytes-1,
+		),
 		ExclusionsFile: cfg.CoreRuleSetExclusionsFile,
 		Apps:           cfg.Apps,
 	})
@@ -247,7 +255,7 @@ func NewCoreRuleSet(cfg *config.Config) (*coreruleset.CoreRuleSet, error) {
 		)
 	}
 
-	if cfg.WAFMode == config.WAFModeOff {
+	if cfg.CoreRuleSetMode == config.CoreRuleSetModeOff {
 		return nil, nil //nolint:nilnil // off is no Core Rule Set, and no error
 	}
 
@@ -257,7 +265,7 @@ func NewCoreRuleSet(cfg *config.Config) (*coreruleset.CoreRuleSet, error) {
 // handler is waf's handler. It holds what every request shares; what
 // belongs to one request is in a request.
 type handler struct {
-	config      *config.Config
+	config      *config.WAF
 	requestLog  io.Writer
 	processLog  *slog.Logger
 	now         func() time.Time