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

@@ -123,11 +123,11 @@ type Params struct {
 	// CacheDir that of the cache files (SWW_WAF_CACHE_DIR).
 	Dir      string
 	CacheDir string
-	// WriteDelay is how long after a ban is made bans.json is written
-	// (SWW_WAF_STATE_WRITE_DELAY), and CounterInterval how often every file
-	// is (SWW_WAF_STATE_COUNTER_INTERVAL).
-	WriteDelay      time.Duration
-	CounterInterval time.Duration
+	// BansWriteDelay is how long after a ban is made bans.json is written
+	// (SWW_WAF_BANS_WRITE_DELAY), and WriteInterval how often every file
+	// is (SWW_WAF_STATE_WRITE_INTERVAL).
+	BansWriteDelay time.Duration
+	WriteInterval  time.Duration
 	// Ledger, Limiter, GeoJS, Lists, DNSBL, AbuseIPDB, RouteWatch, Alerts and
 	// Anomalies hold the state. RouteWatch is nil while SWW_WAF_ROUTEWATCH_URL is
 	// unset, and routewatch.json then holds no answers. Alerts also receive a
@@ -318,13 +318,13 @@ func Load(params Params) (*Files, error) {
 	return f, nil
 }
 
-// Run writes bans.json WriteDelay after a ban is made, with every ban
-// made in between, and every file every CounterInterval, until ctx is
+// Run writes bans.json BansWriteDelay after a ban is made, with every ban
+// made in between, and every file every WriteInterval, until ctx is
 // done. A write that fails is logged, raised as a file_error alert, and
 // the file is written again at its next write. Each write takes in an
 // admin's edit of its file first, as writeFile describes.
 func (f *Files) Run(ctx context.Context) {
-	interval := time.NewTicker(f.params.CounterInterval)
+	interval := time.NewTicker(f.params.WriteInterval)
 	defer interval.Stop()
 
 	var bansDue <-chan time.Time // nil while no ban waits to be written
@@ -335,7 +335,7 @@ func (f *Files) Run(ctx context.Context) {
 			return
 		case <-f.params.Ledger.Changed():
 			if bansDue == nil {
-				bansDue = time.After(f.params.WriteDelay)
+				bansDue = time.After(f.params.BansWriteDelay)
 			}
 		case <-bansDue:
 			bansDue = nil

internal/state/state_test.go

@@ -1273,13 +1273,13 @@ func TestUnwritableDirectoryStopsTheStart(t *testing.T) {
 // returns once Run waits for its next write, so that every write due by
 // then is on disk.
 
-func TestBansWrittenOnceWriteDelayAfterABan(t *testing.T) {
+func TestBansWrittenOnceBansWriteDelayAfterABan(t *testing.T) {
 	t.Parallel()
 
 	synctest.Test(t, func(t *testing.T) {
 		dir := t.TempDir()
 		params := newParams(dir)
-		params.WriteDelay = 10 * time.Second
+		params.BansWriteDelay = 10 * time.Second
 		run(t, load(t, params).Run)
 
 		// A second ban, made while the first waits to be written, puts the
@@ -1318,19 +1318,19 @@ func TestBansWrittenOnceWriteDelayAfterABan(t *testing.T) {
 		// the second ban. The other files wait for the interval, an hour
 		// away.
 		removeFiles(t, dir, bansJSON)
-		time.Sleep(params.WriteDelay)
+		time.Sleep(params.BansWriteDelay)
 		synctest.Wait()
 		wantFiles(t, dir)
 	})
 }
 
-func TestEveryFileWrittenEveryCounterInterval(t *testing.T) {
+func TestEveryFileWrittenEveryWriteInterval(t *testing.T) {
 	t.Parallel()
 
 	synctest.Test(t, func(t *testing.T) {
 		dir := t.TempDir()
 		params := newParams(dir)
-		params.CounterInterval = time.Minute
+		params.WriteInterval = time.Minute
 		run(t, load(t, params).Run)
 
 		// The files are removed once written, so that each interval shows
@@ -1354,21 +1354,21 @@ func TestEditJustBeforeAScheduledWriteSurvivesIt(t *testing.T) {
 	synctest.Test(t, func(t *testing.T) {
 		dir := t.TempDir()
 		params := newParams(dir)
-		params.WriteDelay = 10 * time.Second
+		params.BansWriteDelay = 10 * time.Second
 		run(t, load(t, params).Run)
 
 		// A ban, and bans.json written with it.
 		params.Ledger.BanForLimit(netip.MustParsePrefix("203.0.113.9/32"),
 			midnight(), bans.Notes{})
-		time.Sleep(params.WriteDelay)
+		time.Sleep(params.BansWriteDelay)
 		synctest.Wait()
 
-		// A second ban is to be written WriteDelay later. Just before
+		// A second ban is to be written BansWriteDelay later. Just before
 		// then, an admin saves bans.json with the first ban lifted and
 		// another added.
 		params.Ledger.BanForLimit(netip.MustParsePrefix("203.0.113.10/32"),
 			midnight(), bans.Notes{})
-		time.Sleep(params.WriteDelay - time.Nanosecond)
+		time.Sleep(params.BansWriteDelay - time.Nanosecond)
 		synctest.Wait()
 		edit(t, dir, bansJSON, permanentBansJSON)
 
@@ -1399,7 +1399,7 @@ func TestWriteThatFailsWhileRunningRaisesAFileErrorAlertOncePerCooldown(
 	synctest.Test(t, func(t *testing.T) {
 		dir := t.TempDir()
 		params := newParams(dir)
-		params.CounterInterval = time.Minute
+		params.WriteInterval = time.Minute
 		run(t, load(t, params).Run)
 
 		// A directory in the way of the temporary file of clients.json, a
@@ -2404,16 +2404,16 @@ func newParams(dir string) state.Params {
 	})
 
 	return state.Params{
-		Dir:             dir,
-		CacheDir:        dir,
-		WriteDelay:      time.Hour,
-		CounterInterval: time.Hour,
+		Dir:            dir,
+		CacheDir:       dir,
+		BansWriteDelay: time.Hour,
+		WriteInterval:  time.Hour,
 		Ledger: bans.New(bans.Params{
-			LimitBanDuration:     time.Hour,
-			LimitBanRepeatWindow: 24 * time.Hour,
-			MaxBanDuration:       7 * 24 * time.Hour,
-			AttackBanDuration:    7 * 24 * time.Hour,
-			MaxBans:              5000,
+			LimitBanDuration:       time.Hour,
+			LimitBanRepeatWindow:   24 * time.Hour,
+			LimitBanPermanentAbove: 7 * 24 * time.Hour,
+			AttackBanDuration:      7 * 24 * time.Hour,
+			MaxBans:                5000,
 		}),
 		Limiter: ratelimit.New(ratelimit.Limits{}, 20000),
 		GeoJS: lookup.New(lookup.Params{
@@ -2447,7 +2447,7 @@ func newParams(dir string) state.Params {
 				RequestsPerMinute: 1000,
 				BytesPerMinute:    1 << 30,
 			},
-			Watch:       anomaly.Thresholds{RequestsPerHour: 1000},
+			WatchedNet:  anomaly.Thresholds{RequestsPerHour: 1000},
 			NetV4Prefix: 24,
 			NetV6Prefix: 48,
 			NamedNetblocks: []anomaly.NamedNetblock{