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/anomaly_test.go

@@ -21,11 +21,11 @@ import (
 // The anomaly thresholds: the prefix of a scope followed by the end of a
 // count.
 const (
-	anomalyClient = "SWW_WAF_ANOMALY_CLIENT_"
-	anomalyNet    = "SWW_WAF_ANOMALY_NET_"
-	anomalyASN    = "SWW_WAF_ANOMALY_ASN_"
-	anomalyTotal  = "SWW_WAF_ANOMALY_TOTAL_"
-	anomalyWatch  = "SWW_WAF_WATCH_"
+	anomalyClient     = "SWW_WAF_ANOMALY_CLIENT_"
+	anomalyNet        = "SWW_WAF_ANOMALY_NET_"
+	anomalyASN        = "SWW_WAF_ANOMALY_ASN_"
+	anomalyTotal      = "SWW_WAF_ANOMALY_TOTAL_"
+	anomalyWatchedNet = "SWW_WAF_ANOMALY_WATCHED_NET_"
 
 	requestsPerMinute = "REQUESTS_PER_MINUTE"
 	requestsPerHour   = "REQUESTS_PER_HOUR"
@@ -37,7 +37,7 @@ const (
 const (
 	anomalyNetV4Prefix = "SWW_WAF_ANOMALY_NET_V4_PREFIX"
 	anomalyNetV6Prefix = "SWW_WAF_ANOMALY_NET_V6_PREFIX"
-	watchNets          = "SWW_WAF_WATCH_NETS"
+	watchedNets        = "SWW_WAF_ANOMALY_WATCHED_NETS"
 )
 
 const (
@@ -75,7 +75,7 @@ func TestEachScopeAndWindowOverItsThresholdAlertsOncePerCooldown(
 		{anomalyASN, anomaly.ScopeASN, netip.Prefix{}, asnDE, map[string]any{"asn": asnDE}},
 		{anomalyTotal, anomaly.ScopeTotal, netip.Prefix{}, "the whole service", nil},
 		{
-			anomalyWatch, anomaly.ScopeWatchedNet, netip.MustParsePrefix(clientsNet),
+			anomalyWatchedNet, anomaly.ScopeWatchedNet, netip.MustParsePrefix(clientsNet),
 			"the named netblock office, " + clientsNet, map[string]any{"name": "office"},
 		},
 	} {
@@ -97,7 +97,7 @@ func TestEachScopeAndWindowOverItsThresholdAlertsOncePerCooldown(
 			t.Run(setting, func(t *testing.T) {
 				t.Parallel()
 
-				env := map[string]string{setting: value, watchNets: office}
+				env := map[string]string{setting: value, watchedNets: office}
 				s, clk, server, queue := startWithLookupsAndClock(t, env)
 				start := clk.Now()
 
@@ -219,7 +219,7 @@ func TestThresholdsOffCountNothingAndAlertNothing(t *testing.T) {
 	// With every threshold off, nothing is counted.
 	s, server, queue := startWithLookups(
 		t,
-		map[string]string{watchNets: office},
+		map[string]string{watchedNets: office},
 	)
 
 	for range 5 {
@@ -234,7 +234,7 @@ func TestThresholdsOffCountNothingAndAlertNothing(t *testing.T) {
 
 	// With one set, its count alone is counted, in its scope alone.
 	s, clk, server, queue := startWithLookupsAndClock(t, map[string]string{
-		anomalyNet + requestsPerMinute: aLot, watchNets: office,
+		anomalyNet + requestsPerMinute: aLot, watchedNets: office,
 	})
 
 	for range 5 {
@@ -348,7 +348,7 @@ func TestRequestCountsForTheASNumberGeoJSGivesBeforeItEnds(t *testing.T) {
 	addr, out, started := startProxyWithClock(t, app.URL, geojsURL, clk.Now,
 		map[string]string{
 			trustedProxies:                 trustLocalhost,
-			lookupTimeout:                  "1h",
+			asnAndCountryLookupTimeout:     "3600000",
 			anomalyASN + requestsPerMinute: aLot,
 		})
 	server.Store(started)
@@ -379,8 +379,8 @@ func TestEachNamedNetblockCountsTheClientsInIt(t *testing.T) {
 		t,
 		readAndAnswer,
 		map[string]string{
-			anomalyWatch + requestsPerMinute: aLot,
-			watchNets: office + ",wide=203.0.0.0/16" +
+			anomalyWatchedNet + requestsPerMinute: aLot,
+			watchedNets: office + ",wide=203.0.0.0/16" +
 				",other=198.51.100.0/25",
 		},
 	)