Read every setting through viper (closes #211)

servewaf's and rproxy's settings are read through viper, bound to the same environment variable names as before, in place of the os.LookupEnv function Main passed down. NewViper turns AutomaticEnv and AllowEmptyEnv on, so a setting that is set but empty reads as set, as it did. A setting may also be given as a file, the _FILE form, which rproxy's settings now have too; rproxy still writes nothing to disk. The settings tests pass set into a viper instead of a lookup function.

Model: deepseek-v4-pro

Dockerfile

@@ -133,32 +133,11 @@ RUN mkdir /etc/sysusers.d \
     && echo 'u  _runit-log  -  "runit svlogd user"  /nonexistent  /sbin/nologin' \
         > /etc/sysusers.d/runit.conf
 
-# ca-certificates, nix-bin and runit, from Ubuntu's archive as it was at
-# the snapshot moment, which is never earlier than the Ubuntu image above.
-# apt checks every package against the snapshot's InRelease files, and
-# this step checks those against the hashes named here, which are those
-# of the amd64 archive: other architectures use Ubuntu's ports archive.
-# apt also fetches the live archive's InRelease files, which change daily
-# and which the install does not use. The snapshot service is HTTPS only
-# and this image has no CA certificates yet, so this step uses the Go
-# image's. The snapshot service answers 503 at times; apt retries a
-# failed download, waiting twice as long before each retry, and this
-# step gives it five retries, about half a minute in all, where its
-# default of three gives up after seven seconds.
-RUN --mount=type=bind,from=builder,source=/etc/ssl/certs/ca-certificates.crt,target=/tmp/go-image-ca.crt \
-    apt-get update --snapshot 20261001T000000Z \
-        -o Acquire::https::CaInfo=/tmp/go-image-ca.crt \
-        -o Acquire::Retries=5 \
-    && printf '%s\n' \
-        '45f95ce276cdba3e41870516a130e03c58b8b7a79e9546b0efe9e526d255740c  snapshot.ubuntu.com_ubuntu_20261001T000000Z_dists_resolute_InRelease' \
-        '802e675dd9de4c7f3916434a95e7c1d8eec0e82886622d7805ab19a2c6fe0365  snapshot.ubuntu.com_ubuntu_20261001T000000Z_dists_resolute-updates_InRelease' \
-        '64b3353f0bd4970b4f7271962245bcea9ff24d4cc7bea16b433f8a60e42ca3dd  snapshot.ubuntu.com_ubuntu_20261001T000000Z_dists_resolute-backports_InRelease' \
-        '1d5041572116a8b23aabf79ac7439ad8af83d57ad3fb0f9aa0d4523ec10c5908  snapshot.ubuntu.com_ubuntu_20261001T000000Z_dists_resolute-security_InRelease' \
-        | (cd /var/lib/apt/lists && sha256sum --check --strict) \
+# ca-certificates, nix-bin and runit, from Ubuntu's archive. apt fetches
+# them over plain HTTP and checks each one against the archive's signed
+# package lists, so no CA certificates are needed.
+RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \
-        --snapshot 20261001T000000Z \
-        -o Acquire::https::CaInfo=/tmp/go-image-ca.crt \
-        -o Acquire::Retries=5 \
         ca-certificates nix-bin runit \
     && rm -rf /var/lib/apt/lists/*
 

EVALUATION.md

@@ -153,15 +153,15 @@ Closest existing options, and why each still falls short:
     - What it is: a single-binary reverse proxy that makes browsers solve a
       proof-of-work challenge before passing them to `TARGET`. Aimed at
       scrapers, which is likely a large share of unwanted traffic on a public
-      gitea.
+      code forge.
     - Covers: R10 well (one container, env vars for listener, target,
       difficulty, cookies). Policy rules can match on path, user agent, headers,
       IP ranges, and with the vendor's hosted data service also AS number and
       country, and can weigh a request toward a harder challenge.
     - Misses: R1, R3, R4, R5, R6, R9. Bot policy needs a YAML file, not env
       vars. AS number and country matching depend on the vendor's hosted
-      service. Breaks non-browser clients unless paths are exempted; for gitea,
-      git-over-HTTP and API paths must be allowed through by rule.
+      service. Breaks non-browser clients unless paths are exempted; for a code
+      forge, git-over-HTTP and API paths must be allowed through by rule.
     - Maturity: very active, widely deployed on code forges since 2025.
     - Value here: complementary. It can be chained (traefik, then the sidecar,
       then Anubis, then the app) if challenge pages are wanted.

Makefile

@@ -1,12 +1,11 @@
 .PHONY: bootstrap setup test lint fmt fmt-check tidy check docker hooks build \
-	run example-app gitea-requests
+	run example-app
 
 # Makefile targets are thin shims; the implementations live in script/
 # per the scripts-to-rule-them-all pattern (see the Entrypoints section
 # of README.md). tidy writes go.mod and go.sum as `go mod tidy` does,
 # which test checks. build and run are for working on the code by hand;
-# example-app checks the image with an app built on it; gitea-requests
-# reports the gitea requests the Core Rule Set refuses at the defaults.
+# example-app checks the image with an app built on it.
 
 bootstrap:
 	@script/bootstrap
@@ -46,6 +45,3 @@ run:
 
 example-app:
 	@script/example-app
-
-gitea-requests:
-	@script/gitea-requests

README.md

@@ -69,8 +69,7 @@ Not built, and not planned:
 ### The image
 
 No image is published. Build it from a clone. `make docker` runs the tests and
-the linter, then builds the image, tagged `smallwebwaf`. It builds for amd64, on
-an amd64 host only.
+the linter, then builds the image, tagged `smallwebwaf`.
 
 ```sh
 git clone https://git.eeqj.de/sneak/smallwebwaf.git
@@ -101,8 +100,8 @@ Point traefik's labels at port 8080 of `rproxy`
 of the app or of `servewaf`. Anything on that network can reach the app around
 `rproxy`, and can ask `servewaf` questions, so the network holds only what you
 trust. Each further app adds its own container and its own `rproxy`, whose
-`SWRP_WAF_BACKEND` names the same `servewaf`. The "Smallest setup" and "In front
-of gitea" examples below show this shape.
+`SWRP_WAF_BACKEND` names the same `servewaf`. The "Smallest setup" example below
+shows this shape.
 
 ### `rproxy` in the app's container
 
@@ -190,12 +189,12 @@ restarting the container. `rproxy` reads only the `SWRP_` settings, and
 default, chosen for a service on the open internet. A setting that needs an
 account, a key, a token or an alert destination stays off until you give one.
 
-- Any `SWWAF_` setting can be given as a file instead, for secrets and long
-  lists: `SWWAF_ADMIN_TOKEN_FILE` names the file that holds `SWWAF_ADMIN_TOKEN`.
-  The file's contents are the value, less one newline at the end. Setting both
-  forms stops the start. `SWWAF_LOG_REMOTE_TLS_CA_FILE` already names a file, so
-  it has no `_FILE` form, and no `SWRP_` setting has one, since `rproxy` never
-  touches disk.
+- Any `SWWAF_` or `SWRP_` setting can be given as a file instead, for secrets
+  and long lists: `SWWAF_ADMIN_TOKEN_FILE` names the file that holds
+  `SWWAF_ADMIN_TOKEN`. The file's contents are the value, less one newline at
+  the end. Setting both forms stops the start. `SWWAF_LOG_REMOTE_TLS_CA_FILE`
+  and `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE` already name a file, so they have no
+  `_FILE` form.
 - A duration is Go's syntax, with `d` for days: `90s`, `15m`, `24h`, `7d`.
 - A size is a number of bytes with an optional `K`, `M` or `G`, in powers of
   1024: `512K`, `100M`, `5G`.
@@ -273,6 +272,7 @@ Every setting the code reads, with its default:
 | `SWWAF_WAF_DISABLED_RULES`                 | `920340,920420,920440,920640,930130,930140`                                    | Core Rule Set rule ids switched off; a list you give replaces the default, so repeat these six to keep them off.                                                    |
 | `SWWAF_WAF_EXEMPT_PATHS`                   | empty                                                                          | Path prefixes the Core Rule Set does not inspect.                                                                                                                   |
 | `SWWAF_WAF_BODY_LIMIT`                     | `off`                                                                          | How much of a request body the Core Rule Set reads, a size up to `64K`; `off` reads none.                                                                           |
+| `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE`      | unset                                                                          | A file of Core Rule Set exclusions, as Coraza directives, that switch rules off for some fields or paths only.                                                      |
 | `SWWAF_BLOCKLIST_URLS`                     | empty                                                                          | Blocklists to fetch, text files of addresses and netblocks one to a line, such as `https://www.spamhaus.org/drop/drop.txt`.                                         |
 | `SWWAF_BLOCKLIST_REFRESH`                  | `24h`                                                                          | How long after a list was last tried it is fetched again, `1h` or more.                                                                                             |
 | `SWWAF_BLOCKLIST_ACTION`                   | `deny`                                                                         | What a client on a blocklist gets: `deny`, `limit:<percent>` of every limit, or `log`.                                                                              |
@@ -339,9 +339,8 @@ full, and the limits that are fixed rather than settings.
 Each example is a complete `compose.yaml`. `smallwebwaf` is the tag
 `make docker` gives the image; on another host, use the name you pushed it
 under, by digest. Docker Compose puts the services on a private network of its
-own, where each reaches the others by service name. Only "In front of gitea"
-uses traefik. The other three publish `rproxy`'s port on the host, for trying it
-out.
+own, where each reaches the others by service name. Each example publishes
+`rproxy`'s port on the host, for trying it out.
 
 ### Smallest setup
 
@@ -427,87 +426,6 @@ volumes:
     servewaf-state:
 ```
 
-### In front of gitea
-
-gitea behind traefik, set up for a code forge:
-
-- the upload limits raised, in size and in time;
-- the response size limit raised, for clones over 1 GiB;
-- the Actions runners exempt from counting;
-- the default request and byte limits kept.
-
-`traefik` is the network traefik is on, made outside this file.
-
-```yaml
-services:
-    gitea:
-        # gitea 1.27.3, 2026-08-29
-        image: gitea/gitea@sha256:87a67ee09d3ae0d1df5fda5dcda3e2a1f9236a45b0a59025d6e00e46adc43bef
-        environment:
-            GITEA__server__ROOT_URL: https://git.example/
-            # The host and the port of the SSH clone URLs gitea shows.
-            GITEA__server__SSH_DOMAIN: git.example
-            GITEA__server__SSH_PORT: "2222"
-            # gitea's TCP peer is rproxy, on the private network.
-            GITEA__security__REVERSE_PROXY_TRUSTED_PROXIES: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
-        volumes:
-            - gitea-data:/data
-        networks:
-            - site
-        ports:
-            # SSH does not pass through smallwebwaf.
-            - "2222:22"
-
-    rproxy:
-        image: smallwebwaf
-        environment:
-            SWRP_WAF_BACKEND: http://servewaf:8080
-            SWRP_UPSTREAM_URL: http://gitea:3000
-            # Pushes, LFS objects and image layers over 100 MiB, or slower
-            # than a minute, are cut off at the defaults.
-            SWRP_MAX_REQUEST_SIZE: 2G
-            SWRP_MAX_REQUEST_TIME_MS: "600000"
-            # A clone larger than 1 GiB is cut off at the default.
-            SWRP_MAX_RESPONSE_SIZE: 4G
-        networks:
-            - site
-            - traefik
-        labels:
-            traefik.enable: "true"
-            # rproxy is on two networks; traefik reaches it on this one.
-            traefik.docker.network: traefik
-            traefik.http.routers.git.rule: Host(`git.example`)
-            traefik.http.routers.git.entrypoints: websecure
-            traefik.http.routers.git.tls.certresolver: letsencrypt
-            traefik.http.services.git.loadbalancer.server.port: "8080"
-
-    servewaf:
-        image: smallwebwaf
-        environment:
-            SMALLWEBWAF_COMMAND: servewaf
-            SWWAF_INSTANCE_NAME: fsn1/servewaf
-            # The Actions runners ask for work all day; never count them.
-            SWWAF_RATE_LIMIT_EXEMPT_NETS: 10.0.4.0/24
-            # gitea never serves these; a request for one bans the client.
-            SWWAF_TRAP_PATHS: /wp-login.php,/xmlrpc.php,/wp-admin/
-        volumes:
-            - servewaf-state:/var/lib/smallwebwaf
-        networks:
-            - site
-
-networks:
-    site:
-    traefik:
-        external: true
-
-volumes:
-    gitea-data:
-    servewaf-state:
-```
-
-[`docs/gitea.md`](docs/gitea.md) records what the defaults do in front of gitea,
-request by request.
-
 ### `rproxy` beside the app
 
 The app is built on the `smallwebwaf` image, with `rproxy` inside its container.
@@ -636,10 +554,13 @@ and the status for a size or time limit, such as `413` for a body too large.
   headers of every request, and no body unless `SWWAF_WAF_BODY_LIMIT` is set. In
   front of a code forge, bodies carry what people write and publish, which the
   rules take for attacks.
-- `smallwebwaf` changes the Core Rule Set in six ways so that it lets ordinary
+- `smallwebwaf` changes the Core Rule Set in eight ways so that it lets ordinary
   requests to a code forge through, such as git over HTTP and sign-in through
-  Git Credential Manager. No setting undoes them; "Attack detection" in
-  [`SPEC.md`](SPEC.md) lists them.
+  Git Credential Manager. On gitea's own paths, its searches, file names and
+  branch names get through too. No setting undoes the changes; "Attack
+  detection" in [`SPEC.md`](SPEC.md) lists them.
+- `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE` switches single rules off for an app's
+  own fields or paths.
 - Rule files are plain text, one rule to a line, edited by hand and read again
   while `servewaf` runs. The image ships one file of probes no real visitor
   sends (see [`docs/rules.md`](docs/rules.md)).
@@ -656,8 +577,8 @@ aside as `<name>.bad`, and never stops the running process (see
 
 ### The image and its processes
 
-- The image is built on Ubuntu 26.04 LTS, pinned by digest, with its packages
-  from a snapshot of Ubuntu's archive and nixpkgs fixed at one release. An app's
+- The image is built on Ubuntu 26.04 LTS, pinned by digest. Its Ubuntu packages
+  come from Ubuntu's archive, and nixpkgs is fixed at one release. An app's
   `Dockerfile` installs a package with `nix-env -iA nixpkgs.<name>` and gets the
   same package each time it is built (see [`docs/image.md`](docs/image.md)).
 - runit, a service supervisor, runs `smallwebwaf` as the `smallwebwaf` user (uid
@@ -682,8 +603,8 @@ aside as `<name>.bad`, and never stops the running process (see
   health check.
 - `internal/config`: reads the settings, the one place they are read.
 - `internal/rproxy`: the reverse proxy in front of one app.
-- `internal/proxy`: `servewaf`'s server, which runs the checks and answers its
-  own endpoints.
+- `internal/servewaf`: `servewaf`'s server, which runs the checks and answers
+  its own endpoints.
 - `internal/ratelimit`, `internal/bans`, `internal/rules`, `internal/waf`,
   `internal/lookup`, `internal/reputation`, `internal/anomaly` and
   `internal/alerts`: one check or source each.
@@ -771,14 +692,6 @@ on the host.
     - orderly stops with `sv stop` and `docker stop`;
     - bans surviving a new container on the same volume;
     - a setting given as a file.
-- `script/gitea-requests`: builds the image and runs gitea 1.27.3 behind
-  `rproxy` and `servewaf`, three containers on one network. Every setting is at
-  its default, but for those that join the containers and
-  `SWWAF_LOG_REQUEST_HEADERS`, which adds the header that labels each request.
-  It sends through them a sample of gitea's ordinary use and the requests the
-  Core Rule Set is known to refuse, and prints what `servewaf` did with each.
-  Needs network access, and a docker daemon that pushes to a registry on
-  `localhost` over plain HTTP. `make gitea-requests`.
 
 ## TODO
 
@@ -802,7 +715,6 @@ on the host.
 - [`docs/state-files.md`](docs/state-files.md): the state files and what each
   holds.
 - [`docs/image.md`](docs/image.md): what the image holds and how it is pinned.
-- [`docs/gitea.md`](docs/gitea.md): `smallwebwaf` in front of gitea.
 
 ## License
 

SPEC.md

@@ -31,12 +31,13 @@ to them.
   reputation sources, and send alerts.
 - Everything is set by environment variables. The names of `servewaf`'s start
   with `SWWAF_`, and those of `rproxy` with `SWRP_`. The only other inputs are
-  `servewaf`'s files:
-    - the rule files;
-    - the state files;
-    - a lookup database;
-    - a `SWWAF_` setting given as a file;
-    - the file `SWWAF_LOG_REMOTE_TLS_CA_FILE` names.
+  files:
+    - `servewaf`'s rule files;
+    - `servewaf`'s state files;
+    - `servewaf`'s lookup database;
+    - a `SWWAF_` or `SWRP_` setting given as a file;
+    - the file `SWWAF_LOG_REMOTE_TLS_CA_FILE` names;
+    - the file `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE` names.
 
 ## Non-goals
 
@@ -66,10 +67,10 @@ to them.
       one it does not know, the binary prints the commands and exits with
       status 2.
     - `internal/config`: reads the settings, the one place they are read.
-    - `internal/proxy`: `servewaf`'s server. It runs the checks in `check`, and
-      holds `servewaf`'s question, answer and report. It answers `servewaf`'s
-      own endpoints in `answerOwnEndpoint`. It counts bytes, refusals and
-      anomalies, and writes the log lines.
+    - `internal/servewaf`: `servewaf`'s server. It runs the checks in `check`,
+      and holds `servewaf`'s question, answer and report. It answers
+      `servewaf`'s own endpoints in `answerOwnEndpoint`. It counts bytes,
+      refusals and anomalies, and writes the log lines.
     - `internal/rproxy`: the reverse proxy in front of one app that asks
       `servewaf` about each request. It passes a request to the app with the
       standard library's `httputil.ReverseProxy`, within the time and size
@@ -81,7 +82,7 @@ to them.
       of bans is full.
     - `internal/rules`: reads the rule files at start and again when they
       change, and tells which rules a request matches.
-    - `internal/waf`: the Core Rule Set, with the six changes listed under
+    - `internal/waf`: the Core Rule Set, with the eight changes listed under
       "Attack detection", as Coraza directives.
     - `internal/lookup`: looks clients up through GeoJS or in the lookup
       database.
@@ -321,13 +322,13 @@ Conventions:
     No other setting can be switched off with `off`.
 
 - A list set to an empty value is an empty list, and replaces the default.
-- Any `SWWAF_` setting can be read from a file instead, for secrets and long
-  lists: `SWWAF_ADMIN_TOKEN_FILE` names the file that holds `SWWAF_ADMIN_TOKEN`.
-  The file's contents are the value, less one newline at the end, and are
-  checked as the value itself would be. Setting both forms stops the start, and
-  so does naming a file that cannot be read. `SWWAF_LOG_REMOTE_TLS_CA_FILE`
-  already holds a file name, so it has no `_FILE` form. No `SWRP_` setting has
-  one, since `rproxy` never touches disk.
+- Any `SWWAF_` or `SWRP_` setting can be read from a file instead, for secrets
+  and long lists: `SWWAF_ADMIN_TOKEN_FILE` names the file that holds
+  `SWWAF_ADMIN_TOKEN`. The file's contents are the value, less one newline at
+  the end, and are checked as the value itself would be. Setting both forms
+  stops the start, and so does naming a file that cannot be read.
+  `SWWAF_LOG_REMOTE_TLS_CA_FILE` and `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE`
+  already hold a file name, so they have no `_FILE` form.
 - Settings, files included, are read once at start. Changing one means
   restarting the container. The files `servewaf` watches while it runs are its
   state files, its rule files and the lookup database.
@@ -401,11 +402,11 @@ Breaking one bans the client. The defaults let people read a site and stop
 scrapers that send many requests slowly over hours or days. The hour limit is
 the main one.
 
-- Per minute: 120, 2 requests a second. It leaves room for a person opening
-  several pages at once with an empty cache. A gitea page opened with an empty
-  cache loads 20 to 60 files, and a handful once cached.
-- Per hour: 1,500. A person reading code in gitea for a whole hour, a page every
-  20 seconds, makes about 900 requests. A scraper making one request every 2
+- Per minute: 120, 2 requests a second. It leaves room for a person opening two
+  pages at once with an empty cache. A web app's page opened with an empty cache
+  loads 20 to 60 files, and a handful once cached.
+- Per hour: 1,500. A person reading a site for a whole hour, a page every 20
+  seconds, makes about 900 requests. A scraper making one request every 2
   seconds makes 1,800 an hour, more than the limit.
 - Per day: 6,000, four hours at the hour limit. A scraper making one request
   every 10 seconds makes 8,640 a day, more than the limit.
@@ -417,7 +418,7 @@ the blocklists. An abuser that trips none of them is not caught.
 
 Some legitimate clients pass the limits:
 
-- An Actions runner asks gitea for work all day and can pass the limits.
+- A CI runner asks its code forge for work all day and can pass the limits.
 - Everyone behind one shared address, such as an office, shares one client's
   limits.
 
@@ -434,9 +435,10 @@ matched the same way.
 
 ### Byte limits, per client
 
-There is no minute limit, so a client can download in a burst at full speed. The
-hour limit is 50 GiB and the day limit 100 GiB. They allow several downloads of
-a few GiB each. A response's bytes are counted when it ends (see step 15).
+By default there is no minute limit, so a client can download in a burst at full
+speed. The hour limit defaults to 50 GiB and the day limit to 100 GiB. They
+allow several downloads of a few GiB each. A response's bytes are counted when
+it ends (see step 15).
 
 ### Lookup of AS number and country
 
@@ -549,12 +551,11 @@ service's abuse comes from.
 By default the Core Rule Set reads the method, the URL with its query string,
 and the headers of every request. That is where automated attacks show:
 injection in query strings, path traversal, attacks carried in headers,
-scanners' user agents. It reads no request body. In front of a code forge such
-as gitea, bodies carry what people write and publish, such as issue text and
-files saved in the web editor. The Core Rule Set takes the shell commands and
-code in them for attacks. The default gives up refusing an attack carried in a
-body. The rule files, the limits and the bans still apply to the client that
-sends it.
+scanners' user agents. It reads no request body. In front of a code forge,
+bodies carry what people write and publish, such as issue text and files saved
+in the web editor. The Core Rule Set takes the shell commands and code in them
+for attacks. The default gives up refusing an attack carried in a body. The rule
+files, the limits and the bans still apply to the client that sends it.
 
 - The Core Rule Set skips a path under `SWWAF_WAF_EXEMPT_PATHS`.
 - `SWWAF_WAF_PARANOIA_LEVEL` and `SWWAF_WAF_ANOMALY_THRESHOLD` are the Core Rule
@@ -582,6 +583,27 @@ sends it.
     probes these rules caught (see "Rule files"). A list you give replaces the
     default, so name these six ids in it to keep them off.
 
+- `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE` names a file of exclusions, written as
+  Coraza directives. An exclusion switches one rule off for some fields or paths
+  only, where `SWWAF_WAF_DISABLED_RULES` switches it off everywhere. The file
+  holds an app's own exclusions; the eighth change below holds gitea's.
+    - `servewaf` loads the file after `smallwebwaf`'s own setup rules and before
+      the Core Rule Set's rules. The Core Rule Set loads its own
+      `REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf` at the same point.
+    - So the file holds only `SecAction` and `SecRule` lines that exclude with
+      `ctl:ruleRemoveTargetById` or `ctl:ruleRemoveById`. These run with each
+      request, before the rules they exclude, those of phase 1 included.
+    - A rule that `SWWAF_WAF_DISABLED_RULES` switches off and the file names is
+      simply off.
+    - The start stops on a file that cannot be read or does not parse, whatever
+      `SWWAF_WAF_MODE` is.
+    - It stops too on a file that names a number from 900000 to 900999, the ids
+      of `smallwebwaf`'s own rules, alone or in a range. Comment lines are not
+      checked.
+    - It stops too on a directive that removes or changes rules as the file
+      loads, such as `SecRuleRemoveById`, since none of the Core Rule Set's
+      rules is loaded yet.
+
 - `SWWAF_WAF_BODY_LIMIT` switches body inspection on, up to that size. It takes
   at most `64K`, since `servewaf` gets no more of a body than that (see "The
   answer"). Form data and multipart bodies are read up to the size. JSON and XML
@@ -590,15 +612,14 @@ sends it.
   data, where binary content such as a git push trips rules written for text. A
   body the Core Rule Set cannot parse adds 5 to the score, and so does a
   multipart body cut by the limit in the middle of a part's header. Body
-  inspection suits apps whose forms carry no code; `docs/gitea.md` records what
-  it refuses in front of gitea.
+  inspection suits apps whose forms carry no code.
 - `SWWAF_TRAP_PATHS` names paths the app never serves and only scanners ask for,
-  such as `/wp-login.php` in front of gitea. This is the short form of a `path`
-  rule with the `ban` action, for deployments that mount no rule files. A trap
-  path is matched whole, without the query, against the path as sent and once
-  percent-decoded: `/wp-login.php` matches `/wp-login.php?x=1` and
-  `/%77p-login.php`, and does not match `/wp-login.php/` or
-  `/blog/wp-login.php`.
+  such as `/wp-login.php` in front of an app that is not WordPress. This is the
+  short form of a `path` rule with the `ban` action, for deployments that mount
+  no rule files. A trap path is matched whole, without the query, against the
+  path as sent and once percent-decoded: `/wp-login.php` matches
+  `/wp-login.php?x=1` and `/%77p-login.php`, and does not match `/wp-login.php/`
+  or `/blog/wp-login.php`.
 - `SWWAF_ERROR_BURST_THRESHOLD` counts a client's refusals per minute of these
   kinds, and of no other:
     - a rule file match;
@@ -608,10 +629,10 @@ sends it.
     More than this breaks a limit (see "Bans"). A client trying one attack after
     another is refused many times a minute; a person rarely more than a few
     times. Answers the app gives are not counted, since they do not tell a
-    scanner from an ordinary client. In front of gitea, registry and git clients
-    get `404` and `401` by design, hundreds of times a minute.
+    scanner from an ordinary client. In front of a code forge, registry and git
+    clients get `404` and `401` by design, hundreds of times a minute.
 
-`smallwebwaf` changes the Core Rule Set 4.25.0 in six ways, since in front of
+`smallwebwaf` changes the Core Rule Set 4.25.0 in eight ways, since in front of
 gitea it would otherwise refuse ordinary requests. The changes hold in front of
 every app, and no setting undoes them:
 
@@ -643,9 +664,10 @@ every app, and no setting undoes them:
     or `docker-build`. In these parameters, what only these three rules would
     catch reaches the app, such as the command `|cat /etc/passwd`. Path
     traversal, SQL and script injection, and PHP, Java and Node.js code are
-    still refused there. Every other parameter keeps all three rules. An app
-    that uses one of these parameters as a file on the server, or passes it to a
-    shell, must check the value itself. A rule file can refuse it instead.
+    still refused there. Other parameters keep all three rules, except on the
+    gitea paths the eighth change names. An app that uses one of these
+    parameters as a file on the server, or passes it to a shell, must check the
+    value itself. A rule file can refuse it instead.
 
 5. Two cookies are left out, and `Referer` keeps fewer rules:
     - The Core Rule Set reads the request without the `gitea_flash` and
@@ -659,15 +681,83 @@ every app, and no setting undoes them:
       only to its own pages. Every other cookie is read in full. An app that
       reads a cookie of either name must check it itself.
     - `Referer` is not checked for a Unix command given without arguments
-      (932340) or for Java starting a process (944110). `Referer` names the page
-      a request comes from, on everything that page loads and on every link
-      followed from it. The Core Rule Set takes some page addresses for attacks,
-      such as a search for `env`, or OpenJDK's `Runtime.java`, whose path holds
-      both `runtime` and `java.`. All of those requests would be refused.
-      `Referer` keeps the other rules. An app that passes `Referer` to a shell
-      must check it itself.
+      (932340), for Java starting a process (944110) or for a Java class name
+      (944130). `Referer` names the page a request comes from, on everything
+      that page loads and on every link followed from it. The Core Rule Set
+      takes some page addresses for attacks:
+        - a search for `env`;
+        - OpenJDK's `Runtime.java`, whose path holds both `runtime` and `java.`;
+        - a file named `java.lang.String.md`.
+
+        Every request from such a page would be refused. `Referer` keeps the
+        other rules, except after some gitea searches (the eighth change). An
+        app that passes `Referer` to a shell must check it itself.
+
 6. Responses are not inspected. A raw file from a repository, such as a shell
    script, looks to the response rules like source code leaking from the server.
+7. The `from` parameter of a container registry's upload path,
+   `/v2/<image>/blobs/uploads/`, is not checked for command names (932260). When
+   a push reuses a layer, `from` names the image the layer comes from. An image
+   such as `owner/python3-app` would have that push refused.
+8. On gitea's paths, some fields skip the rules that refused ordinary gitea
+   requests there. They are the fields where gitea sends a search, a file name
+   or a branch name. `internal/waf/gitea.conf` lists each rule and the request
+   it refused. The fields are:
+    - `q` on gitea's searches of code, of issues and pull requests, and of
+      commits. A code search holds code, such as `<script>`,
+      `SELECT * FROM users WHERE` or `../`.
+    - `Referer` of a page opened from such a search, for script and SQL
+      injection and Java code (941110, 941120, 941160, 942100, 944100).
+    - `q` on gitea's searches for a name, for the names of system files and
+      commands (930120, 932120, 932260). Names such as `.profile` and
+      `python3-app` were refused. gitea searches for the names of:
+        - repositories;
+        - users and organisations;
+        - branches and tags;
+        - packages.
+
+        A user's or an organisation's page is any path of one segment, so on
+        every such path, on any app, `q` skips these three rules, for example on
+        `/search`.
+
+        Some of these searches also skip the rule for Java class names (944130),
+        which refused `org.apache.commons.logging`.
+
+    - The path of these requests, which names a file:
+        - a file's page;
+        - its raw file;
+        - its download;
+        - its blame page;
+        - its history;
+        - its edit page;
+        - its preview in the editor;
+        - its delete page;
+        - the API's call for its contents;
+        - a release attachment's download.
+
+        Names such as `notes.txt~`, `process.env.d.ts` and `java.lang.String.md`
+        were refused.
+
+    - A file name in a query parameter:
+        - `file` of a commit graph;
+        - `path` of the API's list of commits;
+        - `path` of a diff's hidden lines;
+        - `body` of the API's call for several files;
+        - `template` of a new issue;
+        - `redirect_to` of the sign-in page;
+        - `name` of an attachment uploaded through the API.
+    - A branch or tag name in a query parameter, for command names (932260).
+      gitea sends one:
+        - to delete or restore a branch;
+        - to start a release from a tag;
+        - to edit a branch protection rule;
+        - to list a directory's last commits.
+    - The `Content-Range` header of an artifact upload from
+      `actions/upload-artifact@v3` (920450).
+
+    Elsewhere these fields keep every rule. The paths are those of gitea at the
+    site root. An app other than gitea that serves one of them must check these
+    fields itself.
 
 The parameter and cookie names in these changes are matched without regard to
 case, as Coraza matches them.
@@ -835,7 +925,7 @@ and the default file.
   runs. It reads the files again once the directory has had no change for 2
   seconds, so that a file still being written is read whole. A file whose name
   starts with `.`, such as an editor's lock file, is not a rule file.
-- Files are read in name order (`00-default.rules` before `50-gitea.rules`),
+- Files are read in name order (`00-default.rules` before `50-site.rules`),
   rules in line order.
 - A rule's regex is Go's RE2 syntax. It has no backreferences or lookaround; in
   exchange matching time is linear in the input, so no rule can be made to stall
@@ -864,14 +954,12 @@ and the default file.
 
 - The image ships a default file, kept short and limited to patterns that are
   wrong for every app, with its path rules anchored at the site root. In front
-  of gitea, `/.env` is a probe, while
+  of a code forge, `/.env` is a probe, while
   `/<owner>/<repo>/src/branch/main/.env.example` is a file in a repository that
   any visitor may open. Anchor the paths of your own `ban` rules at the site
-  root too. Anything else, such as a rule banning WordPress probes in front of
-  gitea, belongs in a file the deployer adds to the image `servewaf` runs from,
-  or mounts. A rule has one target, so a `path` rule applies on every site
-  behind that `servewaf`. A directory mounted over `SWWAF_RULES_DIR` replaces
-  the default file; single files mounted into it add to it.
+  root too. A rule has one target, so a `path` rule applies on every site behind
+  that `servewaf`. A directory mounted over `SWWAF_RULES_DIR` replaces the
+  default file; single files mounted into it add to it.
 - Rules meant to be edited while `servewaf` runs belong in a mounted directory,
   not a mounted file. Many editors save a file by replacing it, and a container
   keeps seeing the old one when the file alone is mounted. The lookup database
@@ -1540,20 +1628,11 @@ It sets no `ENTRYPOINT` or `USER` of its own. The container must start
 
 - The image is Ubuntu's newest long-term support release, pinned by digest, and
   moves to the next LTS release when that ships. Its packages come from Ubuntu's
-  snapshot service, the archive as it was at the moment the Dockerfile names,
-  rather than the live archive, whose packages change with every update. The
-  snapshot is never older than the pinned Ubuntu image, since older packages can
-  need older versions of packages the image holds, and it moves forward with the
-  image's digest. The Dockerfile names the hash of each of the snapshot's
-  `InRelease` files, which cover every package list and so every package, and
-  the build checks them before installing. The live archive's `InRelease` files,
-  which `apt-get update` also fetches and the install does not use, are left out
-  of the check. The hashes are the amd64 archive's, so the image is built for
-  amd64 only.
+  archive, whose packages change with every update.
 - The Ubuntu image has no CA certificates. Without them Nix cannot download
   packages and `servewaf` cannot reach GeoJS, so `ca-certificates` is installed
-  by name. The snapshot itself is fetched over HTTPS with the CA certificates of
-  the Go image that builds `smallwebwaf`, itself pinned by digest.
+  by name. apt fetches the packages over plain HTTP and checks each one against
+  the archive's signed package lists, so the install needs no CA certificates.
 - nixpkgs comes from a release file on `releases.nixos.org`, named with its
   hash, not from a GitHub archive, whose bytes can change. Root uses Nix
   directly; no Nix daemon runs. `nix-bin` creates no build users, so
@@ -1703,8 +1782,7 @@ with no change to upaas. upaas builds the app's Dockerfile and runs the one
 container as it runs any app. The traefik labels route to port 8080, and the
 `SWRP_` settings go with the app's environment variables. `servewaf` runs in a
 container of its own, on a network the app's container can reach, with its state
-volume and the directory of any token file. `docs/gitea.md` records what the
-defaults do in front of gitea, and `script/gitea-requests` checks those notes.
+volume and the directory of any token file.
 
 ## Planned, not built
 

docs/gitea.md

@@ -1,217 +0,0 @@
-# smallwebwaf in front of gitea
-
-These notes record what `smallwebwaf` does in front of gitea at the default
-settings. They are observations, not requirements; the requirements are in
-[`SPEC.md`](../SPEC.md). `script/gitea-requests` runs gitea behind `rproxy` and
-`servewaf`, and sends through them a sample of gitea's ordinary use and the
-requests named below. It reports each request the Core Rule Set refuses, so that
-these notes can be checked again when gitea or the Core Rule Set changes
-version.
-
-## What the defaults cover
-
-- SSH access to gitea does not pass through `smallwebwaf` and is not protected
-  by it.
-- A clone is a response. It fits the defaults of 30 minutes and 1 GiB unless the
-  repository is large or the link slow. A repository whose clone is larger than
-  1 GiB needs `SWRP_MAX_RESPONSE_SIZE` raised.
-- A push is a request, and so is every other upload:
-    - a git push;
-    - an LFS object;
-    - a container image layer;
-    - a package file;
-    - a release attachment.
-
-    At the defaults, an upload larger than 100 MiB or taking more than 60
-    seconds is cut off ("`rproxy`'s limits" in `SPEC.md`). A gitea that takes
-    large uploads needs `SWRP_MAX_REQUEST_SIZE` and `SWRP_MAX_REQUEST_TIME_MS`
-    raised to fit.
-
-- Archive download and blame or history pages are what scrapers hammer. The
-  request limits do most of the work there.
-- An Actions runner that reaches gitea through `smallwebwaf` sends requests all
-  day. One older than version 0.4 (April 2026) asks for work every 2 seconds,
-  1,800 requests an hour. While it runs a job, it reports the job's log and
-  state every second instead, two requests a second. So one idle runner makes
-  1,800 requests an hour, more than the hour limit of 1,500. A busy one, at two
-  requests a second, passes the minute limit of 120 within two minutes. Its
-  address is then banned, its running jobs fail, and each repeat within a day
-  makes the ban longer. Newer runners ask for work less often. Put the runners'
-  addresses in `SWWAF_RATE_LIMIT_EXEMPT_NETS`.
-
-## What the Core Rule Set lets through
-
-At the defaults, the Core Rule Set lets gitea's ordinary use through, apart from
-the refusals in the next section:
-
-- browsing and views of files in a repository, with their history, blame and the
-  file tree;
-- diffs, including their hidden lines and large files, and pull request review;
-- git's clone, fetch and push over HTTP;
-- signing in, including the return to the page a visitor came from, and sign-in
-  with Git Credential Manager, git-credential-oauth or tea;
-- the API's calls for a file and its commits;
-- pushing and pulling container images and packages;
-- Actions runners, and artifacts uploaded with `actions/upload-artifact@v4`;
-- posting issues, pull requests, comments, wiki pages and files saved in the web
-  editor, code included, since no body is read;
-- the page gitea shows after a change, with its message naming what was done.
-
-## What the Core Rule Set still refuses
-
-Each refusal answers only that request ("Bans" in `SPEC.md` says what it counts
-toward). The request log names the rule in `waf_rule_ids`, which
-`SWWAF_WAF_DISABLED_RULES` can switch off.
-
-### A query string that reads as an attack
-
-Most often this is a search. A search term is a query parameter, which the Core
-Rule Set checks against its lists of system files and commands (see the fourth
-change under "Attack detection" in `SPEC.md`). A release attachment uploaded
-through the API as `docker-compose.yml` is refused the same way. Examples:
-
-- a name on those lists, such as `package.json`, `.gitignore` or
-  `docker-compose.yml`;
-- text that starts with a command name, such as `python3` or `ssh key`, or has
-  one right after a `/` in its first word, such as `feat/docker-support`;
-- a shell command with its options or a system path (`ls -la`, `sed -i`,
-  `/bin/sh`), or a command in backticks;
-- script code (`fetch(`, `${VAR}`, `process.env`), HTML (`<img src=`) or an SQL
-  statement (`SELECT * FROM users WHERE`);
-- a URL naming an IP address or `localhost`.
-
-### A branch, tag or file name that starts with a command name
-
-The Core Rule Set's list of commands (932260) holds names such as `docker-`,
-`python3`, `ansible`, `base64` and `whoami`. A query parameter holding a branch,
-tag or file name that starts with one is refused. So is one that has such a name
-right after a `/`, such as `feat/docker-support`, `fix/docker-build` or
-`renovate/docker-build-push-action-6.x`. gitea's own pages send the name in a
-query parameter that 930120, 932160 and 932260 still check:
-
-- `refSubUrl`, the branch or tag of a directory listing. A listing sends it when
-  it asks for its entries' last commits in a second request. It does so whenever
-  gitea takes more than a second to work them out;
-- `name`, when a branch is deleted or restored on the branches page;
-- `tag`, when a release is started from a tag;
-- `template`, the file of an issue template, when an issue is opened from it;
-- `rule_name`, when a branch protection rule is opened for editing in the
-  repository's settings or has just been saved.
-
-What a visitor sees, for a branch named `docker-build`:
-
-- A directory listing that makes that second request leaves those last commits
-  out and shows an error.
-- The branches page shows an error instead of deleting or restoring the branch.
-- A release started from such a tag gets the `403` answer of `smallwebwaf` in
-  place of its form. So does an issue opened from such a template, and such a
-  rule opened for editing.
-- Saving such a rule stores it. gitea then returns to the branch settings page,
-  which gets the `403` answer, so the save looks as if it failed.
-
-### A file name in a query parameter that trips the code rules
-
-The Core Rule Set's rules for Java, script, PowerShell and SQL find what they
-look for in some file names. This holds too in the ten query parameters that
-930120, 932160 and 932260 do not check (see the fourth change under "Attack
-detection" in `SPEC.md`). Examples:
-
-- `runtime` in OpenJDK's `src/java.base/share/classes/java/lang/Runtime.java`
-  (944110);
-- a Java class, as in `java.lang.String.md` (944130);
-- `document.write.js` (941180);
-- `process.env.d.ts` (934100);
-- `__proto__` (934130);
-- the PowerShell command `Install-Script`, as in `install-script.sh` (932120);
-- a database's name, as in PostgreSQL's `information_schema.sql` (942140).
-
-For such a file, these requests are refused:
-
-- the API's list of its commits (`path`);
-- the API's call for the contents of files that names it in its query (`body`);
-- the commit graph of that file alone (`file`);
-- the hidden lines of its diff (`path`), which stay hidden;
-- the sign-in page, for a visitor who opens a page of the file that needs
-  signing in, such as its edit page (`redirect_to`). The visitor can still sign
-  in by opening the sign-in page itself.
-
-### A path
-
-- A file name ending in `~`, or an `.xhtml` file whose path holds a space.
-- A path that holds what the Core Rule Set takes for a Java class (944130), as
-  `java.lang.String.md` and
-  `META-INF/services/org.apache.commons.logging.LogFactory` do.
-- A path that holds what it takes for Node.js code (934100), as
-  `process.env.d.ts` does.
-- A path with a directory named `...` (930100, 930110), such as `.../notes.txt`.
-
-For such a file, these are refused:
-
-- the page of the file;
-- its raw file;
-- its history and its blame;
-- its edit page.
-
-The directory that holds it lists it, and a clone carries it.
-
-### A container image push that reuses a layer
-
-A push can reuse a layer of an image docker has pushed to that gitea before.
-docker then asks gitea to take the layer from that image, naming it in the query
-parameter `from`, which 932260 checks. The request is refused when the image's
-owner starts with an entry on the list of commands. It is refused too when the
-image's name after the owner starts with one. Examples are `owner/python3-app`,
-`owner/docker-base`, and any image of an owner named `ansible` or `docker-team`.
-
-What happens next depends on docker's image store. A docker that keeps its
-images in containerd's image store fails the push, and fails each new try the
-same way. A new install of Docker Engine 29 does this. A docker that keeps them
-in its own older image store uploads the layer instead. The push then succeeds
-after one refusal for each layer it reuses, and each of those refusals counts
-toward the error burst ("Attack detection" in `SPEC.md`).
-
-### Artifact uploads from `actions/upload-artifact@v3`
-
-This action sends the header `Content-Range`, which the Core Rule Set refuses
-(920450). The action sends two files at a time, does not retry a `403`, and
-sends no further file once one is refused. So an upload is refused once or
-twice, however many files it holds, and the step fails. One upload does not ban
-the runner. The error burst ("Attack detection" in `SPEC.md`) bans it after more
-than 30 such refusals from its address in a minute, as when many jobs upload at
-once. `actions/upload-artifact@v4` does not send the header.
-
-## What body inspection refuses
-
-With `SWWAF_WAF_BODY_LIMIT` set, the Core Rule Set reads request bodies too. In
-front of gitea it then refuses these, until their rule ids, named in the request
-log, are added to `SWWAF_WAF_DISABLED_RULES`:
-
-- issue and comment text, wiki pages and files saved in the web editor that hold
-  shell commands or code (932125, 932235, 932250 and others);
-- package descriptions that show code;
-- PyPI uploads (922130);
-- attachments named like `debug.log` or `config.yml` (932180).
-
-## What `script/gitea-requests` sends
-
-Of the requests above, the script sends:
-
-- for each file named under "A file name in a query parameter that trips the
-  code rules", the API's list of its commits;
-- for `Runtime.java` alone, the commit graph of that file, the hidden lines of
-  its diff, and the API's call for the contents of files that names it;
-- the sign-in page for a visitor who opens the edit page of `document.write.js`;
-- the pages of `java.lang.String.md`,
-  `META-INF/services/org.apache.commons.logging.LogFactory`, `process.env.d.ts`
-  and `.../notes.txt`;
-- one container image push that reuses a layer, which it does not try again.
-
-It does not send the raw file, history, blame or edit page of those four files,
-or the pages of the directories `META-INF/services` and `...`. It also sends a
-short sample of gitea's ordinary use:
-
-- signing in;
-- pages of files and commits, and a diff;
-- the API;
-- a push, and clone and fetch over HTTP;
-- two container image pushes.

docs/image.md

@@ -8,8 +8,7 @@ is pinned that way.
 ## Contents
 
 - Ubuntu 26.04 LTS, pinned by digest.
-- `ca-certificates`, `nix-bin` and `runit` from Ubuntu, from the snapshot of its
-  archive at `20261001T000000Z`.
+- `ca-certificates`, `nix-bin` and `runit` from Ubuntu's archive.
 - Nix, with nixpkgs `nixos-26.05.11045.774debe7a0d1` set up for root as
   `nixpkgs`. No Nix daemon; `build-users-group =` in `/etc/nix/nix.conf`. Root's
   Nix profile, `/nix/var/nix/profiles/default/bin`, last on the `PATH`.
@@ -26,10 +25,8 @@ is pinned that way.
 
 ## Pins
 
-- Ubuntu's packages: the snapshot service, `--snapshot 20261001T000000Z` on both
-  `apt-get update` and `apt-get install`. The SHA-256 hash of each of the
-  snapshot's `InRelease` files is named in the `Dockerfile` and checked after
-  `apt-get update`. The hashes are the amd64 archive's.
+- Ubuntu's packages are not pinned: they come from the live archive, whose
+  packages change with every update.
 - nixpkgs: the release file `nixexprs.tar.xz` of
   `nixos-26.05.11045.774debe7a0d1` on `releases.nixos.org`, named with its
   SHA-256 hash.

docs/rules.md

@@ -55,10 +55,10 @@ empty-agent      user_agent  log     ^$
 ## A file of your own
 
 `servewaf` reads the rule files in its own container. Rules of your own go in a
-file named to sort after the default, such as `50-gitea.rules`:
+file named to sort after the default, such as `50-site.rules`:
 
 ```
-# 50-gitea.rules: WordPress probes, which gitea never serves
+# 50-site.rules: WordPress probes, which this site never serves
 wp-probe         path        ban     (?i)^/(wp-login\.php|xmlrpc\.php|wp-admin/)
 ```
 
@@ -66,7 +66,7 @@ A `Dockerfile` built on the `smallwebwaf` image, for `servewaf` to run from,
 adds it:
 
 ```dockerfile
-COPY 50-gitea.rules /etc/smallwebwaf/rules.d/50-gitea.rules
+COPY 50-site.rules /etc/smallwebwaf/rules.d/50-site.rules
 ```
 
 Or mount it there. A `path` rule applies on every site behind that `servewaf`.

docs/settings.md

@@ -101,20 +101,19 @@ chooses between the two (see "The image's command" below).
 
 - `SWWAF_RATE_LIMIT_PER_MINUTE` (default `120`, 2 a second): the most requests a
   client may make in a minute. A count or `off`. The default leaves room for a
-  person opening several gitea pages at once with an empty cache, 20 to 60 files
-  each.
+  person opening two pages at once with an empty cache, up to 60 files each.
 - `SWWAF_RATE_LIMIT_PER_HOUR` (default `1500`): the most requests a client may
   make in an hour. A count or `off`. It is the main limit against scrapers. A
-  person reading code in gitea for an hour, a page every 20 seconds, makes
-  about 900. A scraper making one request every 2 seconds makes 1,800 an hour,
-  more than the limit.
+  person reading a site for an hour, a page every 20 seconds, makes about 900. A
+  scraper making one request every 2 seconds makes 1,800 an hour, more than the
+  limit.
 - `SWWAF_RATE_LIMIT_PER_DAY` (default `6000`): the most requests a client may
   make in a day. A count or `off`. The default is four hours at the hour limit.
   A scraper making one request every 10 seconds makes 8,640 a day, more than the
   limit.
-- An Actions runner asks gitea for work all day and can pass the limits. Put
-  their addresses in `SWWAF_RATE_LIMIT_EXEMPT_NETS`. Do the same for a network
-  where many people share one address, such as an office.
+- A CI runner asks its code forge for work all day and can pass the limits. Put
+  the runners' addresses in `SWWAF_RATE_LIMIT_EXEMPT_NETS`. Do the same for a
+  network where many people share one address, such as an office.
 - Counting cannot catch a client that stays under all three limits (see "Request
   rate limits, per client" in [`SPEC.md`](../SPEC.md)).
 - `SWWAF_RATE_LIMIT_EXEMPT_PATHS` (default empty): path prefixes exempt from
@@ -192,6 +191,15 @@ chooses between the two (see "The image's command" below).
   the Core Rule Set reads, a size of at most `64K`. A question carries no more
   of a body than 64 KiB, and the Core Rule Set reads at most 64 KiB less one
   byte of it, whatever the value (see "The answer" in [`SPEC.md`](../SPEC.md)).
+- `SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE` (default unset): a file of Core Rule Set
+  exclusions, written as Coraza directives. It is loaded before the Core Rule
+  Set's rules, so it holds only `SecAction` and `SecRule` lines that exclude
+  with `ctl:ruleRemoveTargetById` or `ctl:ruleRemoveById`. A file that cannot be
+  read or does not parse stops the start, whatever `SWWAF_WAF_MODE` is. So does
+  a file that names a number from 900000 to 900999 outside a comment, alone or
+  in a range. So does a directive that removes or changes rules as the file
+  loads, such as `SecRuleRemoveById`, since none of the Core Rule Set's rules is
+  loaded yet. It has no `_FILE` form.
 - `SWWAF_ERROR_BURST_THRESHOLD` (default `30`): the most refusals of one client
   in a minute (see "Attack detection" in `SPEC.md`). A count or `off`.
 
@@ -346,9 +354,8 @@ asked in the background (see "Answering in time" under "`servewaf`" in
 ## `rproxy`
 
 `smallwebwaf rproxy` reads the settings below and no others. They are read once
-at start, and an invalid value stops the start. None can be given as a file,
-since `rproxy` never touches disk. "`rproxy`" in [`SPEC.md`](../SPEC.md) says
-what they do.
+at start, and an invalid value stops the start. Any can be given as a file, as a
+`SWWAF_` setting can. "`rproxy`" in [`SPEC.md`](../SPEC.md) says what they do.
 
 A time here is a whole number of milliseconds above zero, such as `2000`.
 

go.mod

@@ -10,12 +10,14 @@ require (
 	github.com/maxmind/mmdbwriter v1.2.0
 	github.com/oschwald/maxminddb-golang/v2 v2.7.0
 	github.com/prometheus/client_golang v1.24.1
+	github.com/spf13/viper v1.21.0
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/corazawaf/libinjection-go v0.3.3 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
 	github.com/gotnospirit/makeplural v0.0.0-20180622080156-a5f48d94d976 // indirect
@@ -25,14 +27,22 @@ require (
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/magefile/mage v1.17.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/petar-dambovaliev/aho-corasick v0.0.0-20250424160509-463d218d4745 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.70.1 // indirect
 	github.com/prometheus/procfs v0.21.1 // indirect
+	github.com/sagikazarmark/locafero v0.11.0 // indirect
+	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/valllabh/ocsf-schema-golang v1.0.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.5 // indirect
 	go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
 	golang.org/x/net v0.58.0 // indirect
 	golang.org/x/sync v0.23.0 // indirect

go.sum

@@ -12,8 +12,12 @@ github.com/corazawaf/libinjection-go v0.3.3 h1:NhbXKRfRpqKzBMzv8zpCcnjyEw7BCVhBO
 github.com/corazawaf/libinjection-go v0.3.3/go.mod h1:Ik/+w3UmTWH9yn366RgS9D95K3y7Atb5m/H/gXzzPCk=
 github.com/foxcpp/go-mockdns v1.2.0 h1:omK3OrHRD1IWJz1FuFBCFquhXslXoF17OvBS6JPzZF0=
 github.com/foxcpp/go-mockdns v1.2.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
 github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM=
@@ -34,6 +38,10 @@ github.com/kaptinlin/jsonschema v0.4.6 h1:vOSFg5tjmfkOdKg+D6Oo4fVOM/pActWu/ntkPs
 github.com/kaptinlin/jsonschema v0.4.6/go.mod h1:1DUd7r5SdyB2ZnMtyB7uLv64dE3zTFTiYytDCd+AEL0=
 github.com/klauspost/compress v1.19.1 h1:VsB4HPswih7mmZ8WleSFQ75c/Ui1M4trX5oAsJnhSlk=
 github.com/klauspost/compress v1.19.1/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/magefile/mage v1.17.0 h1:dS4tkq997Ism03akafC8509iqDjeE7TNTexI25Y7sXM=
@@ -58,8 +66,24 @@ github.com/prometheus/common v0.70.1 h1:1HvjP4D5oL3t8RsPlwxA9onvvStjtIHYE5XuuwOi
 github.com/prometheus/common v0.70.1/go.mod h1:VdFUQDMZK3VLkurFUVhia6uys/0suUp86TJz5qbJRhc=
 github.com/prometheus/procfs v0.21.1 h1:GljZCt+zSTS+NZq88cyQ1LjZ+RCHp3uVuabBWA5+OJI=
 github.com/prometheus/procfs v0.21.1/go.mod h1:aB55Cww9pdSJVHk0hUf0inxWyyjPogFIjmHKYgMKmtY=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc=
+github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik=
+github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
+github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U=
+github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
+github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
+github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=
+github.com/spf13/cast v1.10.0/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
+github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk=
+github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.21.0 h1:x5S+0EU27Lbphp4UKm1C+1oQO+rKx36vfCoaVebLFSU=
+github.com/spf13/viper v1.21.0/go.mod h1:P0lhsswPGWD/1lZJ9ny3fYnVqxiegrlNrEmgLjbTCAY=
 github.com/stretchr/testify v1.12.1 h1:EuwCh5fleGS7H32xRwO3wRGT7DxrDhLAT6FF8MpWDWE=
 github.com/stretchr/testify v1.12.1/go.mod h1:MDEgiDPPsNp5cuIrHPPCyornHKgEVbtFUmoNlxoYthg=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
 github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=

internal/alerts/alerts_test.go

@@ -39,7 +39,7 @@ const (
 	ntfyURL    = "https://ntfy.example/smallwebwaf-alerts"
 	ntfyToken  = "tk_0123456789abcdefghijklmnopq"
 	// instance is the instance name every alert gives.
-	instance = "fsn1app1/gitea"
+	instance = "fsn1app1/blog"
 	// started is when each test starts, as an alert gives it, and
 	// anHourOn an hour later.
 	started  = "2000-01-01T00:00:00Z"
@@ -965,8 +965,8 @@ func TestEachDestinationIsSentOnlyTheAlertsWaitingForIt(t *testing.T) {
 		synctest.Wait()
 
 		wantBodies(t, standIns[alerts.DestinationSlack],
-			`{"text":"*fsn1app1/gitea: file_error*\nsecond"}`,
-			`{"text":"*fsn1app1/gitea: file_error*\nthird"}`)
+			`{"text":"*fsn1app1/blog: file_error*\nsecond"}`,
+			`{"text":"*fsn1app1/blog: file_error*\nthird"}`)
 		wantBodies(t, standIns[alerts.DestinationNtfy], "fourth")
 
 		// alerts.json then lists Slack and ntfy alone, with no alert waiting.
@@ -1265,7 +1265,7 @@ func anAlertForEachEvent() []eventMessage {
 				Reason: "requests per hour over the limit of 10000",
 				Detail: map[string]any{"mode": "observe"},
 			},
-			"fsn1app1/gitea: ban", "default no_entry",
+			"fsn1app1/blog: ban", "default no_entry",
 			"requests per hour over the limit of 10000\nclient: 203.0.113.9\n" +
 				"netblock: 203.0.113.0/24\ncountry: DE\nmode: observe",
 		},
@@ -1275,7 +1275,7 @@ func anAlertForEachEvent() []eventMessage {
 				Netblock: netip.MustParsePrefix("198.51.100.7/32"), Country: "FR",
 				Reason: "matched the rule env-file",
 			},
-			"fsn1app1/gitea: permanent_ban", "high no_entry",
+			"fsn1app1/blog: permanent_ban", "high no_entry",
 			"matched the rule env-file\nclient: 198.51.100.7\n" +
 				"netblock: 198.51.100.7/32\ncountry: FR",
 		},
@@ -1286,7 +1286,7 @@ func anAlertForEachEvent() []eventMessage {
 				Reason:   "refused by the Core Rule Set",
 				Host:     "app.example",
 			},
-			"fsn1app1/gitea: waf_block", "default shield",
+			"fsn1app1/blog: waf_block", "default shield",
 			"refused by the Core Rule Set\nhost: app.example\nclient: 192.0.2.1\n" +
 				"netblock: 192.0.2.1/32",
 		},
@@ -1295,7 +1295,7 @@ func anAlertForEachEvent() []eventMessage {
 				Event: alerts.EventAnomaly, Netblock: netip.MustParsePrefix("192.0.2.0/24"),
 				Reason: "requests per minute over the threshold of 5000",
 			},
-			"fsn1app1/gitea: anomaly", "high chart_with_upwards_trend",
+			"fsn1app1/blog: anomaly", "high chart_with_upwards_trend",
 			"requests per minute over the threshold of 5000\nnetblock: 192.0.2.0/24",
 		},
 		{
@@ -1304,7 +1304,7 @@ func anAlertForEachEvent() []eventMessage {
 				Netblock: netip.MustParsePrefix("192.0.2.2/32"),
 				Reason:   "listed by a DNS blocklist",
 			},
-			"fsn1app1/gitea: reputation_hit", "low label",
+			"fsn1app1/blog: reputation_hit", "low label",
 			"listed by a DNS blocklist\nclient: 192.0.2.2\nnetblock: 192.0.2.2/32",
 		},
 		{
@@ -1312,7 +1312,7 @@ func anAlertForEachEvent() []eventMessage {
 				Event: alerts.EventSourceFailure, Reason: "asking GeoJS failed",
 				Detail: map[string]any{"source": "geojs"},
 			},
-			"fsn1app1/gitea: source_failure", "high warning",
+			"fsn1app1/blog: source_failure", "high warning",
 			"asking GeoJS failed\nsource: geojs",
 		},
 		{
@@ -1323,7 +1323,7 @@ func anAlertForEachEvent() []eventMessage {
 					"file": "/etc/smallwebwaf/rules.d/50-app.rules", "error": "line 2: no action",
 				},
 			},
-			"fsn1app1/gitea: file_error", "high warning",
+			"fsn1app1/blog: file_error", "high warning",
 			"a rule file has an error, and the rules stay as they were\n" +
 				"file: /etc/smallwebwaf/rules.d/50-app.rules\nerror: line 2: no action",
 		},

internal/config/config.go

@@ -2,9 +2,8 @@
 // read. Every setting is an environment variable. The settings of `smallwebwaf
 // servewaf` start with SWWAF_, every one of them has a default, and most can be
 // given as a file instead. Those of `smallwebwaf rproxy` start with SWRP_. Each
-// of them but SWRP_WAF_BACKEND has a default, and none can be given as a file,
-// since rproxy never touches disk. SMALLWEBWAF_COMMAND chooses which of the two
-// the image runs.
+// of them but SWRP_WAF_BACKEND has a default, and each can be given as a file
+// too. SMALLWEBWAF_COMMAND chooses which of the two the image runs.
 package config
 
 import (
@@ -26,6 +25,8 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/anomaly"
 	"sneak.berlin/go/smallwebwaf/internal/remotelog"
@@ -221,12 +222,15 @@ type Config struct {
 	// WAFExemptPaths the path prefixes it does not inspect
 	// (SWWAF_WAF_EXEMPT_PATHS), and WAFBodyLimit the most of a request body
 	// it reads (SWWAF_WAF_BODY_LIMIT), 0 while it is off and it reads none.
-	WAFMode             string
-	WAFParanoiaLevel    int
-	WAFAnomalyThreshold int
-	WAFDisabledRules    []int
-	WAFExemptPaths      []string
-	WAFBodyLimit        int64
+	// CoreRuleSetExclusionsFile is the path of the file of its exclusions
+	// (SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE), "" while there is none.
+	WAFMode                   string
+	WAFParanoiaLevel          int
+	WAFAnomalyThreshold       int
+	WAFDisabledRules          []int
+	WAFExemptPaths            []string
+	WAFBodyLimit              int64
+	CoreRuleSetExclusionsFile string
 	// TrapPaths are the paths a request for which is a clear sign of
 	// attack (SWWAF_TRAP_PATHS), each starting with / and without a ?.
 	TrapPaths []string
@@ -409,7 +413,7 @@ var (
 	errNoCertificate = errors.New("holds no PEM certificate")
 	errNotFacility   = errors.New("is not a syslog facility such as local0 or daemon")
 	errNotAppName    = errors.New(
-		"is not 1 to 48 printable ASCII characters without a space, such as gitea")
+		"is not 1 to 48 printable ASCII characters without a space, such as blog")
 	errSetTwice      = errors.New("set only one of them")
 	errNotWebhookURL = errors.New(
 		"is not an http or https URL without a user or a fragment, " +
@@ -450,15 +454,16 @@ var (
 		"is in SWWAF_BLOCKLIST_URLS or is SWWAF_ASN_LIMIT_PERCENT_URL too")
 )
 
-// FromEnvironment reads the settings with lookupEnv, normally
-// os.LookupEnv. A setting may instead be given as a file: the variable
-// named by the setting's name with _FILE added names the file, which is
-// read now (see lookup). A setting that is not set takes its default. A
-// setting that is set but invalid is an error that names it.
+// FromEnvironment reads the settings through v, normally the viper
+// NewViper returns, bound to the process's environment. A setting may
+// instead be given as a file: the variable named by the setting's name
+// with _FILE added names the file, which is read now (see lookup). A
+// setting that is not set takes its default. A setting that is set but
+// invalid is an error that names it.
 //
 //nolint:funlen // one line for each setting, a list that grows with them
-func FromEnvironment(lookupEnv func(string) (string, bool)) (*Config, error) {
-	env := &environment{lookupEnv: lookupEnv}
+func FromEnvironment(v *viper.Viper) (*Config, error) {
+	env := &environment{v: v, readFiles: true}
 	cfg := &Config{
 		ListenAddr:           env.address("SWWAF_LISTEN_ADDR"),
 		InstanceName:         env.instanceName(),
@@ -523,8 +528,10 @@ func FromEnvironment(lookupEnv func(string) (string, bool)) (*Config, error) {
 		WAFAnomalyThreshold: env.numberOrOff("SWWAF_WAF_ANOMALY_THRESHOLD", "5"),
 		WAFDisabledRules: env.ruleIDs("SWWAF_WAF_DISABLED_RULES",
 			"920340,920420,920440,920640,930130,930140"),
-		WAFExemptPaths:       env.pathPrefixes("SWWAF_WAF_EXEMPT_PATHS", ""),
-		WAFBodyLimit:         env.wafBodyLimit("SWWAF_WAF_BODY_LIMIT", off),
+		WAFExemptPaths: env.pathPrefixes("SWWAF_WAF_EXEMPT_PATHS", ""),
+		WAFBodyLimit:   env.wafBodyLimit("SWWAF_WAF_BODY_LIMIT", off),
+		CoreRuleSetExclusionsFile: env.filePath(
+			"SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE"),
 		TrapPaths:            env.trapPaths("SWWAF_TRAP_PATHS"),
 		ErrorBurstThreshold:  env.count("SWWAF_ERROR_BURST_THRESHOLD", "30"),
 		LogRemoteURL:         env.logRemoteURL("SWWAF_LOG_REMOTE_URL"),
@@ -575,8 +582,8 @@ func FromEnvironment(lookupEnv func(string) (string, bool)) (*Config, error) {
 // Command reads only SMALLWEBWAF_COMMAND, the command the image runs and its
 // health check checks: rproxy when it is unset or empty, or servewaf. It cannot
 // be given as a file. Any other value is an error that names the setting.
-func Command(lookupEnv func(string) (string, bool)) (string, error) {
-	command, _ := lookupEnv("SMALLWEBWAF_COMMAND")
+func Command(v *viper.Viper) (string, error) {
+	command, _ := readSetting(v, "SMALLWEBWAF_COMMAND")
 
 	switch command {
 	case "", "rproxy":
@@ -591,8 +598,8 @@ func Command(lookupEnv func(string) (string, bool)) (string, error) {
 // ServeWAFListenAddr reads only SWWAF_LISTEN_ADDR, which may be given as a
 // file, as FromEnvironment does. The health check in servewaf's container needs
 // no other setting, so it reads no other, nor a file that another names.
-func ServeWAFListenAddr(lookupEnv func(string) (string, bool)) (string, error) {
-	env := &environment{lookupEnv: lookupEnv}
+func ServeWAFListenAddr(v *viper.Viper) (string, error) {
+	env := &environment{v: v, readFiles: true}
 	listenAddr := env.address("SWWAF_LISTEN_ADDR")
 
 	return listenAddr, env.err
@@ -602,8 +609,8 @@ func ServeWAFListenAddr(lookupEnv func(string) (string, bool)) (string, error) {
 // file, as FromEnvironment does, so that the line saying a setting is
 // invalid carries it too. A file that cannot be read gives the default
 // here, and FromEnvironment then stops the start over it.
-func InstanceName(lookupEnv func(string) (string, bool)) string {
-	env := &environment{lookupEnv: lookupEnv}
+func InstanceName(v *viper.Viper) string {
+	env := &environment{v: v, readFiles: true}
 
 	return env.instanceName()
 }
@@ -619,13 +626,26 @@ func (c *Config) LogValue() slog.Value {
 }
 
 // environment is where FromEnvironment reads the settings: it notes each
-// value for the log, and keeps the first error.
+// value for the log, and keeps the first error. It reads every setting
+// through v, the viper NewViper returns, and, unless readFiles is false,
+// honours each setting's _FILE form too.
 type environment struct {
-	lookupEnv func(string) (string, bool)
+	v         *viper.Viper
+	readFiles bool
 	settings  []slog.Attr
 	err       error
 }
 
+// readSetting returns a setting's value and whether it is set, reading it
+// through v.
+func readSetting(v *viper.Viper, name string) (string, bool) {
+	if !v.IsSet(name) {
+		return "", false
+	}
+
+	return v.GetString(name), true
+}
+
 // value returns a setting's value, or its default when it is not set,
 // and notes it for the log.
 func (e *environment) value(name, defaultValue string) string {
@@ -644,10 +664,14 @@ func (e *environment) value(name, defaultValue string) string {
 // names, less one newline at their end. It notes that file's path for the
 // log. Both variables set, or a file that cannot be read, is an error.
 func (e *environment) lookup(name string) (string, bool) {
-	value, set := e.lookupEnv(name)
+	value, set := readSetting(e.v, name)
+	if !e.readFiles {
+		return value, set
+	}
+
 	fileName := name + "_FILE"
 
-	path, inFile := e.lookupEnv(fileName)
+	path, inFile := readSetting(e.v, fileName)
 	if !inFile {
 		return value, set
 	}
@@ -1189,11 +1213,21 @@ func (e *environment) logRemoteURL(name string) *url.URL {
 	return remote
 }
 
+// filePath reads a setting that is the path of a file, "" while it is
+// unset. Its value names a file already, so, unlike the other settings,
+// it has no _FILE form. Whoever uses the file reads it.
+func (e *environment) filePath(name string) string {
+	path, _ := readSetting(e.v, name)
+	e.settings = append(e.settings, slog.String(name, path))
+
+	return path
+}
+
 // certificates reads a setting that is the path of a file of PEM
 // certificates. Unset or empty, it is nil. Its value names a file
 // already, so, unlike the other settings, it has no _FILE form.
 func (e *environment) certificates(name string) *x509.CertPool {
-	path, _ := e.lookupEnv(name)
+	path, _ := readSetting(e.v, name)
 	e.settings = append(e.settings, slog.String(name, path))
 
 	if path == "" {

internal/config/config_test.go

@@ -17,6 +17,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/anomaly"
 	"sneak.berlin/go/smallwebwaf/internal/config"
 )
@@ -87,6 +89,7 @@ const (
 	wafDisabledRules     = "SWWAF_WAF_DISABLED_RULES"
 	wafExemptPaths       = "SWWAF_WAF_EXEMPT_PATHS"
 	wafBodyLimit         = "SWWAF_WAF_BODY_LIMIT"
+	exclusionsFile       = "SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE"
 	trapPaths            = "SWWAF_TRAP_PATHS"
 	errorBurstThreshold  = "SWWAF_ERROR_BURST_THRESHOLD"
 	logRemoteURL         = "SWWAF_LOG_REMOTE_URL"
@@ -197,7 +200,7 @@ const (
 // instance is an SWWAF_INSTANCE_NAME that is a valid app name too, and
 // remoteURL an SWWAF_LOG_REMOTE_URL, for the tests that send the lines.
 const (
-	instance  = "fsn1app1/gitea"
+	instance  = "fsn1app1/blog"
 	remoteURL = "syslog+udp://192.0.2.1:514"
 )
 
@@ -217,18 +220,22 @@ const (
 // environment is a set of environment variables, for FromEnvironment.
 type environment map[string]string
 
-// lookupEnv reads one of the variables, as os.LookupEnv does.
-func (e environment) lookupEnv(name string) (string, bool) {
-	value, ok := e[name]
+// viper returns a viper Set with each of the variables, as the viper
+// NewViper returns one bound to a process's environment.
+func (e environment) viper() *viper.Viper {
+	v := viper.New()
+	for name, value := range e {
+		v.Set(name, value)
+	}
 
-	return value, ok
+	return v
 }
 
 // fromEnvironment reads the settings from env, which must be valid.
 func fromEnvironment(t *testing.T, env environment) *config.Config {
 	t.Helper()
 
-	cfg, err := config.FromEnvironment(env.lookupEnv)
+	cfg, err := config.FromEnvironment(env.viper())
 	if err != nil {
 		t.Fatalf("settings %v: %v", env, err)
 	}
@@ -455,7 +462,7 @@ func TestPathPrefixNotStartingWithSlashStopsTheStart(t *testing.T) {
 	t.Parallel()
 
 	_, err := config.FromEnvironment(
-		environment{rateLimitExemptPaths: "/favicon.ico,assets/"}.lookupEnv)
+		environment{rateLimitExemptPaths: "/favicon.ico,assets/"}.viper())
 
 	want := rateLimitExemptPaths + `: "assets/" is not a path prefix ` +
 		`starting with /, such as /assets/`
@@ -510,7 +517,7 @@ func TestInvalidTrapPathOrErrorBurstThresholdStopsTheStart(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -539,13 +546,14 @@ func TestCoreRuleSetSettings(t *testing.T) {
 			environment{
 				wafMode: config.WAFModeDetect, wafParanoiaLevel: "4", wafAnomalyThreshold: "10",
 				wafDisabledRules: "942100, 920350", wafExemptPaths: "/api/, /static/",
-				wafBodyLimit: "32K",
+				wafBodyLimit: "32K", exclusionsFile: "/etc/smallwebwaf/crs-exclusions.conf",
 			},
 			config.Config{
 				WAFMode: config.WAFModeDetect, WAFParanoiaLevel: 4, WAFAnomalyThreshold: 10,
-				WAFDisabledRules: []int{942100, 920350},
-				WAFExemptPaths:   []string{"/api/", "/static/"},
-				WAFBodyLimit:     32 << 10,
+				WAFDisabledRules:          []int{942100, 920350},
+				WAFExemptPaths:            []string{"/api/", "/static/"},
+				WAFBodyLimit:              32 << 10,
+				CoreRuleSetExclusionsFile: "/etc/smallwebwaf/crs-exclusions.conf",
 			},
 		},
 		{
@@ -565,7 +573,8 @@ func TestCoreRuleSetSettings(t *testing.T) {
 			WAFMode: cfg.WAFMode, WAFParanoiaLevel: cfg.WAFParanoiaLevel,
 			WAFAnomalyThreshold: cfg.WAFAnomalyThreshold,
 			WAFDisabledRules:    cfg.WAFDisabledRules, WAFExemptPaths: cfg.WAFExemptPaths,
-			WAFBodyLimit: cfg.WAFBodyLimit,
+			WAFBodyLimit:              cfg.WAFBodyLimit,
+			CoreRuleSetExclusionsFile: cfg.CoreRuleSetExclusionsFile,
 		}
 		if !reflect.DeepEqual(got, tc.want) {
 			t.Errorf("%v gave\n%+v\nwant\n%+v", tc.env, got, tc.want)
@@ -636,7 +645,7 @@ func TestInvalidCoreRuleSetSettingStopsTheStart(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -650,11 +659,11 @@ func TestInstanceNameAndLoggedHeadersAsSet(t *testing.T) {
 	t.Parallel()
 
 	cfg := fromEnvironment(t, environment{
-		instanceName:      "fsn1app1/gitea",
+		instanceName:      "fsn1app1/blog",
 		logRequestHeaders: " Accept , X-Custom",
 	})
 
-	if cfg.InstanceName != "fsn1app1/gitea" ||
+	if cfg.InstanceName != "fsn1app1/blog" ||
 		!slices.Equal(cfg.LogRequestHeaders, []string{"accept", "x-custom"}) {
 		t.Errorf("%s is %q and %s gives %v", instanceName, cfg.InstanceName,
 			logRequestHeaders, cfg.LogRequestHeaders)
@@ -761,7 +770,7 @@ func TestInvalidRemoteLogSettingStopsTheStart(t *testing.T) {
 		{logRemoteAppName, ""}, {logRemoteAppName, "my app"},
 		{logRemoteAppName, "gitéa"}, {logRemoteAppName, strings.Repeat("a", 49)},
 	} {
-		_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+		_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 		if err == nil || !strings.HasPrefix(err.Error(), tc.name+": ") {
 			t.Errorf("%s=%q: error %v, want one naming it", tc.name, tc.value, err)
 		}
@@ -778,7 +787,7 @@ func TestRemoteLogCAFileWithoutCertificateStopsTheStart(t *testing.T) {
 		t.Fatalf("write %s: %v", caFile, err)
 	}
 
-	_, err = config.FromEnvironment(environment{logRemoteTLSCAFile: caFile}.lookupEnv)
+	_, err = config.FromEnvironment(environment{logRemoteTLSCAFile: caFile}.viper())
 
 	want := logRemoteTLSCAFile + `: "` + caFile + `" holds no PEM certificate`
 	if err == nil || err.Error() != want {
@@ -793,11 +802,11 @@ func TestInstanceNameNotAnAppNameStopsTheStartOnlyWhileSending(t *testing.T) {
 
 	sending := environment{logRemoteURL: remoteURL, instanceName: spaced}
 
-	_, err := config.FromEnvironment(sending.lookupEnv)
+	_, err := config.FromEnvironment(sending.viper())
 
 	want := logRemoteAppName + `: is unset, and ` + instanceName +
 		` "fsn1 app1", its default, is not 1 to 48 printable ASCII characters ` +
-		`without a space, such as gitea`
+		`without a space, such as blog`
 	if err == nil || err.Error() != want {
 		t.Errorf("error %v, want %s", err, want)
 	}
@@ -823,10 +832,10 @@ func TestAppNameSetStopsTheStartWhileSending(t *testing.T) {
 		logRemoteURL:     remoteURL,
 		instanceName:     instance,
 		logRemoteAppName: "my app",
-	}.lookupEnv)
+	}.viper())
 
 	want := logRemoteAppName + `: "my app" is not 1 to 48 printable ASCII ` +
-		`characters without a space, such as gitea`
+		`characters without a space, such as blog`
 	if err == nil || err.Error() != want {
 		t.Errorf("error %v, want %s", err, want)
 	}
@@ -954,7 +963,7 @@ func TestWebhookHeadersAreLoggedMaskedAndNeverShown(t *testing.T) {
 	// An item that is not a header is named by its place, not shown.
 	_, err := config.FromEnvironment(environment{
 		alertWebhookHeaders: "X-Team:ops," + secret,
-	}.lookupEnv)
+	}.viper())
 
 	want := alertWebhookHeaders + ": item 2 is not a header name followed by : " +
 		"and the header's value, such as Authorization:Bearer <token>"
@@ -991,7 +1000,7 @@ func TestWebhookURLIsLoggedWithoutItsPathOrQueryAndNeverShown(t *testing.T) {
 		"ftp://hooks.example/services/" + secret,
 		"https://hooks.example/services/%zz" + secret,
 	} {
-		_, err := config.FromEnvironment(environment{alertWebhookURL: value}.lookupEnv)
+		_, err := config.FromEnvironment(environment{alertWebhookURL: value}.viper())
 
 		want := alertWebhookURL + ": is not an http or https URL without a user or " +
 			"a fragment, such as https://alerts.example/smallwebwaf"
@@ -1042,7 +1051,7 @@ func TestNtfyTokenWithAControlCharacterStopsTheStartWithoutShowingIt(t *testing.
 		"set":       {alertNtfyToken: token + "\r"},
 		"in a file": {alertNtfyToken + "_FILE": writeFile(t, token+"\r\n")},
 	} {
-		_, err := config.FromEnvironment(env.lookupEnv)
+		_, err := config.FromEnvironment(env.viper())
 
 		want := alertNtfyToken + ": holds a control character, such as the " +
 			"carriage return of a Windows line end"
@@ -1059,7 +1068,7 @@ func TestInstanceNameWithAControlCharacterStopsTheStartOnlyWithNtfySet(t *testin
 
 	_, err := config.FromEnvironment(environment{
 		instanceName: name, alertNtfyURL: "https://ntfy.example/smallwebwaf-alerts",
-	}.lookupEnv)
+	}.viper())
 
 	want := instanceName + `: "fsn1app1\r" holds a control character, such as the ` +
 		`carriage return of a Windows line end, and is sent to ntfy in a header ` +
@@ -1084,7 +1093,7 @@ func TestInstanceNameNotUTF8StopsTheStart(t *testing.T) {
 		"set":       {instanceName: latin1},
 		"in a file": {instanceName + "_FILE": writeFile(t, latin1+"\n")},
 	} {
-		_, err := config.FromEnvironment(env.lookupEnv)
+		_, err := config.FromEnvironment(env.viper())
 
 		want := instanceName + `: "caf\xe9" is not valid UTF-8`
 		if err == nil || err.Error() != want {
@@ -1099,7 +1108,7 @@ func TestCodeOnBothCountryListsStopsTheStart(t *testing.T) {
 	_, err := config.FromEnvironment(environment{
 		deniedCountries:  "cn,ru",
 		allowedCountries: "de,RU",
-	}.lookupEnv)
+	}.viper())
 	if err == nil {
 		t.Fatal("ru on both country lists was accepted")
 	}
@@ -1161,7 +1170,7 @@ func TestLookupDBPathGoesWithTheFileSourceAlone(t *testing.T) {
 			lookupDBPath + ": is set while " + lookupSource + " is off; only file reads it",
 		},
 	} {
-		_, err := config.FromEnvironment(tc.env.lookupEnv)
+		_, err := config.FromEnvironment(tc.env.viper())
 		if err == nil || err.Error() != tc.want {
 			t.Errorf("settings %v: error %v, want %s", tc.env, err, tc.want)
 		}
@@ -1191,7 +1200,7 @@ func TestSettingNeedingLookupsStopsTheStartWhileTheyAreOff(t *testing.T) {
 
 			_, err := config.FromEnvironment(environment{
 				lookupSource: off, name: value,
-			}.lookupEnv)
+			}.viper())
 			if err == nil || !strings.HasPrefix(err.Error(), name+": ") ||
 				!strings.Contains(err.Error(), lookupSource+" is off") {
 				t.Errorf("error %v, want one naming %s and %s", err, name, lookupSource)
@@ -1341,7 +1350,7 @@ func TestInvalidAnomalySettingStopsTheStartSayingWhatIsWrong(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -1420,7 +1429,7 @@ func TestInvalidBiasedThresholdStopsTheStartSayingWhatIsWrong(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -1517,7 +1526,7 @@ func TestInvalidReputationSettingStopsTheStartSayingWhatIsWrong(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -1532,7 +1541,7 @@ func TestASNLimitPercentURLThatIsABlocklistStopsTheStart(t *testing.T) {
 
 	_, err := config.FromEnvironment(environment{
 		blocklistURLs: dropURL + "," + asnURL, asnLimitPercentURL: asnURL,
-	}.lookupEnv)
+	}.viper())
 
 	want := asnLimitPercentURL + `: "` + asnURL + `" is in SWWAF_BLOCKLIST_URLS too`
 	if err == nil || err.Error() != want {
@@ -1659,7 +1668,7 @@ func TestInvalidDNSBLSettingStopsTheStartSayingWhatIsWrong(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -1727,7 +1736,7 @@ func TestDNSBLZoneKeyIsLoggedMaskedAndNeverShown(t *testing.T) {
 		{spamhaus + "," + otherZone, `"` + spamhausMasked + `" is listed twice`},
 		{spamhaus + ",,", "has an empty item in its list"},
 	} {
-		_, err := config.FromEnvironment(environment{dnsblZones: tc.value}.lookupEnv)
+		_, err := config.FromEnvironment(environment{dnsblZones: tc.value}.viper())
 
 		want := dnsblZones + ": " + tc.want
 		if err == nil || err.Error() != want {
@@ -1780,7 +1789,7 @@ func TestInvalidAbuseIPDBSettingStopsTheStartSayingWhatIsWrong(t *testing.T) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 
 			want := tc.name + ": " + tc.want
 			if err == nil || err.Error() != want {
@@ -1894,7 +1903,7 @@ func TestInvalidCrowdSecSettingStopsTheStartSayingWhatIsWrong(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(tc.env.lookupEnv)
+			_, err := config.FromEnvironment(tc.env.viper())
 			if err == nil || err.Error() != tc.want {
 				t.Errorf("error %v, want %s", err, tc.want)
 			}
@@ -2054,7 +2063,7 @@ func wantStartStopped(t *testing.T, invalid []struct{ name, value string }) {
 		t.Run(tc.name+"="+tc.value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{tc.name: tc.value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{tc.name: tc.value}.viper())
 			if err == nil {
 				t.Fatalf("%s=%q was accepted", tc.name, tc.value)
 			}
@@ -2079,7 +2088,7 @@ func TestHostOrTransferEncodingStopsTheStart(t *testing.T) {
 		t.Run(value, func(t *testing.T) {
 			t.Parallel()
 
-			_, err := config.FromEnvironment(environment{logRequestHeaders: value}.lookupEnv)
+			_, err := config.FromEnvironment(environment{logRequestHeaders: value}.viper())
 			if err == nil || err.Error() != logRequestHeaders+": "+want {
 				t.Errorf("error %v, want %s: %s", err, logRequestHeaders, want)
 			}
@@ -2096,7 +2105,7 @@ func TestShortTokenStopsTheStartWithoutShowingIt(t *testing.T) {
 			t.Run(name+"="+value, func(t *testing.T) {
 				t.Parallel()
 
-				_, err := config.FromEnvironment(environment{name: value}.lookupEnv)
+				_, err := config.FromEnvironment(environment{name: value}.viper())
 
 				want := name + ": is shorter than 32 characters"
 				if err == nil || err.Error() != want {
@@ -2152,7 +2161,7 @@ func TestSettingFromFileIsCheckedAsTheSettingItself(t *testing.T) {
 
 	_, err := config.FromEnvironment(environment{
 		bytesLimitPerMinute + "_FILE": writeFile(t, "lots\n"),
-	}.lookupEnv)
+	}.viper())
 
 	want := bytesLimitPerMinute + `: "lots" is not a size such as 512K, 100M or 5G, or off`
 	if err == nil || err.Error() != want {
@@ -2163,10 +2172,10 @@ func TestSettingFromFileIsCheckedAsTheSettingItself(t *testing.T) {
 		logRemoteURL:               remoteURL,
 		instanceName:               instance,
 		logRemoteAppName + "_FILE": writeFile(t, "my app\n"),
-	}.lookupEnv)
+	}.viper())
 
 	want = logRemoteAppName + `: "my app" is not 1 to 48 printable ASCII ` +
-		`characters without a space, such as gitea`
+		`characters without a space, such as blog`
 	if err == nil || err.Error() != want {
 		t.Errorf("error %v, want %s", err, want)
 	}
@@ -2178,7 +2187,7 @@ func TestSettingAndItsFileBothSetStopsTheStart(t *testing.T) {
 	_, err := config.FromEnvironment(environment{
 		metricsToken:           token,
 		metricsToken + "_FILE": writeFile(t, token),
-	}.lookupEnv)
+	}.viper())
 
 	want := metricsToken + ": is set, and so is " + metricsToken +
 		"_FILE; set only one of them"
@@ -2193,7 +2202,7 @@ func TestUnreadableSettingFileStopsTheStart(t *testing.T) {
 	dir := t.TempDir()
 
 	for _, path := range []string{filepath.Join(dir, "missing"), dir} {
-		_, err := config.FromEnvironment(environment{metricsToken + "_FILE": path}.lookupEnv)
+		_, err := config.FromEnvironment(environment{metricsToken + "_FILE": path}.viper())
 
 		want := metricsToken + "_FILE: cannot be read: "
 		if err == nil || !strings.HasPrefix(err.Error(), want) {
@@ -2327,6 +2336,7 @@ func TestLogsEachSettingWithItsValue(t *testing.T) {
 		wafDisabledRules:     defaultWAFDisabledRules,
 		wafExemptPaths:       "",
 		wafBodyLimit:         off,
+		exclusionsFile:       "",
 		trapPaths:            "",
 		errorBurstThreshold:  "30",
 		logRemoteURL:         "",

internal/config/rproxy.go

@@ -8,8 +8,9 @@ import (
 	"net/netip"
 	"net/url"
 	"strconv"
-	"strings"
 	"time"
+
+	"github.com/spf13/viper"
 )
 
 // RProxy is the settings of `smallwebwaf rproxy`. A size or time limit of zero
@@ -58,13 +59,14 @@ var (
 		"is not a whole number of milliseconds above zero, such as 60000, or off")
 )
 
-// RProxyFromEnvironment reads rproxy's settings with lookupEnv, normally
-// os.LookupEnv. A setting that is not set takes its default, and
-// SWRP_WAF_BACKEND, which has none, must be set. A setting that is set but
-// invalid is an error that names it. Since rproxy never touches disk, its
-// settings have no _FILE form.
-func RProxyFromEnvironment(lookupEnv func(string) (string, bool)) (*RProxy, error) {
-	env := &environment{lookupEnv: withoutFileForms(lookupEnv)}
+// RProxyFromEnvironment reads rproxy's settings through v, normally the viper
+// NewViper returns, bound to the process's environment. A setting that is not
+// set takes its default, and SWRP_WAF_BACKEND, which has none, must be set. A
+// setting may instead be given as a file: the variable named by the setting's
+// name with _FILE added names the file, which is read now. A setting that is
+// set but invalid is an error that names it.
+func RProxyFromEnvironment(v *viper.Viper) (*RProxy, error) {
+	env := &environment{v: v, readFiles: true}
 	cfg := &RProxy{
 		ListenAddr:         env.address("SWRP_LISTEN_ADDR"),
 		UpstreamURL:        env.appURL("SWRP_UPSTREAM_URL", defaultUpstreamURL),
@@ -91,9 +93,9 @@ func RProxyFromEnvironment(lookupEnv func(string) (string, bool)) (*RProxy, erro
 // SWRP_UPSTREAM_URL. The health check in rproxy's container needs no other
 // setting, so it reads no other.
 func RProxyListenAddrAndUpstreamURL(
-	lookupEnv func(string) (string, bool),
+	v *viper.Viper,
 ) (string, *url.URL, error) {
-	env := &environment{lookupEnv: withoutFileForms(lookupEnv)}
+	env := &environment{v: v, readFiles: true}
 	listenAddr := env.address("SWRP_LISTEN_ADDR")
 	upstreamURL := env.appURL("SWRP_UPSTREAM_URL", defaultUpstreamURL)
 
@@ -104,20 +106,6 @@ func RProxyListenAddrAndUpstreamURL(
 	return listenAddr, upstreamURL, nil
 }
 
-// withoutFileForms returns lookupEnv finding no setting named with _FILE, since
-// rproxy never touches disk.
-func withoutFileForms(
-	lookupEnv func(string) (string, bool),
-) func(string) (string, bool) {
-	return func(name string) (string, bool) {
-		if strings.HasSuffix(name, "_FILE") {
-			return "", false
-		}
-
-		return lookupEnv(name)
-	}
-}
-
 // LogValue makes an RProxy log as each setting's name with the value it was
 // given, or its default.
 func (c *RProxy) LogValue() slog.Value {

internal/config/rproxy_test.go

@@ -9,6 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/config"
 )
 
@@ -32,11 +34,12 @@ const (
 
 // rproxyConfig reads rproxy's settings from env.
 func rproxyConfig(env map[string]string) (*config.RProxy, error) {
-	return config.RProxyFromEnvironment(func(name string) (string, bool) {
-		value, ok := env[name]
+	v := viper.New()
+	for name, value := range env {
+		v.Set(name, value)
+	}
 
-		return value, ok
-	})
+	return config.RProxyFromEnvironment(v)
 }
 
 func TestRProxyDefaults(t *testing.T) {
@@ -177,31 +180,41 @@ func TestRProxyNeedsItsBackend(t *testing.T) {
 	}
 }
 
-func TestRProxyReadsNoFile(t *testing.T) {
+func TestRProxySettingReadFromFile(t *testing.T) {
 	t.Parallel()
 
 	path := filepath.Join(t.TempDir(), "backend")
 
-	err := os.WriteFile(path, []byte("http://from-a-file:8080\n"), 0o600)
+	err := os.WriteFile(path, []byte(backendURL+"\n"), 0o600)
 	if err != nil {
 		t.Fatalf("write: %v", err)
 	}
 
-	_, err = rproxyConfig(map[string]string{wafBackend + "_FILE": path})
-	if err == nil || !strings.HasPrefix(err.Error(), wafBackend+": is required") {
-		t.Errorf("error %v, want %s still required", err, wafBackend)
-	}
-
-	cfg, err := rproxyConfig(map[string]string{
-		wafBackend:              backendURL,
-		rproxyTimeout + "_FILE": "/nonexistent/timeout",
-	})
+	cfg, err := rproxyConfig(map[string]string{wafBackend + "_FILE": path})
 	if err != nil {
-		t.Fatalf("settings: %v, with the file left unread", err)
+		t.Fatalf("settings: %v", err)
 	}
 
-	if cfg.Timeout != 2*time.Second {
-		t.Errorf("timeout %v, want the default", cfg.Timeout)
+	if cfg.WAFBackend.String() != backendURL {
+		t.Errorf("backend %v, want %s", cfg.WAFBackend, backendURL)
+	}
+}
+
+func TestRProxyUnreadableSettingFileStopsTheStart(t *testing.T) {
+	t.Parallel()
+
+	dir := t.TempDir()
+
+	for _, path := range []string{filepath.Join(dir, "missing"), dir} {
+		_, err := rproxyConfig(map[string]string{
+			wafBackend:              backendURL,
+			rproxyTimeout + "_FILE": path,
+		})
+
+		want := rproxyTimeout + "_FILE: cannot be read: "
+		if err == nil || !strings.HasPrefix(err.Error(), want) {
+			t.Errorf("%s: error %v, want one starting %s", path, err, want)
+		}
 	}
 }
 

internal/config/viper.go

@@ -0,0 +1,16 @@
+package config
+
+import "github.com/spf13/viper"
+
+// NewViper returns the viper that reads the settings: each setting's
+// environment variable, bound to its own name. Every setting of servewaf and
+// rproxy is read through it, and none is read with os.Getenv or os.LookupEnv
+// outside it. An environment variable that is set but empty is set, as one
+// that holds a value is, which viper does not take for granted.
+func NewViper() *viper.Viper {
+	v := viper.New()
+	v.AutomaticEnv()
+	v.AllowEmptyEnv(true)
+
+	return v
+}

internal/remotelog/remotelog_test.go

@@ -44,7 +44,7 @@ import (
 const (
 	// started is the time a record made as a test starts gives.
 	started = "2000-01-01T00:00:00.000Z"
-	appName = "fsn1app1/gitea"
+	appName = "fsn1app1/blog"
 	// local0 is the number of the default facility, and local0Info the
 	// priority of its records.
 	local0     = 16
@@ -94,7 +94,7 @@ func TestRecordsOverTCPAreOctetCountedWithTheirFacility(t *testing.T) {
 		endpoint := listen(t)
 		endpointParams := params(remotelog.SchemeTCP, endpoint.Addr())
 		endpointParams.Facility = 19 // local3
-		endpointParams.AppName = "gitea"
+		endpointParams.AppName = "blog"
 		sender, _, _ := run(t, endpointParams)
 
 		_, _ = sender.Write([]byte("first\nsecond\n"))
@@ -103,8 +103,8 @@ func TestRecordsOverTCPAreOctetCountedWithTheirFacility(t *testing.T) {
 		wantCounts(t, sender, 2, 0, 0)
 
 		frames := bufio.NewReader(accept(t, endpoint))
-		wantFrame(t, frames, record(t, "<158>", "gitea", "first"))
-		wantFrame(t, frames, record(t, "<158>", "gitea", "second"))
+		wantFrame(t, frames, record(t, "<158>", "blog", "first"))
+		wantFrame(t, frames, record(t, "<158>", "blog", "second"))
 	})
 }
 

internal/requestlog/requestlog_test.go

@@ -94,7 +94,7 @@ func TestProcessLinesAreMarkedProcessAndGiveTheInstance(t *testing.T) {
 
 	var out bytes.Buffer
 
-	requestlog.NewProcessLogger(&out, "fsn1app1/gitea", slog.LevelInfo).Info("starting",
+	requestlog.NewProcessLogger(&out, "fsn1app1/blog", slog.LevelInfo).Info("starting",
 		"version", "v1")
 
 	var fields map[string]any
@@ -104,7 +104,7 @@ func TestProcessLinesAreMarkedProcessAndGiveTheInstance(t *testing.T) {
 		t.Fatalf("decode %q: %v", out.String(), err)
 	}
 
-	if fields["type"] != "process" || fields["instance"] != "fsn1app1/gitea" ||
+	if fields["type"] != "process" || fields["instance"] != "fsn1app1/blog" ||
 		fields["msg"] != "starting" || fields["level"] != "INFO" ||
 		fields["version"] != "v1" {
 		t.Errorf("process line %v", fields)
@@ -133,7 +133,7 @@ func TestProcessLoggerWritesTheMessagesAtItsLevelOrMoreSevere(t *testing.T) {
 
 			var out bytes.Buffer
 
-			processLog := requestlog.NewProcessLogger(&out, "fsn1app1/gitea", level)
+			processLog := requestlog.NewProcessLogger(&out, "fsn1app1/blog", level)
 			for _, at := range levels {
 				processLog.Log(t.Context(), at, "message")
 			}

internal/rproxy/limits_test.go

@@ -16,9 +16,9 @@ import (
 	"time"
 
 	"sneak.berlin/go/smallwebwaf/internal/config"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
 	"sneak.berlin/go/smallwebwaf/internal/rproxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // post is the start of a POST whose headers end with what follows it.
@@ -33,13 +33,9 @@ func announcedLength(size int) string {
 func TestServerHasTheFixedLimits(t *testing.T) {
 	t.Parallel()
 
-	cfg, err := config.RProxyFromEnvironment(func(name string) (string, bool) {
-		if name == "SWRP_WAF_BACKEND" {
-			return nowhere, true
-		}
-
-		return "", false
-	})
+	cfg, err := config.RProxyFromEnvironment(viperFrom(map[string]string{
+		"SWRP_WAF_BACKEND": nowhere,
+	}))
 	if err != nil {
 		t.Fatalf("settings: %v", err)
 	}
@@ -71,11 +67,11 @@ func TestABodyAnnouncedOverItsLimitIsRefusedOnceServeWAFAllowsIt(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, func(http.ResponseWriter, *http.Request) {
 				t.Error("the app was asked")
 			})
-			addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				maxRequestSize: tc.limit,
 			})
 
@@ -85,11 +81,11 @@ func TestABodyAnnouncedOverItsLimitIsRefusedOnceServeWAFAllowsIt(t *testing.T) {
 				t.Errorf("answered %+v, want 413", got)
 			}
 
-			if asked := servewaf.question(t); len(asked.body) != tc.asked {
+			if asked := standIn.question(t); len(asked.body) != tc.asked {
 				t.Errorf("the question carries %d bytes, want %d", len(asked.body), tc.asked)
 			}
 
-			report := servewaf.report(t)
+			report := standIn.report(t)
 			if report.Status != http.StatusRequestEntityTooLarge {
 				t.Errorf("report %+v, want status 413", report)
 			}
@@ -100,9 +96,9 @@ func TestABodyAnnouncedOverItsLimitIsRefusedOnceServeWAFAllowsIt(t *testing.T) {
 func TestADenyOutranksTheBodySizeLimit(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, deny)
+	standIn := startServeWAF(t, deny)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxRequestSize: "1K",
 	})
 
@@ -132,12 +128,12 @@ func TestABodyNotAnnouncedOverItsLimitIsRefused(t *testing.T) {
 
 			var asked atomic.Bool
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
 				asked.Store(true)
 				greet(w, r)
 			})
-			addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				maxRequestSize: tc.limit,
 			})
 
@@ -165,12 +161,12 @@ func TestAResponseOverItsLimit(t *testing.T) {
 	t.Run("announced, is refused", func(t *testing.T) {
 		t.Parallel()
 
-		servewaf := startServeWAF(t, allow)
+		standIn := startServeWAF(t, allow)
 		app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 			w.Header().Set(contentLengthHeader, strconv.Itoa(len(large)))
 			_, _ = io.WriteString(w, large)
 		})
-		addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+		addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 			maxResponseSize: "1K",
 		})
 
@@ -179,7 +175,7 @@ func TestAResponseOverItsLimit(t *testing.T) {
 			t.Errorf("answered %d, want 502", got.status)
 		}
 
-		if report := servewaf.report(t); report.Status != http.StatusBadGateway {
+		if report := standIn.report(t); report.Status != http.StatusBadGateway {
 			t.Errorf("report %+v, want status 502", report)
 		}
 	})
@@ -187,13 +183,13 @@ func TestAResponseOverItsLimit(t *testing.T) {
 	t.Run("not announced, is cut off", func(t *testing.T) {
 		t.Parallel()
 
-		servewaf := startServeWAF(t, allow)
+		standIn := startServeWAF(t, allow)
 		app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 			_, _ = io.WriteString(w, large[:1])
 			_ = http.NewResponseController(w).Flush()
 			_, _ = io.WriteString(w, large[1:])
 		})
-		addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+		addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 			maxResponseSize: "1K",
 		})
 
@@ -205,7 +201,7 @@ func TestAResponseOverItsLimit(t *testing.T) {
 			t.Errorf("read %d bytes (%v), want the answer cut off", len(text), err)
 		}
 
-		report := servewaf.report(t)
+		report := standIn.report(t)
 		if report.Status != http.StatusOK || report.ResponseBytes > 1<<10 {
 			t.Errorf("report %+v, want status 200 and at most 1K of the answer", report)
 		}
@@ -217,11 +213,11 @@ func TestAHeadWhoseAnswerAnnouncesMoreThanTheResponseLimitIsPassedOn(t *testing.
 
 	const announced = "2048"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set(contentLengthHeader, announced)
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxResponseSize: "1K",
 	})
 
@@ -240,9 +236,9 @@ func TestASettingOfOffSetsNoLimit(t *testing.T) {
 		t.Run(setting, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, greet)
-			addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				setting: "off",
 			})
 
@@ -251,7 +247,7 @@ func TestASettingOfOffSetsNoLimit(t *testing.T) {
 			wantGreeting(t, visit(t, newRequest(t, http.MethodPost, addr, "/",
 				strings.NewReader("a body"))))
 
-			if got := get(t, addr, proxy.HealthPath); got.status != http.StatusOK {
+			if got := get(t, addr, servewaf.HealthPath); got.status != http.StatusOK {
 				t.Errorf("answered %+v, want rproxy's own 200", got)
 			}
 		})
@@ -270,9 +266,9 @@ func TestAVisitorTooSlowToSendTheFirstPartIsAnswered408(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, greet)
-			addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				maxRequestTime: "500",
 			})
 
@@ -288,11 +284,11 @@ func TestAVisitorTooSlowToSendTheFirstPartIsAnswered408(t *testing.T) {
 				t.Errorf("line %v, want no disposition and 10 bytes", line)
 			}
 
-			if len(servewaf.questions) != 0 {
+			if len(standIn.questions) != 0 {
 				t.Error("servewaf was asked")
 			}
 
-			servewaf.wantNoReport(t)
+			standIn.wantNoReport(t)
 		})
 	}
 }
@@ -300,9 +296,9 @@ func TestAVisitorTooSlowToSendTheFirstPartIsAnswered408(t *testing.T) {
 func TestAVisitorThatGoesAwayBeforeTheFirstPartIsNotAsked(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, post+announcedLength(100)+"some of it")
@@ -313,7 +309,7 @@ func TestAVisitorThatGoesAwayBeforeTheFirstPartIsNotAsked(t *testing.T) {
 		t.Errorf("line %v, want no answer and no disposition", line)
 	}
 
-	if len(servewaf.questions) != 0 {
+	if len(standIn.questions) != 0 {
 		t.Error("servewaf was asked")
 	}
 }
@@ -334,9 +330,9 @@ func TestABodyThatCannotBeReadClosesTheConnectionWithoutAnAnswer(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, greet)
-			addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+			addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 			conn := dial(t, addr)
 			send(t, conn, tc.request)
@@ -364,7 +360,7 @@ func TestABodyThatCannotBeReadClosesTheConnectionWithoutAnAnswer(t *testing.T) {
 				t.Errorf("line %v, want no answer and no disposition", line)
 			}
 
-			if len(servewaf.questions) != 0 {
+			if len(standIn.questions) != 0 {
 				t.Error("servewaf was asked")
 			}
 		})
@@ -404,11 +400,11 @@ func TestABodyLeftUnreadIsReadOnlyUntilTheRequestTimeLimit(t *testing.T) {
 		announced = 100 * questionBodyMaxBytes
 	)
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusNoContent)
 	})
-	_, _, server := startServer(t, servewaf.URL, app.URL, map[string]string{
+	_, _, server := startServer(t, standIn.URL, app.URL, map[string]string{
 		maxRequestTime: strconv.FormatInt(limit.Milliseconds(), 10),
 	})
 
@@ -454,9 +450,9 @@ func TestAnAnswerRProxyGivesItselfHasTheResponseTimeToBeSent(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, deny)
+			standIn := startServeWAF(t, deny)
 			app := startApp(t, greet)
-			_, _, server := startServer(t, servewaf.URL, app.URL, map[string]string{
+			_, _, server := startServer(t, standIn.URL, app.URL, map[string]string{
 				maxResponseTime: strconv.FormatInt(limit.Milliseconds(), 10),
 			})
 
@@ -484,9 +480,9 @@ func TestAnAnswerRProxyGivesItselfHasTheResponseTimeToBeSent(t *testing.T) {
 func TestAVisitorTooSlowToSendTheRestIsAnswered408(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxRequestTime: "3000",
 	})
 
@@ -498,11 +494,11 @@ func TestAVisitorTooSlowToSendTheRestIsAnswered408(t *testing.T) {
 		t.Errorf("status %d, want 408", status)
 	}
 
-	if asked := servewaf.question(t); len(asked.body) != questionBodyMaxBytes {
+	if asked := standIn.question(t); len(asked.body) != questionBodyMaxBytes {
 		t.Errorf("the question carries %d bytes", len(asked.body))
 	}
 
-	if report := servewaf.report(t); report.Status != http.StatusRequestTimeout {
+	if report := standIn.report(t); report.Status != http.StatusRequestTimeout {
 		t.Errorf("report %+v, want status 408", report)
 	}
 }
@@ -553,8 +549,8 @@ func TestAnAppTooSlowToTakeTheRequestIsAnswered504(t *testing.T) {
 		writeSize = 32 << 10
 	)
 
-	servewaf := startServeWAF(t, allow)
-	addr, _ := startRProxy(t, servewaf.URL, startAppThatTakesNothing(t),
+	standIn := startServeWAF(t, allow)
+	addr, _ := startRProxy(t, standIn.URL, startAppThatTakesNothing(t),
 		map[string]string{maxRequestTime: "3000"})
 
 	conn := dial(t, addr)
@@ -580,14 +576,14 @@ func TestAnAppTooSlowToAnswerIsAnswered504(t *testing.T) {
 	t.Parallel()
 
 	release := make(chan struct{})
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(http.ResponseWriter, *http.Request) {
 		<-release
 	})
 
 	t.Cleanup(func() { close(release) })
 
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxResponseTime: "300",
 	})
 
@@ -596,7 +592,7 @@ func TestAnAppTooSlowToAnswerIsAnswered504(t *testing.T) {
 		t.Errorf("answered %d, want 504", got.status)
 	}
 
-	if report := servewaf.report(t); report.Status != http.StatusGatewayTimeout {
+	if report := standIn.report(t); report.Status != http.StatusGatewayTimeout {
 		t.Errorf("report %+v, want status 504", report)
 	}
 }
@@ -607,7 +603,7 @@ func TestAnAppTooSlowToFinishItsAnswerIsCutOff(t *testing.T) {
 	const start = "the start"
 
 	release := make(chan struct{})
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = io.WriteString(w, start)
 		_ = http.NewResponseController(w).Flush()
@@ -619,7 +615,7 @@ func TestAnAppTooSlowToFinishItsAnswerIsCutOff(t *testing.T) {
 
 	// The time limit is long enough for a loaded host to pass on the start of the
 	// answer before it runs out.
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxResponseTime: "3000",
 	})
 
@@ -642,7 +638,7 @@ func TestAnAppTooSlowToFinishItsAnswerIsCutOff(t *testing.T) {
 			res.StatusCode, body, err, start)
 	}
 
-	if report := servewaf.report(t); report.Status != http.StatusOK {
+	if report := standIn.report(t); report.Status != http.StatusOK {
 		t.Errorf("report %+v, want the status the visitor got", report)
 	}
 }
@@ -656,7 +652,7 @@ func TestAVisitorTooSlowToTakeTheAnswerIsCutOff(t *testing.T) {
 		writeSize = 32 << 10
 	)
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		part := make([]byte, writeSize)
 
@@ -669,7 +665,7 @@ func TestAVisitorTooSlowToTakeTheAnswerIsCutOff(t *testing.T) {
 	})
 	// The time limit is long enough for a loaded host to start passing on the
 	// answer before it runs out.
-	addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxResponseTime: "3000",
 	})
 
@@ -684,7 +680,7 @@ func TestAVisitorTooSlowToTakeTheAnswerIsCutOff(t *testing.T) {
 		t.Errorf("line %v, want status 200 and the answer cut off", line)
 	}
 
-	report := servewaf.report(t)
+	report := standIn.report(t)
 	if report.Status != http.StatusOK || report.ResponseBytes >= bodySize {
 		t.Errorf("report %+v, want status 200 and the answer cut off", report)
 	}
@@ -693,15 +689,15 @@ func TestAVisitorTooSlowToTakeTheAnswerIsCutOff(t *testing.T) {
 func TestAnAppThatCannotBeReachedIsAnswered502WithAReport(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
-	addr, _ := startRProxy(t, servewaf.URL, nowhere, nil)
+	standIn := startServeWAF(t, allow)
+	addr, _ := startRProxy(t, standIn.URL, nowhere, nil)
 
 	got := get(t, addr, "/")
 	if got.status != http.StatusBadGateway {
 		t.Errorf("answered %d, want 502", got.status)
 	}
 
-	if report := servewaf.report(t); report.Status != http.StatusBadGateway {
+	if report := standIn.report(t); report.Status != http.StatusBadGateway {
 		t.Errorf("report %+v, want status 502", report)
 	}
 }
@@ -709,11 +705,11 @@ func TestAnAppThatCannotBeReachedIsAnswered502WithAReport(t *testing.T) {
 func TestAVisitorThatStopsSendingAfterTheAppHasAnsweredGetsTheAnswer(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		_, _ = io.WriteString(w, greeting)
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxRequestTime: "3000",
 	})
 
@@ -732,12 +728,12 @@ func TestAVisitorThatStopsSendingWhileTheAppWorksGetsNoAnswer(t *testing.T) {
 	t.Parallel()
 
 	working := make(chan struct{})
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(_ http.ResponseWriter, r *http.Request) {
 		close(working)
 		<-r.Context().Done()
 	})
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, "GET / HTTP/1.1\r\nHost: site.example\r\n\r\n")
@@ -773,7 +769,7 @@ func TestTheRequestTimeLimitDoesNotCutAnAnswerOnceTheAppHasTheRequest(t *testing
 
 	const answer = "the end of a long answer"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
 		_, _ = io.Copy(io.Discard, r.Body)
 		_ = http.NewResponseController(w).Flush()
@@ -782,7 +778,7 @@ func TestTheRequestTimeLimitDoesNotCutAnAnswerOnceTheAppHasTheRequest(t *testing
 
 		_, _ = io.WriteString(w, answer)
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxRequestTime: "2000",
 	})
 
@@ -802,18 +798,18 @@ func TestAVisitorThatStopsSendingGetsAnAnswerRProxyGivesByTheDeadline(t *testing
 		{"a deny", post, http.StatusForbidden},
 		{
 			"the health check",
-			"GET " + proxy.HealthPath + " HTTP/1.1\r\nHost: site.example\r\n",
+			"GET " + servewaf.HealthPath + " HTTP/1.1\r\nHost: site.example\r\n",
 			http.StatusOK,
 		},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, deny)
+			standIn := startServeWAF(t, deny)
 			app := startApp(t, greet)
 			// The time limit is long enough for a loaded host to read the first part of
 			// the body before it runs out.
-			addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				maxRequestTime: "3000",
 			})
 

internal/rproxy/question_test.go

@@ -12,11 +12,11 @@ import (
 	"strings"
 	"testing"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // questionBodyMaxBytes is the most of a body a question carries.
-const questionBodyMaxBytes = proxy.QuestionBodyMaxBytes
+const questionBodyMaxBytes = servewaf.QuestionBodyMaxBytes
 
 // chunked is the encoding of a body whose length the visitor did not announce.
 const chunked = "chunked"
@@ -29,9 +29,9 @@ const pathGoReencodes = "/some%2Fpath/with%20space|pipe"
 func TestQuestionIsTheVisitorsRequestWithRProxysHeaders(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	const target = pathGoReencodes + "?b=2&a=1&bad=%zz;x"
 
@@ -42,16 +42,16 @@ func TestQuestionIsTheVisitorsRequestWithRProxysHeaders(t *testing.T) {
 	req.Header.Set(forwardedForHeader, "198.51.100.1")
 	req.Header.Set(forwardedProtoHeader, "gopher")
 	req.Header.Set(requestIDHeader, "the-visitor's")
-	req.Header.Set(proxy.ClientHeader, "198.51.100.2")
-	req.Header.Set(proxy.PeerHeader, "198.51.100.3")
-	req.Header.Set(proxy.ContentLengthHeader, "12345")
+	req.Header.Set(servewaf.ClientHeader, "198.51.100.2")
+	req.Header.Set(servewaf.PeerHeader, "198.51.100.3")
+	req.Header.Set(servewaf.ContentLengthHeader, "12345")
 	// Go's client then sends no User-Agent, so that one in the question would be
 	// Go's own.
 	req.Header["User-Agent"] = nil
 
 	wantGreeting(t, visit(t, req))
 
-	asked := servewaf.question(t)
+	asked := standIn.question(t)
 	if asked.method != http.MethodDelete || asked.target != target ||
 		asked.host != site {
 		t.Errorf("asked about %s %s at %s", asked.method, asked.target, asked.host)
@@ -68,8 +68,8 @@ func TestQuestionIsTheVisitorsRequestWithRProxysHeaders(t *testing.T) {
 	want.Set(forwardedForHeader, "198.51.100.1")
 	want.Set(forwardedProtoHeader, "http")
 	want.Set(requestIDHeader, asked.header.Get(requestIDHeader))
-	want.Set(proxy.ClientHeader, localhost)
-	want.Set(proxy.PeerHeader, localhost)
+	want.Set(servewaf.ClientHeader, localhost)
+	want.Set(servewaf.PeerHeader, localhost)
 
 	if !maps.EqualFunc(asked.header, want, slices.Equal) {
 		t.Errorf("the question's headers are %v, want %v", asked.header, want)
@@ -93,14 +93,14 @@ func TestQuestionNamesTheVisitorATrustedProxySpeaksFor(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			forwarded := make(chan http.Header, 1)
 			app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
 				forwarded <- r.Header.Clone()
 
 				greet(w, r)
 			})
-			addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				trustedProxies: tc.trusted,
 			})
 
@@ -109,9 +109,9 @@ func TestQuestionNamesTheVisitorATrustedProxySpeaksFor(t *testing.T) {
 			req.Header.Set(forwardedProtoHeader, "https")
 			wantGreeting(t, visit(t, req))
 
-			asked := servewaf.question(t)
-			if asked.header.Get(proxy.ClientHeader) != tc.client ||
-				asked.header.Get(proxy.PeerHeader) != localhost ||
+			asked := standIn.question(t)
+			if asked.header.Get(servewaf.ClientHeader) != tc.client ||
+				asked.header.Get(servewaf.PeerHeader) != localhost ||
 				asked.header.Get(forwardedForHeader) != visitor ||
 				asked.header.Get(forwardedProtoHeader) != tc.proto {
 				t.Errorf("the question's headers are %v", asked.header)
@@ -157,9 +157,9 @@ func TestQuestionNamesTheClientAsTheForwardedAddressesSay(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, greet)
-			addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				trustedProxies: localhost + "/32,10.0.0.0/8",
 			})
 
@@ -167,7 +167,7 @@ func TestQuestionNamesTheClientAsTheForwardedAddressesSay(t *testing.T) {
 			req.Header[forwardedForHeader] = tc.header
 			wantGreeting(t, visit(t, req))
 
-			if got := servewaf.question(t).header.Get(proxy.ClientHeader); got != tc.client {
+			if got := standIn.question(t).header.Get(servewaf.ClientHeader); got != tc.client {
 				t.Errorf("the question names %s, want %s", got, tc.client)
 			}
 		})
@@ -197,7 +197,7 @@ func TestFirst64KiBReachServeWAFAndTheWholeBodyTheApp(t *testing.T) {
 				t.Parallel()
 
 				body := randomBytes(size)
-				servewaf := startServeWAF(t, allow)
+				standIn := startServeWAF(t, allow)
 				received := make(chan []byte, 1)
 				app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
 					whole, _ := io.ReadAll(r.Body)
@@ -205,7 +205,7 @@ func TestFirst64KiBReachServeWAFAndTheWholeBodyTheApp(t *testing.T) {
 
 					greet(w, r)
 				})
-				addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+				addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 				req := newRequest(t, http.MethodPost, addr, "/", bytes.NewReader(body))
 				if !announced {
@@ -215,7 +215,7 @@ func TestFirst64KiBReachServeWAFAndTheWholeBodyTheApp(t *testing.T) {
 
 				wantGreeting(t, visit(t, req))
 
-				asked := servewaf.question(t)
+				asked := standIn.question(t)
 				want := body[:min(size, questionBodyMaxBytes)]
 				wantQuestionBody(t, asked, want, size, announced)
 
@@ -223,7 +223,7 @@ func TestFirst64KiBReachServeWAFAndTheWholeBodyTheApp(t *testing.T) {
 					t.Error("the app did not get the whole body")
 				}
 
-				if report := servewaf.report(t); report.RequestBytes != int64(size) {
+				if report := standIn.report(t); report.RequestBytes != int64(size) {
 					t.Errorf("report %+v, of %d bytes", report, size)
 				}
 			})
@@ -243,7 +243,7 @@ func wantQuestionBody(
 			len(want))
 	}
 
-	values := asked.header.Values(proxy.ContentLengthHeader)
+	values := asked.header.Values(servewaf.ContentLengthHeader)
 
 	if announced {
 		if !slices.Equal(values, []string{strconv.Itoa(size)}) ||
@@ -264,9 +264,9 @@ func wantQuestionBody(
 func TestDenyNeedsOnlyTheFirstPartOfALargeBody(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, deny)
+	standIn := startServeWAF(t, deny)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	// Far more announced than sent. Go's server does not wait for that much, so
 	// the answer comes at once.
@@ -278,7 +278,7 @@ func TestDenyNeedsOnlyTheFirstPartOfALargeBody(t *testing.T) {
 		t.Errorf("status %d, want servewaf's 403", status)
 	}
 
-	if report := servewaf.report(t); report.RequestBytes != questionBodyMaxBytes {
+	if report := standIn.report(t); report.RequestBytes != questionBodyMaxBytes {
 		t.Errorf("report %+v, want the first part's bytes", report)
 	}
 }
@@ -306,8 +306,8 @@ func TestAQuestionCarriesItsBodyWhateverTheMethod(t *testing.T) {
 			t.Run(method+" "+tc.name, func(t *testing.T) {
 				t.Parallel()
 
-				servewaf := startServeWAF(t, deny)
-				addr, _ := startRProxy(t, servewaf.URL, nowhere, nil)
+				standIn := startServeWAF(t, deny)
+				addr, _ := startRProxy(t, standIn.URL, nowhere, nil)
 
 				conn := dial(t, addr)
 				send(t, conn, method+" /x HTTP/1.1\r\nHost: site.example\r\n"+tc.framing)
@@ -316,7 +316,7 @@ func TestAQuestionCarriesItsBodyWhateverTheMethod(t *testing.T) {
 					t.Errorf("status %d, want servewaf's 403", status)
 				}
 
-				asked := servewaf.question(t)
+				asked := standIn.question(t)
 				if string(asked.body) != tc.body ||
 					!slices.Equal(asked.transferEncoding, tc.encoding) {
 					t.Errorf("the question carries %q, encoded %v, want %q, encoded %v",
@@ -334,11 +334,11 @@ func TestAMethodNotPassedOnIsAnswered405(t *testing.T) {
 		t.Run(method, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, func(http.ResponseWriter, *http.Request) {
 				t.Error("the app was asked")
 			})
-			addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+			addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 			got := visit(t, newRequest(t, method, addr, "/", http.NoBody))
 			if got.status != http.StatusMethodNotAllowed ||
@@ -352,11 +352,11 @@ func TestAMethodNotPassedOnIsAnswered405(t *testing.T) {
 				t.Errorf("line %v, want status 405 and no disposition", line)
 			}
 
-			if len(servewaf.questions) != 0 {
+			if len(standIn.questions) != 0 {
 				t.Error("servewaf was asked")
 			}
 
-			servewaf.wantNoReport(t)
+			standIn.wantNoReport(t)
 		})
 	}
 }
@@ -372,18 +372,18 @@ func TestEachMethodPassedOnReachesServeWAFAndTheApp(t *testing.T) {
 			t.Parallel()
 
 			reached := make(chan string, 1)
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, func(_ http.ResponseWriter, r *http.Request) {
 				reached <- r.Method
 			})
-			addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+			addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 			got := visit(t, newRequest(t, method, addr, "/", http.NoBody))
 			if got.status != http.StatusOK {
 				t.Errorf("answered %+v, want the app's 200", got)
 			}
 
-			if asked := servewaf.question(t); asked.method != method {
+			if asked := standIn.question(t); asked.method != method {
 				t.Errorf("servewaf was asked about %s", asked.method)
 			}
 
@@ -416,9 +416,9 @@ func TestARequestThatCannotGoToServeWAFAsSentIsRefused(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, allow)
+			standIn := startServeWAF(t, allow)
 			app := startApp(t, greet)
-			addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+			addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 			conn := dial(t, addr)
 			send(t, conn, request)
@@ -433,11 +433,11 @@ func TestARequestThatCannotGoToServeWAFAsSentIsRefused(t *testing.T) {
 				t.Errorf("line %v, want status 400 and no disposition", line)
 			}
 
-			if len(servewaf.questions) != 0 {
+			if len(standIn.questions) != 0 {
 				t.Error("servewaf was asked")
 			}
 
-			servewaf.wantNoReport(t)
+			standIn.wantNoReport(t)
 		})
 	}
 }
@@ -447,9 +447,9 @@ func TestAHostWithAPercentSignButNoBracketGoesToServeWAF(t *testing.T) {
 
 	const host = "a%b"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, "GET / HTTP/1.1\r\nHost: "+host+"\r\n\r\n")
@@ -458,7 +458,7 @@ func TestAHostWithAPercentSignButNoBracketGoesToServeWAF(t *testing.T) {
 		t.Errorf("status %d, want the app's 200", status)
 	}
 
-	if asked := servewaf.question(t); asked.host != host {
+	if asked := standIn.question(t); asked.host != host {
 		t.Errorf("asked about the host %q, want %q", asked.host, host)
 	}
 }
@@ -468,15 +468,15 @@ func TestATrustedPeerWithNoForwardedProtoIsAskedAboutAsHTTP(t *testing.T) {
 
 	const want = "http"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		trustedProxies: localhost + "/32",
 	})
 
 	wantGreeting(t, get(t, addr, "/"))
 
-	asked := servewaf.question(t)
+	asked := standIn.question(t)
 	if got := asked.header.Get(forwardedProtoHeader); got != want {
 		t.Errorf("the question's %s is %q, want %s", forwardedProtoHeader, got, want)
 	}
@@ -497,9 +497,9 @@ func TestAQuestionNamesNoZone(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, deny)
+			standIn := startServeWAF(t, deny)
 			app := startApp(t, greet)
-			_, out, server := startServer(t, servewaf.URL, app.URL, map[string]string{
+			_, out, server := startServer(t, standIn.URL, app.URL, map[string]string{
 				trustedProxies: localhost + "/32",
 			})
 
@@ -509,9 +509,9 @@ func TestAQuestionNamesNoZone(t *testing.T) {
 
 			server.Handler.ServeHTTP(httptest.NewRecorder(), req)
 
-			asked := servewaf.question(t)
-			if asked.header.Get(proxy.ClientHeader) != tc.client ||
-				asked.header.Get(proxy.PeerHeader) != tc.peer {
+			asked := standIn.question(t)
+			if asked.header.Get(servewaf.ClientHeader) != tc.client ||
+				asked.header.Get(servewaf.PeerHeader) != tc.peer {
 				t.Errorf("the question's headers are %v", asked.header)
 			}
 

internal/rproxy/request.go

@@ -16,9 +16,9 @@ import (
 	"sync/atomic"
 	"time"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
 	"sneak.berlin/go/smallwebwaf/internal/rules"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // flushAfterEachWrite has ReverseProxy pass on each part of the app's answer as
@@ -129,7 +129,7 @@ func (rq *request) readFirstPartOfBody() bool {
 	}
 
 	_ = rq.rc.SetReadDeadline(rq.requestDeadline())
-	held, err := io.ReadAll(io.LimitReader(rq.body, proxy.QuestionBodyMaxBytes))
+	held, err := io.ReadAll(io.LimitReader(rq.body, servewaf.QuestionBodyMaxBytes))
 	// From here on, the request timer ends a read of the rest of the body, so that
 	// the answer can name the side rproxy was waiting on.
 	_ = rq.rc.SetReadDeadline(time.Time{})
@@ -384,7 +384,7 @@ func (rq *request) finish(ctx context.Context) {
 		return
 	}
 
-	report := &proxy.Report{
+	report := &servewaf.Report{
 		RequestID:     rq.id,
 		Status:        min(rq.out.status, reportStatusMax),
 		RequestBytes:  requestBytes,

internal/rproxy/rproxy.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	"sneak.berlin/go/smallwebwaf/internal/config"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // How rproxy keeps connections to the app and to servewaf open between
@@ -85,7 +85,7 @@ func New(params Params) *Server {
 		transport:         newTransport(),
 		serveWAFTransport: newServeWAFTransport(),
 		reportURL: (&url.URL{
-			Scheme: backend.Scheme, Host: backend.Host, Path: proxy.ReportPath,
+			Scheme: backend.Scheme, Host: backend.Host, Path: servewaf.ReportPath,
 		}).String(),
 	}
 
@@ -166,7 +166,7 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	rq := h.newRequest(w, r)
 	defer rq.finish(r.Context())
 
-	if r.Method == http.MethodGet && r.URL.Path == proxy.HealthPath {
+	if r.Method == http.MethodGet && r.URL.Path == servewaf.HealthPath {
 		rq.answerHealth()
 
 		return
@@ -199,9 +199,9 @@ func (h *handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	rq.noteAnswer(answer)
 
 	switch rq.disposition {
-	case proxy.DispositionAllow:
+	case servewaf.DispositionAllow:
 		rq.passToApp(r.Context())
-	case proxy.DispositionClose:
+	case servewaf.DispositionClose:
 		// This panic has Go's server close the connection without an answer,
 		// and log nothing; the deferred finish still runs.
 		panic(http.ErrAbortHandler)

internal/rproxy/rproxy_test.go

@@ -18,10 +18,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/config"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
 	"sneak.berlin/go/smallwebwaf/internal/rproxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
@@ -54,7 +56,7 @@ const (
 
 // The headers the tests set and look at.
 const (
-	dispositionHeader    = proxy.DispositionHeader
+	dispositionHeader    = servewaf.DispositionHeader
 	forwardedForHeader   = "X-Forwarded-For"
 	forwardedProtoHeader = "X-Forwarded-Proto"
 	requestIDHeader      = "X-Request-ID"
@@ -70,9 +72,9 @@ const (
 
 // What the stand-in for servewaf answers.
 const (
-	dispositionAllow = proxy.DispositionAllow
-	dispositionDeny  = proxy.DispositionDeny
-	dispositionClose = proxy.DispositionClose
+	dispositionAllow = servewaf.DispositionAllow
+	dispositionDeny  = servewaf.DispositionDeny
+	dispositionClose = servewaf.DispositionClose
 	// deniedBody is the body of a deny.
 	deniedBody = "refused by servewaf"
 )
@@ -173,7 +175,7 @@ type serveWAF struct {
 	*httptest.Server
 
 	questions chan question
-	reports   chan proxy.Report
+	reports   chan servewaf.Report
 }
 
 // startServeWAF starts a stand-in for servewaf.
@@ -182,11 +184,11 @@ func startServeWAF(t *testing.T, answer http.HandlerFunc) *serveWAF {
 
 	s := &serveWAF{
 		questions: make(chan question, 10),
-		reports:   make(chan proxy.Report, 10),
+		reports:   make(chan servewaf.Report, 10),
 	}
 	s.Server = httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			if r.Header.Get(proxy.ClientHeader) == "" {
+			if r.Header.Get(servewaf.ClientHeader) == "" {
 				s.takeReport(t, w, r)
 
 				return
@@ -213,10 +215,10 @@ func startServeWAF(t *testing.T, answer http.HandlerFunc) *serveWAF {
 func (s *serveWAF) takeReport(t *testing.T, w http.ResponseWriter, r *http.Request) {
 	t.Helper()
 
-	var report proxy.Report
+	var report servewaf.Report
 
 	err := json.NewDecoder(r.Body).Decode(&report)
-	if err != nil || r.Method != http.MethodPost || r.URL.Path != proxy.ReportPath {
+	if err != nil || r.Method != http.MethodPost || r.URL.Path != servewaf.ReportPath {
 		t.Errorf("%s %s is no report: %v", r.Method, r.URL.Path, err)
 	}
 
@@ -237,7 +239,7 @@ func (s *serveWAF) wantNoReport(t *testing.T) {
 }
 
 // report waits for a report.
-func (s *serveWAF) report(t *testing.T) proxy.Report {
+func (s *serveWAF) report(t *testing.T) servewaf.Report {
 	t.Helper()
 
 	select {
@@ -246,7 +248,7 @@ func (s *serveWAF) report(t *testing.T) proxy.Report {
 	case <-time.After(waitLimit):
 		t.Fatal("no report")
 
-		return proxy.Report{}
+		return servewaf.Report{}
 	}
 }
 
@@ -273,7 +275,7 @@ func startServeWAFAnsweringReports(
 
 	backend := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			if r.Header.Get(proxy.ClientHeader) != "" {
+			if r.Header.Get(servewaf.ClientHeader) != "" {
 				answer(w, r)
 
 				return
@@ -341,6 +343,17 @@ func startServer(
 	return addr, out, server
 }
 
+// viperFrom returns a viper Set with each of settings, as the viper
+// config.NewViper returns one bound to a process's environment.
+func viperFrom(settings map[string]string) *viper.Viper {
+	v := viper.New()
+	for name, value := range settings {
+		v.Set(name, value)
+	}
+
+	return v
+}
+
 // startServerLogging is startServer with rproxy's request lines going to
 // requestLog and its process lines to processLog.
 func startServerLogging(
@@ -354,11 +367,7 @@ func startServerLogging(
 	}
 	maps.Copy(settings, env)
 
-	cfg, err := config.RProxyFromEnvironment(func(name string) (string, bool) {
-		value, ok := settings[name]
-
-		return value, ok
-	})
+	cfg, err := config.RProxyFromEnvironment(viperFrom(settings))
 	if err != nil {
 		t.Fatalf("settings %v: %v", settings, err)
 	}
@@ -498,7 +507,7 @@ func readStatus(t *testing.T, conn net.Conn) int {
 func TestPassesAnAllowedRequestToTheAppAndItsAnswerBack(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, func(w http.ResponseWriter, r *http.Request) {
+	standIn := startServeWAF(t, func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set(asnHeader, "AS64496")
 		w.Header().Set(countryHeader, "DE")
 		allow(w, r)
@@ -512,7 +521,7 @@ func TestPassesAnAllowedRequestToTheAppAndItsAnswerBack(t *testing.T) {
 		w.WriteHeader(http.StatusTeapot)
 		_, _ = io.WriteString(w, greeting)
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	const target = pathGoReencodes + "?b=2&a=1&bad=%zz;x"
 
@@ -530,7 +539,7 @@ func TestPassesAnAllowedRequestToTheAppAndItsAnswerBack(t *testing.T) {
 	}
 
 	received := <-seen
-	asked := servewaf.question(t)
+	asked := standIn.question(t)
 
 	if received.RequestURI != target || received.Host != site {
 		t.Errorf("the app saw %s for %s", received.RequestURI, received.Host)
@@ -557,14 +566,14 @@ func TestAPeerNotTrustedHasItsForwardedHeadersReplaced(t *testing.T) {
 		"X-Forwarded-Tls-Client-Cert-Info", "X-Real-Ip",
 	}
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	seen := make(chan http.Header, 1)
 	app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
 		seen <- r.Header.Clone()
 
 		greet(w, r)
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		trustedProxies: "10.0.0.0/8",
 	})
 
@@ -602,14 +611,14 @@ func TestAPeerNotTrustedHasItsForwardedHeadersReplaced(t *testing.T) {
 func TestATrustedProxysForwardedHeadersPassOn(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	seen := make(chan http.Header, 1)
 	app := startApp(t, func(w http.ResponseWriter, r *http.Request) {
 		seen <- r.Header.Clone()
 
 		greet(w, r)
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		trustedProxies: localhost + "/32",
 	})
 
@@ -641,12 +650,12 @@ func TestATrustedProxysForwardedHeadersPassOn(t *testing.T) {
 func TestAnAnswerWithoutAContentTypeGetsNone(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		w.Header()["Content-Type"] = nil
 		_, _ = io.WriteString(w, "<html>")
 	})
-	_, _, server := startServer(t, servewaf.URL, app.URL, nil)
+	_, _, server := startServer(t, standIn.URL, app.URL, nil)
 
 	req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/", http.NoBody)
 	w := httptest.NewRecorder()
@@ -704,11 +713,11 @@ func TestRemovesTheVisitorsLookupHeadersWhenServeWAFGivesNone(t *testing.T) {
 func TestDenyGivesTheVisitorServeWAFsAnswer(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, deny)
+	standIn := startServeWAF(t, deny)
 	app := startApp(t, func(http.ResponseWriter, *http.Request) {
 		t.Error("the app was asked")
 	})
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	got := get(t, addr, "/")
 	if got.status != http.StatusForbidden || got.body != deniedBody ||
@@ -720,7 +729,7 @@ func TestDenyGivesTheVisitorServeWAFsAnswer(t *testing.T) {
 		t.Errorf("the visitor got %s", dispositionHeader)
 	}
 
-	report := servewaf.report(t)
+	report := standIn.report(t)
 	if report.Status != http.StatusForbidden ||
 		report.ResponseBytes != int64(len(deniedBody)) ||
 		report.DurationUpstreamTotal != 0 {
@@ -736,9 +745,9 @@ func TestDenyGivesTheVisitorServeWAFsAnswer(t *testing.T) {
 func TestADeniedHeadKeepsServeWAFsContentLength(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, deny)
+	standIn := startServeWAF(t, deny)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	got := visit(t, newRequest(t, http.MethodHead, addr, "/", http.NoBody))
 	if got.status != http.StatusForbidden ||
@@ -758,15 +767,15 @@ func TestAnAnswerRProxyHoldsWholeIsSentBeforeItsLogLine(t *testing.T) {
 	}{
 		{"a deny", "GET /" + host, deniedBody, http.StatusForbidden},
 		{"rproxy's own answer", "GET x:admin" + host, "Bad Request\n", http.StatusBadRequest},
-		{"the health check", "GET " + proxy.HealthPath + host, "ok\n", http.StatusOK},
+		{"the health check", "GET " + servewaf.HealthPath + host, "ok\n", http.StatusOK},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
 
 			log := heldLog{release: make(chan struct{})}
-			servewaf := startServeWAF(t, deny)
+			standIn := startServeWAF(t, deny)
 			app := startApp(t, greet)
-			addr, _ := startServerLogging(t, servewaf.URL, app.URL, nil, log, io.Discard)
+			addr, _ := startServerLogging(t, standIn.URL, app.URL, nil, log, io.Discard)
 
 			t.Cleanup(func() { close(log.release) })
 
@@ -794,9 +803,9 @@ func TestAnAnswerRProxyHoldsWholeIsSentBeforeItsLogLine(t *testing.T) {
 func TestRProxysOwnAnswerIsPlainText(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, "GET x:admin HTTP/1.1\r\nHost: site.example\r\n\r\n")
@@ -817,14 +826,14 @@ func TestRProxysOwnAnswerIsPlainText(t *testing.T) {
 func TestCloseClosesTheConnectionWithoutAnAnswer(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
+	standIn := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
 		w.Header().Set(dispositionHeader, dispositionClose)
 		w.WriteHeader(http.StatusOK)
 	})
 	app := startApp(t, func(http.ResponseWriter, *http.Request) {
 		t.Error("the app was asked")
 	})
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, "GET / HTTP/1.1\r\nHost: site.example\r\n\r\n")
@@ -835,7 +844,7 @@ func TestCloseClosesTheConnectionWithoutAnAnswer(t *testing.T) {
 			text, err)
 	}
 
-	report := servewaf.report(t)
+	report := standIn.report(t)
 	if report.Status != 0 || report.ResponseBytes != 0 {
 		t.Errorf("report %+v, of a visitor sent nothing", report)
 	}
@@ -935,7 +944,7 @@ func TestAnAnswerOtherThanAllowGoesToTheVisitorAsServeWAFGaveIt(t *testing.T) {
 			t.Run(tc.name+" with the default "+setting, func(t *testing.T) {
 				t.Parallel()
 
-				servewaf := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
+				standIn := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
 					if tc.disposition != "" {
 						w.Header().Set(dispositionHeader, tc.disposition)
 					}
@@ -947,7 +956,7 @@ func TestAnAnswerOtherThanAllowGoesToTheVisitorAsServeWAFGaveIt(t *testing.T) {
 				app := startApp(t, func(http.ResponseWriter, *http.Request) {
 					t.Error("the app was asked")
 				})
-				addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+				addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 					defaultDisposition: setting,
 				})
 
@@ -977,11 +986,11 @@ func TestAnAnswerOtherThanAllowGoesToTheVisitorAsServeWAFGaveIt(t *testing.T) {
 func TestAnAnswerWithoutAValidDispositionGetsNoReport(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
+	standIn := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
 		http.Error(w, "refused", http.StatusBadRequest)
 	})
 	app := startApp(t, greet)
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	if got := get(t, addr, "/"); got.status != http.StatusBadRequest {
 		t.Errorf("answered %+v, want servewaf's 400", got)
@@ -991,18 +1000,18 @@ func TestAnAnswerWithoutAValidDispositionGetsNoReport(t *testing.T) {
 		t.Errorf("line %v, want no disposition", line)
 	}
 
-	servewaf.wantNoReport(t)
+	standIn.wantNoReport(t)
 }
 
 func TestAnAnswerWithoutAContentTypeGoesToTheVisitorWithNone(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
+	standIn := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
 		w.Header()["Content-Type"] = nil
 		w.WriteHeader(http.StatusInternalServerError)
 		_, _ = io.WriteString(w, "<html>broken")
 	})
-	addr, _ := startRProxy(t, servewaf.URL, nowhere, nil)
+	addr, _ := startRProxy(t, standIn.URL, nowhere, nil)
 
 	got := get(t, addr, "/")
 	if contentType, sent := got.header["Content-Type"]; sent {
@@ -1015,11 +1024,11 @@ func TestAnAnswerOf1MiBGoesToTheVisitor(t *testing.T) {
 
 	const size = 1 << 20
 
-	servewaf := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
+	standIn := startServeWAF(t, func(w http.ResponseWriter, _ *http.Request) {
 		w.WriteHeader(http.StatusInternalServerError)
 		_, _ = w.Write(make([]byte, size))
 	})
-	addr, _ := startRProxy(t, servewaf.URL, nowhere, nil)
+	addr, _ := startRProxy(t, standIn.URL, nowhere, nil)
 
 	got := get(t, addr, "/")
 	if got.status != http.StatusInternalServerError || len(got.body) != size {
@@ -1135,15 +1144,15 @@ func TestAnAnswerThatCannotBePassedOnIsAnswered502(t *testing.T) {
 func TestAnAnswerThatCannotBePassedOnGetsNoReport(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, overOneMiB(dispositionDeny))
-	addr, out := startRProxy(t, servewaf.URL, nowhere, nil)
+	standIn := startServeWAF(t, overOneMiB(dispositionDeny))
+	addr, out := startRProxy(t, standIn.URL, nowhere, nil)
 
 	if got := get(t, addr, "/"); got.status != http.StatusBadGateway {
 		t.Errorf("answered %+v, want 502", got)
 	}
 
 	out.requestLine(t)
-	servewaf.wantNoReport(t)
+	standIn.wantNoReport(t)
 }
 
 func TestWithoutAnAnswerTheDefaultDispositionDecides(t *testing.T) {
@@ -1199,20 +1208,20 @@ func TestAVisitorThatGoesAwayWhileServeWAFIsAskedGetsNoDefault(t *testing.T) {
 		t.Run("with the default "+disposition, func(t *testing.T) {
 			t.Parallel()
 
-			servewaf := startServeWAF(t, func(_ http.ResponseWriter, r *http.Request) {
+			standIn := startServeWAF(t, func(_ http.ResponseWriter, r *http.Request) {
 				<-r.Context().Done()
 			})
 			app := startApp(t, func(http.ResponseWriter, *http.Request) {
 				t.Error("the app was asked")
 			})
-			addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+			addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 				timeoutSetting:     "60000",
 				defaultDisposition: disposition,
 			})
 
 			conn := dial(t, addr)
 			send(t, conn, "GET / HTTP/1.1\r\nHost: site.example\r\n\r\n")
-			servewaf.question(t)
+			standIn.question(t)
 
 			_ = conn.Close()
 
@@ -1226,7 +1235,7 @@ func TestAVisitorThatGoesAwayWhileServeWAFIsAskedGetsNoDefault(t *testing.T) {
 				t.Error("rproxy warned that servewaf gave no answer")
 			}
 
-			servewaf.wantNoReport(t)
+			standIn.wantNoReport(t)
 		})
 	}
 }
@@ -1244,17 +1253,17 @@ func TestRProxyWarnsWhenTheDefaultDecides(t *testing.T) {
 func TestSendsNoReportWithoutAnAnswer(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, func(_ http.ResponseWriter, r *http.Request) {
+	standIn := startServeWAF(t, func(_ http.ResponseWriter, r *http.Request) {
 		<-r.Context().Done()
 	})
 	app := startApp(t, greet)
-	addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		timeoutSetting: "200",
 	})
 
 	wantGreeting(t, get(t, addr, "/"))
 	out.requestLine(t)
-	servewaf.wantNoReport(t)
+	standIn.wantNoReport(t)
 }
 
 func TestAPathUnderOwnPrefixNeverReachesTheApp(t *testing.T) {
@@ -1274,25 +1283,25 @@ func TestAPathUnderOwnPrefixNeverReachesTheApp(t *testing.T) {
 func TestHealthCheckIsAnsweredWhileServeWAFIsDown(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
 	addr, out := startRProxy(t, nowhere, app.URL, nil)
 
-	got := get(t, addr, proxy.HealthPath)
+	got := get(t, addr, servewaf.HealthPath)
 	if got.status != http.StatusOK || got.body != "ok\n" {
 		t.Errorf("answered %+v, want ok", got)
 	}
 
 	line := out.requestLine(t)
-	if line["path"] != proxy.HealthPath || line["disposition"] != nil {
+	if line["path"] != servewaf.HealthPath || line["disposition"] != nil {
 		t.Errorf("line %v, want one with no disposition", line)
 	}
 
 	// With servewaf up too, it is not asked.
-	addr, _ = startRProxy(t, servewaf.URL, app.URL, nil)
-	get(t, addr, proxy.HealthPath)
+	addr, _ = startRProxy(t, standIn.URL, app.URL, nil)
+	get(t, addr, servewaf.HealthPath)
 
-	if len(servewaf.questions) != 0 {
+	if len(standIn.questions) != 0 {
 		t.Error("servewaf was asked about the health check")
 	}
 }
@@ -1396,15 +1405,15 @@ func TestAReportAnswered101IsDroppedAtOnce(t *testing.T) {
 func TestAReportDueAfterWaitForReportsIsDropped(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, out, server := startServer(t, servewaf.URL, app.URL, nil)
+	addr, out, server := startServer(t, standIn.URL, app.URL, nil)
 
 	server.WaitForReports()
 
 	wantGreeting(t, get(t, addr, "/"))
 	out.requestLine(t)
-	servewaf.wantNoReport(t)
+	standIn.wantNoReport(t)
 }
 
 func TestReportGivesWhatHappened(t *testing.T) {
@@ -1412,14 +1421,14 @@ func TestReportGivesWhatHappened(t *testing.T) {
 
 	const body = "the visitor's body"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	wantGreeting(t, visit(t, newRequest(t, http.MethodPost, addr, "/",
 		strings.NewReader(body))))
 
-	report := servewaf.report(t)
+	report := standIn.report(t)
 
 	if report.RequestID == "" || report.Status != http.StatusOK ||
 		report.RequestBytes != int64(len(body)) ||
@@ -1442,7 +1451,7 @@ func TestWaitForReportsWaitsForAReportBeingSent(t *testing.T) {
 	release := make(chan struct{})
 	backend := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			if r.Header.Get(proxy.ClientHeader) != "" {
+			if r.Header.Get(servewaf.ClientHeader) != "" {
 				allow(w, r)
 
 				return
@@ -1497,9 +1506,9 @@ func TestWaitForReportsWaitsForAReportBeingSent(t *testing.T) {
 func TestReportOfAWebSocketCountsWhatItCarried(t *testing.T) {
 	t.Parallel()
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, echoAfterUpgrade)
-	addr, out := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, out := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		maxRequestTime:  "2000",
 		maxResponseTime: "2000",
 	})
@@ -1535,7 +1544,7 @@ func TestReportOfAWebSocketCountsWhatItCarried(t *testing.T) {
 
 	_ = conn.Close()
 
-	report := servewaf.report(t)
+	report := standIn.report(t)
 	if report.Status != http.StatusSwitchingProtocols ||
 		report.RequestBytes != int64(len(message)) ||
 		report.ResponseBytes != int64(len(message)) {
@@ -1552,7 +1561,7 @@ func TestAWebSocketPassesOnThatTheVisitorStoppedSending(t *testing.T) {
 
 	const goodbye = "sent after the visitor stopped sending\n"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		conn, buffered, err := http.NewResponseController(w).Hijack()
 		if err != nil {
@@ -1572,7 +1581,7 @@ func TestAWebSocketPassesOnThatTheVisitorStoppedSending(t *testing.T) {
 		_, _ = buffered.WriteString(goodbye)
 		_ = buffered.Flush()
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, "GET /socket HTTP/1.1\r\nHost: app\r\n"+
@@ -1610,7 +1619,7 @@ func TestAWebSocketPassesOnThatTheVisitorStoppedSending(t *testing.T) {
 //nolint:paralleltest // see above
 func TestASwitchNotPassedOnClosesTheAppsConnection(t *testing.T) {
 	closed := make(chan error, 1)
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, func(w http.ResponseWriter, _ *http.Request) {
 		conn, buffered, err := http.NewResponseController(w).Hijack()
 		if err != nil {
@@ -1633,7 +1642,7 @@ func TestASwitchNotPassedOnClosesTheAppsConnection(t *testing.T) {
 		_, err = buffered.ReadByte()
 		closed <- err
 	})
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, _ := startRProxy(t, standIn.URL, app.URL, nil)
 
 	conn := dial(t, addr)
 	send(t, conn, "GET /socket HTTP/1.1\r\nHost: app\r\n"+
@@ -1681,9 +1690,9 @@ func TestEachRequestGetsAFreshID(t *testing.T) {
 
 	const fromTraefik = "an-id-from-traefik"
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, _ := startRProxy(t, servewaf.URL, app.URL, map[string]string{
+	addr, _ := startRProxy(t, standIn.URL, app.URL, map[string]string{
 		trustedProxies: localhost + "/32",
 	})
 
@@ -1694,7 +1703,7 @@ func TestEachRequestGetsAFreshID(t *testing.T) {
 		req.Header.Set(requestIDHeader, fromTraefik)
 		wantGreeting(t, visit(t, req))
 
-		ids = append(ids, servewaf.question(t).header.Get(requestIDHeader))
+		ids = append(ids, standIn.question(t).header.Get(requestIDHeader))
 	}
 
 	if slices.Contains(ids, fromTraefik) || ids[0] == "" || ids[0] == ids[1] {
@@ -1711,16 +1720,16 @@ func TestLogLineGivesTheRequestAsSent(t *testing.T) {
 		body  = "the visitor's body"
 	)
 
-	servewaf := startServeWAF(t, allow)
+	standIn := startServeWAF(t, allow)
 	app := startApp(t, greet)
-	addr, out := startRProxy(t, servewaf.URL, app.URL, nil)
+	addr, out := startRProxy(t, standIn.URL, app.URL, nil)
 
 	req := newRequest(t, http.MethodPost, addr, path+"?"+query, strings.NewReader(body))
 	req.Host = site
 	wantGreeting(t, visit(t, req))
 
 	line := out.requestLine(t)
-	asked := servewaf.question(t)
+	asked := standIn.question(t)
 
 	for name, want := range map[string]any{
 		"type":           "request",

internal/rproxy/servewaf.go

@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"strings"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // answerBodyMaxBytes is the most of the body of servewaf's answer that is read.
@@ -38,10 +38,10 @@ type servewafAnswer struct {
 // notes nothing, and no report is due for it: servewaf holds no decision to report
 // on.
 func (rq *request) noteAnswer(answer *servewafAnswer) {
-	disposition := answer.header.Get(proxy.DispositionHeader)
+	disposition := answer.header.Get(servewaf.DispositionHeader)
 
 	switch disposition {
-	case proxy.DispositionAllow, proxy.DispositionDeny, proxy.DispositionClose:
+	case servewaf.DispositionAllow, servewaf.DispositionDeny, servewaf.DispositionClose:
 		rq.disposition = disposition
 		rq.answered = true
 		rq.asn = answer.header.Get(asnHeader)
@@ -74,7 +74,7 @@ func (rq *request) handleNoUsableAnswer(ctx context.Context, err error) {
 		rq.disposition = rq.h.config.DefaultDisposition
 		rq.byDefault = true
 
-		if rq.disposition == proxy.DispositionAllow {
+		if rq.disposition == servewaf.DispositionAllow {
 			rq.passToApp(ctx)
 		} else {
 			rq.answer(http.StatusServiceUnavailable)
@@ -169,13 +169,13 @@ func (rq *request) newQuestion(ctx context.Context) (*http.Request, error) {
 	question.TransferEncoding = in.TransferEncoding
 
 	question.Header = in.Header.Clone()
-	question.Header.Set(proxy.ClientHeader, rq.client.String())
-	question.Header.Set(proxy.PeerHeader, rq.peer.String())
-	question.Header.Del(proxy.ContentLengthHeader)
+	question.Header.Set(servewaf.ClientHeader, rq.client.String())
+	question.Header.Set(servewaf.PeerHeader, rq.peer.String())
+	question.Header.Del(servewaf.ContentLengthHeader)
 
 	announced := in.Header.Get("Content-Length")
 	if announced != "" {
-		question.Header.Set(proxy.ContentLengthHeader, announced)
+		question.Header.Set(servewaf.ContentLengthHeader, announced)
 	}
 
 	question.Header.Set(requestIDHeader, rq.id)
@@ -196,7 +196,7 @@ func (rq *request) answerWith(answer *servewafAnswer) {
 
 	header := rq.out.Header()
 	maps.Copy(header, answer.header)
-	header.Del(proxy.DispositionHeader)
+	header.Del(servewaf.DispositionHeader)
 
 	// Go's server adds a Content-Type it guesses from the body to a response whose
 	// headers have no Content-Type key. The key with no value sends none.
@@ -210,7 +210,7 @@ func (rq *request) answerWith(answer *servewafAnswer) {
 // sendReport sends servewaf report on a goroutine of its own, so that the
 // visitor does not wait for it. The report goes on after ctx, the request's own
 // context, has ended.
-func (h *handler) sendReport(ctx context.Context, report *proxy.Report) {
+func (h *handler) sendReport(ctx context.Context, report *servewaf.Report) {
 	h.reportsMu.Lock()
 	defer h.reportsMu.Unlock()
 
@@ -228,7 +228,7 @@ func (h *handler) sendReport(ctx context.Context, report *proxy.Report) {
 
 // postReport posts report to servewaf, and waits for its answer for up to
 // SWRP_TIMEOUT_MS.
-func (h *handler) postReport(ctx context.Context, report *proxy.Report) error {
+func (h *handler) postReport(ctx context.Context, report *servewaf.Report) error {
 	body, err := json.Marshal(report)
 	if err != nil {
 		return fmt.Errorf("encode the report: %w", err)

internal/servewaf/admin.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"bytes"

internal/servewaf/admin_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"encoding/json"
@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 	"sneak.berlin/go/smallwebwaf/internal/state"
 )
 
@@ -88,11 +88,11 @@ func TestAdminEndpointsNeedTheAdminToken(t *testing.T) {
 
 	// Any other request under /_smallwebwaf/ is not found.
 	for _, e := range []adminEndpoint{
-		{http.MethodPut, proxy.BansPath, banOtherClient},
-		{http.MethodDelete, proxy.BansPath, ""},
-		{http.MethodGet, proxy.BansPath + "/" + otherClient, ""},
-		{http.MethodPost, proxy.ClientsPath + otherClient, ""},
-		{http.MethodGet, strings.TrimSuffix(proxy.ClientsPath, "/"), ""},
+		{http.MethodPut, servewaf.BansPath, banOtherClient},
+		{http.MethodDelete, servewaf.BansPath, ""},
+		{http.MethodGet, servewaf.BansPath + "/" + otherClient, ""},
+		{http.MethodPost, servewaf.ClientsPath + otherClient, ""},
+		{http.MethodGet, strings.TrimSuffix(servewaf.ClientsPath, "/"), ""},
 	} {
 		s.admin(e.method, e.path, e.body, http.StatusNotFound)
 	}
@@ -118,7 +118,7 @@ func TestBanAddedListedAndLiftedThroughTheEndpoints(t *testing.T) {
 		Reason:   "probes for logins",
 	}
 
-	wantBans(t, s.admin(http.MethodPost, proxy.BansPath, banOtherClient, http.StatusOK),
+	wantBans(t, s.admin(http.MethodPost, servewaf.BansPath, banOtherClient, http.StatusOK),
 		want)
 
 	line := s.get(client, http.StatusForbidden, requestlog.ActionBanned)
@@ -129,7 +129,7 @@ func TestBanAddedListedAndLiftedThroughTheEndpoints(t *testing.T) {
 	// Its notes count the request it refused.
 	want.Notes.Requests, want.Notes.Refused = 1, 1
 
-	wantBans(t, s.admin(http.MethodGet, proxy.BansPath, "", http.StatusOK), want)
+	wantBans(t, s.admin(http.MethodGet, servewaf.BansPath, "", http.StatusOK), want)
 
 	// Ten minutes on, lifting the bans on client lifts that one, which is
 	// kept, marked lifted.
@@ -138,13 +138,13 @@ func TestBanAddedListedAndLiftedThroughTheEndpoints(t *testing.T) {
 	lifted := clk.Now()
 	want.Lifted = &lifted
 
-	wantBans(t, s.admin(http.MethodDelete, proxy.BansPath+"/"+client, "",
+	wantBans(t, s.admin(http.MethodDelete, servewaf.BansPath+"/"+client, "",
 		http.StatusOK), want)
 	s.get(client, http.StatusOK, requestlog.ActionForward)
-	wantBans(t, s.admin(http.MethodGet, proxy.BansPath, "", http.StatusOK), want)
+	wantBans(t, s.admin(http.MethodGet, servewaf.BansPath, "", http.StatusOK), want)
 
 	// No ban on it is active any more.
-	s.admin(http.MethodDelete, proxy.BansPath+"/"+client, "", http.StatusNotFound)
+	s.admin(http.MethodDelete, servewaf.BansPath+"/"+client, "", http.StatusNotFound)
 }
 
 func TestBanToAddGivesItsNetblockAndDuration(t *testing.T) {
@@ -181,7 +181,7 @@ func TestBanToAddGivesItsNetblockAndDuration(t *testing.T) {
 			want.Expires = &expires
 		}
 
-		wantBans(t, s.admin(http.MethodPost, proxy.BansPath, body, http.StatusOK), want)
+		wantBans(t, s.admin(http.MethodPost, servewaf.BansPath, body, http.StatusOK), want)
 	}
 }
 
@@ -250,7 +250,7 @@ func TestBanToAddThatCannotBeReadIsRefused(t *testing.T) {
 			"request body too large",
 		},
 	} {
-		got := s.admin(http.MethodPost, proxy.BansPath, tc.body, http.StatusBadRequest)
+		got := s.admin(http.MethodPost, servewaf.BansPath, tc.body, http.StatusBadRequest)
 		if !strings.Contains(string(got.body), tc.want) {
 			t.Errorf("%.80s was answered %q, want it to say %q", tc.body, got.body, tc.want)
 		}
@@ -283,7 +283,7 @@ func TestClientEndpointShowsTheClientAndItsBans(t *testing.T) {
 			Bans   []state.BanEntry  `json:"bans"`
 		}
 
-		decode(t, s.admin(http.MethodGet, proxy.ClientsPath+addr, "", http.StatusOK), &got)
+		decode(t, s.admin(http.MethodGet, servewaf.ClientsPath+addr, "", http.StatusOK), &got)
 
 		if got.Client == nil {
 			t.Fatalf("%s: no client", addr)
@@ -305,13 +305,13 @@ func TestClientEndpointShowsTheClientAndItsBans(t *testing.T) {
 
 	// Of an address no request came from and no ban covers, nothing is
 	// known.
-	got := s.admin(http.MethodGet, proxy.ClientsPath+"198.51.100.99", "", http.StatusOK)
+	got := s.admin(http.MethodGet, servewaf.ClientsPath+"198.51.100.99", "", http.StatusOK)
 	if string(got.body) != "{\n    \"client\": null,\n    \"bans\": []\n}\n" {
 		t.Errorf("an unknown client is answered\n%s", got.body)
 	}
 
-	s.admin(http.MethodGet, proxy.ClientsPath+"203.0.113", "", http.StatusBadRequest)
-	s.admin(http.MethodDelete, proxy.BansPath+"/203.0.113.0/24", "",
+	s.admin(http.MethodGet, servewaf.ClientsPath+"203.0.113", "", http.StatusBadRequest)
+	s.admin(http.MethodDelete, servewaf.BansPath+"/203.0.113.0/24", "",
 		http.StatusBadRequest)
 }
 
@@ -342,10 +342,10 @@ type adminEndpoint struct {
 // bans on otherClient, and asking about otherClient.
 func adminEndpoints() []adminEndpoint {
 	return []adminEndpoint{
-		{http.MethodGet, proxy.BansPath, ""},
-		{http.MethodPost, proxy.BansPath, banOtherClient},
-		{http.MethodDelete, proxy.BansPath + "/" + otherClient, ""},
-		{http.MethodGet, proxy.ClientsPath + otherClient, ""},
+		{http.MethodGet, servewaf.BansPath, ""},
+		{http.MethodPost, servewaf.BansPath, banOtherClient},
+		{http.MethodDelete, servewaf.BansPath + "/" + otherClient, ""},
+		{http.MethodGet, servewaf.ClientsPath + otherClient, ""},
 	}
 }
 

internal/servewaf/alerts_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"maps"
@@ -10,15 +10,15 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
 	alertWebhookURL = "SWWAF_ALERT_WEBHOOK_URL"
 	alertMaxPerHour = "SWWAF_ALERT_MAX_PER_HOUR"
 	// alertInstance is the instance every alert of these tests gives.
-	alertInstance = "fsn1app1/gitea"
+	alertInstance = "fsn1app1/blog"
 )
 
 func TestBanForABrokenLimitRaisesABanAlertWithItsNotes(t *testing.T) {
@@ -201,7 +201,7 @@ func TestObserveModeWorksOutABanOnlyWhenItsAlertWouldBeSent(t *testing.T) {
 // never sent them, and returns the queue they wait in as well.
 func startWithAlerts(
 	t *testing.T, env map[string]string,
-) (*sender, *clock, *proxy.Server, *alerts.Queue) {
+) (*sender, *clock, *servewaf.Server, *alerts.Queue) {
 	t.Helper()
 
 	return startAppWithAlerts(t, func(http.ResponseWriter, *http.Request) {}, env)
@@ -210,7 +210,7 @@ func startWithAlerts(
 // startAppWithAlerts is startWithAlerts in front of the app handler.
 func startAppWithAlerts(
 	t *testing.T, handler http.HandlerFunc, env map[string]string,
-) (*sender, *clock, *proxy.Server, *alerts.Queue) {
+) (*sender, *clock, *servewaf.Server, *alerts.Queue) {
 	t.Helper()
 
 	app := startApp(t, handler)

internal/servewaf/anomaly_internal_test.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"net/netip"

internal/servewaf/anomaly_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"maps"
@@ -13,9 +13,9 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/anomaly"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // The anomaly thresholds: the prefix of a scope followed by the end of a
@@ -319,7 +319,7 @@ func TestRequestCountsForTheASNumberGeoJSGivesBeforeItEnds(t *testing.T) {
 	// kept.
 	geojsURL, _, release := startHeldGeoJS(t)
 
-	var server atomic.Pointer[proxy.Server]
+	var server atomic.Pointer[servewaf.Server]
 
 	app := startApp(t, func(http.ResponseWriter, *http.Request) {
 		release()

internal/servewaf/answertime_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"fmt"
@@ -16,10 +16,10 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/bans"
 	"sneak.berlin/go/smallwebwaf/internal/lookup"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/reputation"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
@@ -81,7 +81,7 @@ func TestSixteenThousandCookiesAreRefusedWellWithinTheTimeLimit(t *testing.T) {
 		t.Errorf("answered after %s, want well within %s", took, answerTimeLimit)
 	}
 
-	wantDisposition(t, got, tooLarge, proxy.DispositionDeny)
+	wantDisposition(t, got, tooLarge, servewaf.DispositionDeny)
 
 	line := s.out.requestLine(t)
 	wantLine(t, line, tooLarge, requestlog.ActionTooLarge)
@@ -144,13 +144,13 @@ func TestEachHeaderLimitRefusesARequestOverIt(t *testing.T) {
 			line := s.out.requestLine(t)
 
 			if tc.refused {
-				wantDisposition(t, got, tooLarge, proxy.DispositionDeny)
+				wantDisposition(t, got, tooLarge, servewaf.DispositionDeny)
 				wantLine(t, line, tooLarge, requestlog.ActionTooLarge)
 
 				return
 			}
 
-			wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+			wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 			wantLine(t, line, http.StatusOK, requestlog.ActionForward)
 
 			if line.DurationWAF == nil {
@@ -175,7 +175,7 @@ func TestHeaderLimitsHoldWhateverTheCoreRuleSetSettingsSay(t *testing.T) {
 			req := s.question(siteA, client, "/")
 			req.Header.Set(cookieHeader, cookies(cookieLimit+1))
 
-			wantDisposition(t, do(t, req), tooLarge, proxy.DispositionDeny)
+			wantDisposition(t, do(t, req), tooLarge, servewaf.DispositionDeny)
 		})
 	}
 }
@@ -187,7 +187,7 @@ func TestClientInTheAllowNetsSkipsTheHeaderLimits(t *testing.T) {
 	req := s.question(siteA, client, "/")
 	req.Header.Set(cookieHeader, cookies(cookieLimit+1))
 
-	wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 }
 
 func TestObserveModeAllowsARequestOverTheHeaderLimitsUnread(t *testing.T) {
@@ -204,7 +204,7 @@ func TestObserveModeAllowsARequestOverTheHeaderLimitsUnread(t *testing.T) {
 		t.Errorf("answered after %s, want well within %s", took, answerTimeLimit)
 	}
 
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 
 	line := s.out.requestLine(t)
 	if line.WouldAction != requestlog.ActionTooLarge || line.DurationWAF != nil {
@@ -224,8 +224,8 @@ func TestRequestsOverTheHeaderLimitsCountTowardTheRateLimits(t *testing.T) {
 		return do(t, req)
 	}
 
-	wantDisposition(t, ask(), tooLarge, proxy.DispositionDeny)
-	wantDisposition(t, ask(), http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, ask(), tooLarge, servewaf.DispositionDeny)
+	wantDisposition(t, ask(), http.StatusForbidden, servewaf.DispositionDeny)
 
 	lines := s.out.requestLines(t, 2)
 	wantLine(t, lines[1], http.StatusForbidden, requestlog.ActionRateLimited)
@@ -249,7 +249,7 @@ func TestTheHeaderLimitsComeAfterTheTrapPathsAndTheRuleFiles(t *testing.T) {
 			req := s.question(siteA, client, tc.path)
 			req.Header.Set(cookieHeader, cookies(cookieLimit+1))
 
-			wantDisposition(t, do(t, req), http.StatusForbidden, proxy.DispositionDeny)
+			wantDisposition(t, do(t, req), http.StatusForbidden, servewaf.DispositionDeny)
 			wantLine(t, s.out.requestLine(t), http.StatusForbidden, tc.action)
 		})
 	}
@@ -265,7 +265,7 @@ func TestNotWaitingForGeoJSNeverLowersAClientsLimit(t *testing.T) {
 	req := s.question(siteA, fromDE, "/")
 	req.Header.Set(cookieHeader, cookies(cookieLimit+1))
 
-	wantDisposition(t, do(t, req), tooLarge, proxy.DispositionDeny)
+	wantDisposition(t, do(t, req), tooLarge, servewaf.DispositionDeny)
 
 	line := s.out.requestLine(t)
 	wantLine(t, line, tooLarge, requestlog.ActionTooLarge)
@@ -275,7 +275,7 @@ func TestNotWaitingForGeoJSNeverLowersAClientsLimit(t *testing.T) {
 	}
 
 	// The client is under no ban, and GeoJS places it in a country.
-	wantDisposition(t, s.ask(fromDE, "/"), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, s.ask(fromDE, "/"), http.StatusOK, servewaf.DispositionAllow)
 }
 
 func TestAClientGeoJSPlacedInNoCountryCountsAsUnknownWithoutWaiting(t *testing.T) {
@@ -291,7 +291,7 @@ func TestAClientGeoJSPlacedInNoCountryCountsAsUnknownWithoutWaiting(t *testing.T
 	req := s.question(siteA, client, "/")
 	req.Header.Set(cookieHeader, cookies(cookieLimit+1))
 
-	wantDisposition(t, do(t, req), http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, do(t, req), http.StatusForbidden, servewaf.DispositionDeny)
 	wantLine(t, s.out.requestLine(t), http.StatusForbidden, requestlog.ActionRateLimited)
 }
 
@@ -306,7 +306,7 @@ func TestObserveModeWaitsForGeoJSForARequestOverTheHeaderLimits(t *testing.T) {
 	req.Header.Set(cookieHeader, cookies(cookieLimit+1))
 
 	got := do(t, req)
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 
 	asn, country := got.header.Get("X-Client-Asn"), got.header.Get("X-Client-Country")
 	if asn != asnDE || country != "DE" {
@@ -318,7 +318,9 @@ func TestObserveModeWaitsForGeoJSForARequestOverTheHeaderLimits(t *testing.T) {
 // newServeWAFInBubble makes a servewaf for a synctest bubble: GeoJS never
 // answers, a setting needs its answer, and everything is at its default but
 // for env. No request to it may use the network.
-func newServeWAFInBubble(t *testing.T, env map[string]string) (*proxy.Server, *output) {
+func newServeWAFInBubble(
+	t *testing.T, env map[string]string,
+) (*servewaf.Server, *output) {
 	t.Helper()
 
 	settings := map[string]string{deniedCountries: "KP"}
@@ -332,13 +334,13 @@ func newServeWAFInBubble(t *testing.T, env map[string]string) (*proxy.Server, *o
 // askDirectly hands a question about a request from client straight to server,
 // as change leaves it, and returns the answer's status and how long it took.
 func askDirectly(
-	t *testing.T, server *proxy.Server, change func(*http.Request),
+	t *testing.T, server *servewaf.Server, change func(*http.Request),
 ) (int, time.Duration) {
 	t.Helper()
 
 	req := httptest.NewRequestWithContext(t.Context(), http.MethodGet, "/", http.NoBody)
 	req.RemoteAddr = net.JoinHostPort(rproxyPeer, "1234")
-	req.Header.Set(proxy.ClientHeader, client)
+	req.Header.Set(servewaf.ClientHeader, client)
 	req.Header.Set(requestIDHeader, "the-id")
 	change(req)
 
@@ -351,17 +353,17 @@ func askDirectly(
 }
 
 // banClient bans client at now.
-func banClient(_ *testing.T, server *proxy.Server, now time.Time) {
+func banClient(_ *testing.T, server *servewaf.Server, now time.Time) {
 	server.Ledger.BanForLimit(netip.MustParsePrefix(client+"/32"), now, bans.Notes{})
 }
 
 // countClient counts one request from client at now for the rate limits.
-func countClient(_ *testing.T, server *proxy.Server, now time.Time) {
+func countClient(_ *testing.T, server *servewaf.Server, now time.Time) {
 	server.Limiter.Count(netip.MustParsePrefix(client+"/32"), now, wholeLimit)
 }
 
 // listClient puts client on the blocklist at dropURL.
-func listClient(t *testing.T, server *proxy.Server, now time.Time) {
+func listClient(t *testing.T, server *servewaf.Server, now time.Time) {
 	t.Helper()
 
 	err := server.Lists.Load([]reputation.List{{
@@ -373,13 +375,13 @@ func listClient(t *testing.T, server *proxy.Server, now time.Time) {
 }
 
 // decideOnClient puts client on the CrowdSec decision list.
-func decideOnClient(t *testing.T, server *proxy.Server, now time.Time) {
+func decideOnClient(t *testing.T, server *servewaf.Server, now time.Time) {
 	t.Helper()
 	loadDecisions(t, server, now, clientsDecision)
 }
 
 // leaveAsItIs prepares nothing.
-func leaveAsItIs(*testing.T, *proxy.Server, time.Time) {}
+func leaveAsItIs(*testing.T, *servewaf.Server, time.Time) {}
 
 func TestARefusedRequestDoesNotWaitForASlowGeoJS(t *testing.T) {
 	t.Parallel()
@@ -390,7 +392,7 @@ func TestARefusedRequestDoesNotWaitForASlowGeoJS(t *testing.T) {
 		name string
 		env  map[string]string
 		// prepare gets the server ready, at now, before the question.
-		prepare func(t *testing.T, server *proxy.Server, now time.Time)
+		prepare func(t *testing.T, server *servewaf.Server, now time.Time)
 		// cookie is the request's Cookie header.
 		cookie string
 		status int
@@ -461,7 +463,7 @@ func TestAQuestionWaitsForASlowGeoJSOnlyAsLongAsTheDefaultSays(t *testing.T) {
 		name string
 		env  map[string]string
 		// prepare gets the server ready, at now, before the question.
-		prepare func(t *testing.T, server *proxy.Server, now time.Time)
+		prepare func(t *testing.T, server *servewaf.Server, now time.Time)
 		status  int
 		action  string
 	}{
@@ -519,10 +521,10 @@ func TestServeWAFAnswersWithinTheTimeLimitWhileEveryOutsideSourceHangs(t *testin
 
 	t.Cleanup(func() { _ = resolver.Close() })
 
-	server, out, _ := newServeWAFWith(t, func(params proxy.Params) *proxy.Server {
+	server, out, _ := newServeWAFWith(t, func(params servewaf.Params) *servewaf.Server {
 		params.AbuseIPDBURL = silentAbuseIPDBURL
 
-		return proxy.NewServeWAF(params)
+		return servewaf.New(params)
 	}, held, time.Now, map[string]string{
 		deniedCountries: "KP", wafMode: block,
 		dnsblZones: dnsblZone, dnsblResolver: resolver.LocalAddr().String(),

internal/servewaf/bans.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"net/http"

internal/servewaf/bans_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"bufio"
@@ -15,8 +15,8 @@ import (
 	"time"
 
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
@@ -382,7 +382,7 @@ func (c *clock) advance(d time.Duration) {
 // window.
 func startWithClock(
 	t *testing.T, geojsURL string, env map[string]string,
-) (*sender, *clock, *proxy.Server) {
+) (*sender, *clock, *servewaf.Server) {
 	t.Helper()
 
 	app := startApp(t, func(http.ResponseWriter, *http.Request) {})

internal/servewaf/biased.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"sneak.berlin/go/smallwebwaf/internal/config"

internal/servewaf/biased_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"fmt"
@@ -16,8 +16,8 @@ import (
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/bans"
 	"sneak.berlin/go/smallwebwaf/internal/lookup/lookuptest"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // The biased thresholds.
@@ -419,7 +419,7 @@ func TestBanForALoweredLimitGivesThePercentageInItsNotesAndItsAlert(t *testing.T
 // clock.
 func startWithLookups(
 	t *testing.T, env map[string]string,
-) (*sender, *proxy.Server, *alerts.Queue) {
+) (*sender, *servewaf.Server, *alerts.Queue) {
 	t.Helper()
 
 	s, _, server, queue := startWithLookupsAndClock(t, env)
@@ -434,7 +434,7 @@ func startWithLookups(
 // country, and no other address.
 func startWithLookupsAndClock(
 	t *testing.T, env map[string]string,
-) (*sender, *clock, *proxy.Server, *alerts.Queue) {
+) (*sender, *clock, *servewaf.Server, *alerts.Queue) {
 	t.Helper()
 
 	path := filepath.Join(t.TempDir(), "ipinfo_lite.mmdb")
@@ -463,11 +463,11 @@ func (s *sender) uploadFrom(from string) logLine {
 // serveFromDE hands a question about a request from fromDE with method and body
 // straight to server's handler, without the network, and returns once it is
 // answered.
-func serveFromDE(t *testing.T, server *proxy.Server, method string, body io.Reader) {
+func serveFromDE(t *testing.T, server *servewaf.Server, method string, body io.Reader) {
 	t.Helper()
 
 	req := httptest.NewRequestWithContext(t.Context(), method, "/", body)
-	req.Header.Set(proxy.ClientHeader, fromDE)
+	req.Header.Set(servewaf.ClientHeader, fromDE)
 	req.Header.Set(requestIDHeader, "the-id")
 
 	server.Handler.ServeHTTP(httptest.NewRecorder(), req)

internal/servewaf/bytelimits_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"bufio"

internal/servewaf/client.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"crypto/rand"

internal/servewaf/coreruleset.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"time"

internal/servewaf/coreruleset_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"io"

internal/servewaf/countries.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"slices"

internal/servewaf/countries_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"encoding/json"

internal/servewaf/crowdsec_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"
@@ -9,9 +9,9 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/reputation"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // The CrowdSec settings, and the tests' engine, which is never asked: each
@@ -168,7 +168,7 @@ func TestObserveModeForwardsAClientTheCrowdSecDecisionListListsAndAlertsTheBan(
 // decisionsURL, answer, the engine's answer, fetched at fetched, as
 // reputation.json would at start.
 func loadDecisions(
-	t *testing.T, server *proxy.Server, fetched time.Time, answer string,
+	t *testing.T, server *servewaf.Server, fetched time.Time, answer string,
 ) {
 	t.Helper()
 

internal/servewaf/errorburst_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"maps"
@@ -10,9 +10,9 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const errorBurstThreshold = "SWWAF_ERROR_BURST_THRESHOLD"
@@ -51,7 +51,7 @@ func (r refused) send(s *sender, from string) logLine {
 // SWWAF_ERROR_BURST_THRESHOLD at threshold, and the settings in env.
 func startForErrorBurst(
 	t *testing.T, threshold string, env map[string]string,
-) (*sender, *clock, *proxy.Server) {
+) (*sender, *clock, *servewaf.Server) {
 	t.Helper()
 
 	settings := map[string]string{

internal/servewaf/health_test.go

@@ -1,11 +1,11 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"
 	"testing"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 func TestHealthEndpointCountsTowardNoLimit(t *testing.T) {
@@ -21,7 +21,7 @@ func TestHealthEndpointCountsTowardNoLimit(t *testing.T) {
 	)
 
 	for range healthChecks {
-		got := s.adminRequest("", http.MethodGet, proxy.HealthPath, "", http.StatusOK)
+		got := s.adminRequest("", http.MethodGet, servewaf.HealthPath, "", http.StatusOK)
 
 		if string(got.body) != "ok\n" || got.header.Get("Content-Type") != contentType {
 			t.Errorf("health endpoint answered %q with Content-Type %q, want ok "+

internal/servewaf/history_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"io"
@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 func TestHistoryKeepsEachRequestOfTheClient(t *testing.T) {
@@ -100,8 +100,8 @@ func TestOwnEndpointsAreNotInTheHistory(t *testing.T) {
 
 	s, _, server := startWithClock(t, "", map[string]string{metricsToken: token})
 
-	s.adminRequest("", http.MethodGet, proxy.HealthPath, "", http.StatusOK)
-	s.adminRequest("", http.MethodGet, proxy.MetricsPath, "", http.StatusUnauthorized)
+	s.adminRequest("", http.MethodGet, servewaf.HealthPath, "", http.StatusOK)
+	s.adminRequest("", http.MethodGet, servewaf.MetricsPath, "", http.StatusUnauthorized)
 	s.scrape()
 
 	if clients := server.Limiter.Snapshot(); len(clients) != 0 {
@@ -126,7 +126,7 @@ func TestPathUnderTheOwnPrefixIsNeitherForwardedNorRefused(t *testing.T) {
 }
 
 // historyOf returns the history of the client at addr.
-func historyOf(t *testing.T, server *proxy.Server, addr string) ratelimit.History {
+func historyOf(t *testing.T, server *servewaf.Server, addr string) ratelimit.History {
 	t.Helper()
 
 	client := netip.MustParsePrefix(addr + "/32")

internal/servewaf/lookup.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"context"

internal/servewaf/lookup_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"
@@ -379,7 +379,7 @@ func TestRequestWaitsAsLongAsTheLookupTimeoutSays(t *testing.T) {
 	// clock of the test's own: the wait lasts exactly as long as it should,
 	// however slowly the test process runs. Nothing in it may wait on the
 	// network, which would keep that clock from moving on: the request is
-	// handed to the proxy's handler, and GeoJS is one that never answers.
+	// handed to servewaf's handler, and GeoJS is one that never answers.
 	synctest.Test(t, func(t *testing.T) {
 		// Not the default. The exclusive list needs the answer, and the app
 		// is never reached.

internal/servewaf/metrics_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"io"
@@ -12,8 +12,8 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/bans"
 	"sneak.berlin/go/smallwebwaf/internal/lookup"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
@@ -32,7 +32,7 @@ func TestMetricsAreOffWhileTheTokenIsUnset(t *testing.T) {
 
 	// An empty token does not match the unset one either.
 	for _, authorization := range []string{bearer, "Bearer ", ""} {
-		s.adminRequest(authorization, http.MethodGet, proxy.MetricsPath, "",
+		s.adminRequest(authorization, http.MethodGet, servewaf.MetricsPath, "",
 			http.StatusNotFound)
 	}
 }
@@ -46,18 +46,18 @@ func TestMetricsNeedTheTokenAndOtherPathsAreNotFound(t *testing.T) {
 		method, path, authorization string
 		status                      int
 	}{
-		{http.MethodGet, proxy.MetricsPath, "", http.StatusUnauthorized},
+		{http.MethodGet, servewaf.MetricsPath, "", http.StatusUnauthorized},
 		{
-			http.MethodGet, proxy.MetricsPath, "Bearer " + strings.ToUpper(token),
+			http.MethodGet, servewaf.MetricsPath, "Bearer " + strings.ToUpper(token),
 			http.StatusUnauthorized,
 		},
-		{http.MethodGet, proxy.MetricsPath, "Basic " + token, http.StatusUnauthorized},
-		{http.MethodGet, proxy.MetricsPath, bearer, http.StatusOK},
-		{http.MethodGet, proxy.MetricsPath, "bearer " + token, http.StatusOK},
-		{http.MethodPost, proxy.MetricsPath, bearer, http.StatusNotFound},
-		{http.MethodGet, proxy.MetricsPath + "/", bearer, http.StatusNotFound},
+		{http.MethodGet, servewaf.MetricsPath, "Basic " + token, http.StatusUnauthorized},
+		{http.MethodGet, servewaf.MetricsPath, bearer, http.StatusOK},
+		{http.MethodGet, servewaf.MetricsPath, "bearer " + token, http.StatusOK},
+		{http.MethodPost, servewaf.MetricsPath, bearer, http.StatusNotFound},
+		{http.MethodGet, servewaf.MetricsPath + "/", bearer, http.StatusNotFound},
 		{http.MethodGet, "/_smallwebwaf/bans", bearer, http.StatusNotFound},
-		{http.MethodPost, proxy.HealthPath, "", http.StatusNotFound},
+		{http.MethodPost, servewaf.HealthPath, "", http.StatusNotFound},
 	} {
 		got := s.adminRequest(tc.authorization, tc.method, tc.path, "", tc.status)
 
@@ -180,7 +180,7 @@ func TestMetricsCountTheBansAnAdminMakes(t *testing.T) {
 	wantMetric(t, s.scrape(), admins, 1)
 
 	// And a ban made through the endpoint.
-	s.admin(http.MethodPost, proxy.BansPath, banOtherClient, http.StatusOK)
+	s.admin(http.MethodPost, servewaf.BansPath, banOtherClient, http.StatusOK)
 	wantMetric(t, s.scrape(), admins, 2)
 }
 
@@ -365,7 +365,7 @@ func keptAnswer(addr, country string) lookup.Answer {
 func scrape(t *testing.T, addr string) string {
 	t.Helper()
 
-	req := newRequest(t, http.MethodGet, addr, proxy.MetricsPath, http.NoBody)
+	req := newRequest(t, http.MethodGet, addr, servewaf.MetricsPath, http.NoBody)
 	req.Header.Set("Authorization", bearer)
 
 	got := do(t, req)
@@ -380,7 +380,7 @@ func scrape(t *testing.T, addr string) string {
 func (s *sender) scrape() string {
 	s.t.Helper()
 
-	return string(s.adminRequest(bearer, http.MethodGet, proxy.MetricsPath, "",
+	return string(s.adminRequest(bearer, http.MethodGet, servewaf.MetricsPath, "",
 		http.StatusOK).body)
 }
 

internal/servewaf/observe_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"

internal/servewaf/proxy.go

@@ -1,12 +1,10 @@
-// Package proxy is servewaf's server. It runs the checks on the request each of
-// rproxy's questions carries, and answers rproxy what to do with that request. It
-// takes rproxy's report once the visitor's answer has ended, which counts the
-// request's bytes and writes its last log line. It answers servewaf's own
-// endpoints: the health check, the metrics, the bans and the clients. It passes
-// nothing to an app: internal/rproxy does that.
-package proxy
+// Package servewaf is the server the servewaf command runs. It answers rproxy's
+// questions, takes rproxy's reports and answers its own endpoints, and writes a
+// log line for each.
+package servewaf
 
 import (
+	"fmt"
 	"io"
 	"log/slog"
 	"net/http"
@@ -46,7 +44,7 @@ const BansPath = "/_smallwebwaf/bans"
 // client's address after it, with SWWAF_ADMIN_TOKEN.
 const ClientsPath = "/_smallwebwaf/clients/"
 
-// Params are what NewServeWAF needs.
+// Params are what New needs.
 type Params struct {
 	Config *config.Config
 	// RequestLog receives two JSON lines per question, one at its decision and
@@ -63,6 +61,9 @@ type Params struct {
 	// LookupFile is the lookup database they are looked up in while
 	// SWWAF_LOOKUP_SOURCE is file, and nil otherwise.
 	LookupFile *lookup.File
+	// CoreRuleSet is what NewCoreRuleSet returns: what inspects requests
+	// while SWWAF_WAF_MODE is not off, and nil while it is.
+	CoreRuleSet *waf.CoreRuleSet
 	// Now tells the time by which requests are counted for the rate
 	// limits, bans are made and run out, and GeoJS's answers are kept,
 	// normally time.Now in UTC, the time the state files give.
@@ -147,7 +148,7 @@ func newHandler(params Params) *handler {
 		dnsbl:       dnsbl,
 		abuseIPDB:   abuseIPDB,
 		rules:       params.Rules,
-		coreRuleSet: newCoreRuleSet(params.Config),
+		coreRuleSet: params.CoreRuleSet,
 		alerts:      params.Alerts,
 	}
 	h.geojs = lookup.New(lookup.Params{
@@ -205,29 +206,34 @@ func newReputation(
 	return lists, dnsbl, abuseIPDB
 }
 
-// newCoreRuleSet returns the Core Rule Set at SWWAF_WAF_PARANOIA_LEVEL,
+// NewCoreRuleSet returns the Core Rule Set at SWWAF_WAF_PARANOIA_LEVEL,
 // without the rules SWWAF_WAF_DISABLED_RULES switches off, reading bodies
-// up to SWWAF_WAF_BODY_LIMIT, or nil while SWWAF_WAF_MODE is off. It reads at
-// most QuestionBodyMaxBytes less one byte: a question's body of
+// up to SWWAF_WAF_BODY_LIMIT, with the exclusions in
+// SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE, or nil while SWWAF_WAF_MODE is off. It
+// reads at most QuestionBodyMaxBytes less one byte: a question's body of
 // QuestionBodyMaxBytes may be cut short, and the Core Rule Set does not read a
-// JSON or XML body over its limit.
-func newCoreRuleSet(cfg *config.Config) *waf.CoreRuleSet {
-	if cfg.WAFMode == config.WAFModeOff {
-		return nil
+// JSON or XML body over its limit. An exclusions file that waf.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) (*waf.CoreRuleSet, error) {
+	if cfg.WAFMode == config.WAFModeOff && cfg.CoreRuleSetExclusionsFile == "" {
+		return nil, nil //nolint:nilnil // off is no Core Rule Set, and no error
 	}
 
 	coreRuleSet, err := waf.New(waf.Params{
 		ParanoiaLevel: cfg.WAFParanoiaLevel, DisabledRules: cfg.WAFDisabledRules,
-		BodyLimit: min(cfg.WAFBodyLimit, QuestionBodyMaxBytes-1),
+		BodyLimit:      min(cfg.WAFBodyLimit, QuestionBodyMaxBytes-1),
+		ExclusionsFile: cfg.CoreRuleSetExclusionsFile,
 	})
 	if err != nil {
-		// The Core Rule Set is built in, and the settings cannot break it:
-		// the paranoia level is from 1 to 4, and the id of no rule switches
-		// nothing off.
-		panic(err)
+		return nil, fmt.Errorf("SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE: %w", err)
 	}
 
-	return coreRuleSet
+	if cfg.WAFMode == config.WAFModeOff {
+		return nil, nil //nolint:nilnil // off is no Core Rule Set, and no error
+	}
+
+	return coreRuleSet, nil
 }
 
 // handler is servewaf's handler. It holds what every request shares; what

internal/servewaf/proxy_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"bufio"
@@ -15,13 +15,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/config"
 	"sneak.berlin/go/smallwebwaf/internal/lookup"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
 	"sneak.berlin/go/smallwebwaf/internal/rproxy"
 	"sneak.berlin/go/smallwebwaf/internal/rules"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
@@ -300,7 +302,7 @@ func startProxyWithGeoJS(
 func startProxyWithClock(
 	t *testing.T, appURL, geojsURL string, now func() time.Time,
 	env map[string]string,
-) (string, *output, *proxy.Server) {
+) (string, *output, *servewaf.Server) {
 	t.Helper()
 
 	addr, out, server, _ := startProxyWithAlerts(t, appURL, geojsURL, now, env)
@@ -313,7 +315,7 @@ func startProxyWithClock(
 func startProxyWithAlerts(
 	t *testing.T, appURL, geojsURL string, now func() time.Time,
 	env map[string]string,
-) (string, *output, *proxy.Server, *alerts.Queue) {
+) (string, *output, *servewaf.Server, *alerts.Queue) {
 	t.Helper()
 
 	server, out, alertQueue := newServeWAF(t, geojsURL, now, env)
@@ -324,7 +326,7 @@ func startProxyWithAlerts(
 
 // serve serves server on a port of its own until the test ends, and sets its
 // Addr to where it listens.
-func serve(t *testing.T, server *proxy.Server) {
+func serve(t *testing.T, server *servewaf.Server) {
 	t.Helper()
 
 	listener, err := (&net.ListenConfig{}).Listen(t.Context(), "tcp", localhost+":0")
@@ -347,6 +349,17 @@ func serve(t *testing.T, server *proxy.Server) {
 // at serveWAFAddr, with the settings in env on top of the defaults, and returns
 // where it listens. What it writes is dropped. SWRP_TIMEOUT_MS is a minute unless
 // env sets it, so that on a busy host SWRP_DEFAULT_DISPOSITION does not decide.
+// viperFrom returns a viper Set with each of settings, as the viper
+// config.NewViper returns one bound to a process's environment.
+func viperFrom(settings map[string]string) *viper.Viper {
+	v := viper.New()
+	for name, value := range settings {
+		v.Set(name, value)
+	}
+
+	return v
+}
+
 func startRProxy(
 	t *testing.T, serveWAFAddr, appURL string, env map[string]string,
 ) string {
@@ -359,11 +372,7 @@ func startRProxy(
 	}
 	maps.Copy(settings, env)
 
-	cfg, err := config.RProxyFromEnvironment(func(name string) (string, bool) {
-		value, ok := settings[name]
-
-		return value, ok
-	})
+	cfg, err := config.RProxyFromEnvironment(viperFrom(settings))
 	if err != nil {
 		t.Fatalf("settings %v: %v", settings, err)
 	}
@@ -401,17 +410,17 @@ func startRProxy(
 // inspected by it.
 func newServeWAF(
 	t *testing.T, geojsURL string, now func() time.Time, env map[string]string,
-) (*proxy.Server, *output, *alerts.Queue) {
+) (*servewaf.Server, *output, *alerts.Queue) {
 	t.Helper()
 
-	return newServeWAFWith(t, proxy.NewServeWAF, geojsURL, now, env)
+	return newServeWAFWith(t, servewaf.New, geojsURL, now, env)
 }
 
 // newServeWAFWith is newServeWAF for the server build makes.
 func newServeWAFWith(
-	t *testing.T, build func(proxy.Params) *proxy.Server,
+	t *testing.T, build func(servewaf.Params) *servewaf.Server,
 	geojsURL string, now func() time.Time, env map[string]string,
-) (*proxy.Server, *output, *alerts.Queue) {
+) (*servewaf.Server, *output, *alerts.Queue) {
 	t.Helper()
 
 	settings := map[string]string{
@@ -423,11 +432,7 @@ func newServeWAFWith(
 
 	maps.Copy(settings, env)
 
-	cfg, err := config.FromEnvironment(func(name string) (string, bool) {
-		value, ok := settings[name]
-
-		return value, ok
-	})
+	cfg, err := config.FromEnvironment(viperFrom(settings))
 	if err != nil {
 		t.Fatalf("settings %v: %v", settings, err)
 	}
@@ -463,13 +468,19 @@ func newServeWAFWith(
 		}
 	}
 
-	server := build(proxy.Params{
+	coreRuleSet, err := servewaf.NewCoreRuleSet(cfg)
+	if err != nil {
+		t.Fatalf("Core Rule Set: %v", err)
+	}
+
+	server := build(servewaf.Params{
 		Config:       cfg,
 		RequestLog:   out,
 		ProcessLog:   processLog,
 		GeoJSURL:     geojsURL,
 		AbuseIPDBURL: abuseIPDBURL,
 		LookupFile:   lookupFile,
+		CoreRuleSet:  coreRuleSet,
 		Now:          now,
 		Rules:        ruleFiles,
 		Alerts:       alertQueue,

internal/servewaf/ratelimits_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"

internal/servewaf/reputation.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"context"

internal/servewaf/reputation_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"fmt"
@@ -15,10 +15,10 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/reputation"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // The reputation settings.
@@ -617,7 +617,7 @@ const (
 // AbuseIPDB.
 const abuseipdb = reputation.AbuseIPDBSource
 
-// abuseIPDBURL is where newProxy has clients checked with AbuseIPDB: at
+// abuseIPDBURL is where newServeWAF has clients checked with AbuseIPDB: at
 // abuseIPDBStandIn, which TestMain registers with Go's default transport,
 // through which AbuseIPDB is asked.
 const abuseIPDBURL = "abuseipdb://stand-in/api/v2/check"
@@ -975,7 +975,7 @@ func verdictsFetched() time.Time {
 // verdictsFetched, as reputation.json would at start: one that lists the
 // client from each zone listedBy gives for it, and one that does not from
 // each other zone.
-func loadVerdicts(server *proxy.Server, listedBy map[string][]string) {
+func loadVerdicts(server *servewaf.Server, listedBy map[string][]string) {
 	verdicts := make([]reputation.Verdict, 0, len(listedBy)*len(server.DNSBL.Zones()))
 
 	for client, zones := range listedBy {
@@ -993,7 +993,7 @@ func loadVerdicts(server *proxy.Server, listedBy map[string][]string) {
 // loadScores puts into server's AbuseIPDB the score scores gives each
 // client, an IPv4 address, fetched at verdictsFetched, as reputation.json
 // would at start.
-func loadScores(server *proxy.Server, scores map[string]int64) {
+func loadScores(server *servewaf.Server, scores map[string]int64) {
 	kept := make([]reputation.Score, 0, len(scores))
 	for client, score := range scores {
 		kept = append(kept, reputation.Score{
@@ -1007,7 +1007,7 @@ func loadScores(server *proxy.Server, scores map[string]int64) {
 
 // wantAbuseIPDBChecks checks how many clients server has checked with
 // AbuseIPDB.
-func wantAbuseIPDBChecks(t *testing.T, server *proxy.Server, want int) {
+func wantAbuseIPDBChecks(t *testing.T, server *servewaf.Server, want int) {
 	t.Helper()
 
 	if got := server.AbuseIPDB.Checked(); got != want {
@@ -1017,7 +1017,7 @@ func wantAbuseIPDBChecks(t *testing.T, server *proxy.Server, want int) {
 
 // loadLists puts copies of lists into server's lists, by URL, each with
 // its lines, fetched at listsFetched, as reputation.json would at start.
-func loadLists(t *testing.T, server *proxy.Server, copies map[string][]string) {
+func loadLists(t *testing.T, server *servewaf.Server, copies map[string][]string) {
 	t.Helper()
 
 	lists := make([]reputation.List, 0, len(copies))

internal/servewaf/request.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"context"

internal/servewaf/requestlog_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"io"
@@ -10,16 +10,16 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
 	// requestIDHeader carries the request's id.
 	requestIDHeader = "X-Request-ID"
 	// instance is the SWWAF_INSTANCE_NAME a test sets.
-	instance = "fsn1app1/gitea"
+	instance = "fsn1app1/blog"
 	// ipv6Client is a client on IPv6, and ipv6Group the netblock the rate
 	// limits count it as.
 	ipv6Client = "2001:db8::7"
@@ -220,7 +220,7 @@ func TestTimingsAreInOrder(t *testing.T) {
 	wantStatus(t, do(t, req), http.StatusForbidden)
 	refused := out.endedLines(t, 2)[1]
 
-	wantStatus(t, get(t, server.Addr, proxy.HealthPath), http.StatusOK)
+	wantStatus(t, get(t, server.Addr, servewaf.HealthPath), http.StatusOK)
 	health := out.endedLines(t, 3)[2]
 
 	// A request passed to the app has every timing; one refused, none of

internal/servewaf/rulefiles_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"

internal/servewaf/rules.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"slices"

internal/servewaf/servewaf.go

@@ -1,4 +1,4 @@
-package proxy
+package servewaf
 
 import (
 	"bytes"
@@ -103,13 +103,13 @@ type Report struct {
 	DurationUpstreamTotal float64 `json:"duration_upstream_total"`
 }
 
-// NewServeWAF returns the server `smallwebwaf servewaf` runs. It answers
+// New returns the server `smallwebwaf servewaf` runs. It answers
 // rproxy's questions, takes rproxy's reports and answers its own endpoints. It
 // passes nothing to an app. rproxy applies the size and time limits to the
 // visitor. Go's default limit on a request's line and headers, 1 MiB, stays: it
 // is far above rproxy's, and a question refused for its size would have rproxy
 // let the request through.
-func NewServeWAF(params Params) *Server {
+func New(params Params) *Server {
 	h := newHandler(params)
 
 	return &Server{

internal/servewaf/servewaf_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"context"
@@ -19,9 +19,9 @@ import (
 
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/bans"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/ratelimit"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 const (
@@ -57,7 +57,7 @@ type serveWAF struct {
 	t      *testing.T
 	addr   string
 	out    *output
-	server *proxy.Server
+	server *servewaf.Server
 	clock  *clock
 	queue  *alerts.Queue
 }
@@ -67,13 +67,13 @@ type serveWAF struct {
 func startServeWAF(t *testing.T, geojsURL string, env map[string]string) *serveWAF {
 	t.Helper()
 
-	return startServeWAFWith(t, geojsURL, env, func(*proxy.Server) {})
+	return startServeWAFWith(t, geojsURL, env, func(*servewaf.Server) {})
 }
 
 // startServeWAFWith is startServeWAF with change applied to the server before
 // it starts.
 func startServeWAFWith(
-	t *testing.T, geojsURL string, env map[string]string, change func(*proxy.Server),
+	t *testing.T, geojsURL string, env map[string]string, change func(*servewaf.Server),
 ) *serveWAF {
 	t.Helper()
 
@@ -103,8 +103,8 @@ func (s *serveWAF) questionWith(
 
 	req := newRequest(s.t, method, s.addr, path, body)
 	req.Host = host
-	req.Header.Set(proxy.ClientHeader, from)
-	req.Header.Set(proxy.PeerHeader, rproxyPeer)
+	req.Header.Set(servewaf.ClientHeader, from)
+	req.Header.Set(servewaf.PeerHeader, rproxyPeer)
 	req.Header.Set(requestIDHeader, rand.Text())
 
 	return req
@@ -131,13 +131,13 @@ func (s *serveWAF) allowed(from string) string {
 	s.t.Helper()
 
 	req := s.question(siteA, from, "/")
-	wantDisposition(s.t, do(s.t, req), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(s.t, do(s.t, req), http.StatusOK, servewaf.DispositionAllow)
 
 	return req.Header.Get(requestIDHeader)
 }
 
 // report sends rproxy's report and returns the answer.
-func (s *serveWAF) report(report proxy.Report) answer {
+func (s *serveWAF) report(report servewaf.Report) answer {
 	s.t.Helper()
 
 	body, err := json.Marshal(report)
@@ -152,7 +152,7 @@ func (s *serveWAF) report(report proxy.Report) answer {
 func (s *serveWAF) reportBody(body string) answer {
 	s.t.Helper()
 
-	return do(s.t, newRequest(s.t, http.MethodPost, s.addr, proxy.ReportPath,
+	return do(s.t, newRequest(s.t, http.MethodPost, s.addr, servewaf.ReportPath,
 		strings.NewReader(body)))
 }
 
@@ -161,7 +161,7 @@ func (s *serveWAF) reportBody(body string) answer {
 func (s *serveWAF) passedOn(from string) {
 	s.t.Helper()
 
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID:     s.allowed(from),
 		Status:        http.StatusOK,
 		RequestBytes:  bodyBytes,
@@ -182,7 +182,7 @@ func (s *serveWAF) history() ratelimit.History {
 func (s *serveWAF) metrics() string {
 	s.t.Helper()
 
-	req := newRequest(s.t, http.MethodGet, s.addr, proxy.MetricsPath, http.NoBody)
+	req := newRequest(s.t, http.MethodGet, s.addr, servewaf.MetricsPath, http.NoBody)
 	req.Header.Set("Authorization", bearer)
 
 	got := do(s.t, req)
@@ -196,7 +196,7 @@ func wantDisposition(t *testing.T, got answer, status int, disposition string) {
 	t.Helper()
 	wantStatus(t, got, status)
 
-	if answered := got.header.Get(proxy.DispositionHeader); answered != disposition {
+	if answered := got.header.Get(servewaf.DispositionHeader); answered != disposition {
 		t.Errorf("answered with disposition %q, want %q", answered, disposition)
 	}
 }
@@ -248,10 +248,10 @@ func TestQuestionAllowedIsAnsweredAndLogged(t *testing.T) {
 	req := s.question(siteA, client, "/page?q=1&token=visible")
 	req.Header.Set(requestIDHeader, "the-id")
 	req.Header.Set("X-Forwarded-Proto", "https")
-	req.Header.Set(proxy.ContentLengthHeader, "1234")
+	req.Header.Set(servewaf.ContentLengthHeader, "1234")
 
 	got := do(t, req)
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 	wantBody(t, got, "")
 
 	if id := got.header.Get(requestIDHeader); id != "" {
@@ -278,7 +278,7 @@ func TestIPv6VisitorIsCountedInItsGroup(t *testing.T) {
 	s.allowed("2001:db8::1")
 
 	got := s.ask("2001:db8::2", "/")
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 }
 
 func TestIPv4VisitorInIPv6FormIsTheIPv4Client(t *testing.T) {
@@ -287,9 +287,9 @@ func TestIPv4VisitorInIPv6FormIsTheIPv4Client(t *testing.T) {
 	s := startServeWAF(t, "", map[string]string{denyNets: client})
 
 	req := s.question(siteA, "::ffff:"+client, "/")
-	req.Header.Set(proxy.PeerHeader, "::ffff:"+rproxyPeer)
+	req.Header.Set(servewaf.PeerHeader, "::ffff:"+rproxyPeer)
 
-	wantDisposition(t, do(t, req), http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, do(t, req), http.StatusForbidden, servewaf.DispositionDeny)
 
 	line := s.out.requestLine(t)
 	if line.ClientIP != client || line.PeerIP != rproxyPeer {
@@ -305,13 +305,13 @@ func TestMalformedQuestionGets400AndAWarningAndNoLine(t *testing.T) {
 		change func(*http.Request)
 	}{
 		{"client not an address", func(req *http.Request) {
-			req.Header.Set(proxy.ClientHeader, "not an address")
+			req.Header.Set(servewaf.ClientHeader, "not an address")
 		}},
 		{"client empty", func(req *http.Request) {
-			req.Header.Set(proxy.ClientHeader, "")
+			req.Header.Set(servewaf.ClientHeader, "")
 		}},
 		{"client address with a zone", func(req *http.Request) {
-			req.Header.Set(proxy.ClientHeader, "2001:db8::1%eth0")
+			req.Header.Set(servewaf.ClientHeader, "2001:db8::1%eth0")
 		}},
 		{"id absent", func(req *http.Request) {
 			req.Header.Del(requestIDHeader)
@@ -353,7 +353,7 @@ func TestLongestValidIDIsTaken(t *testing.T) {
 
 	req := s.question(siteA, client, "/")
 	req.Header.Set(requestIDHeader, strings.Repeat("x", 128))
-	wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 }
 
 func TestQuestionWithABodyOver64KiBGets400(t *testing.T) {
@@ -361,15 +361,15 @@ func TestQuestionWithABodyOver64KiBGets400(t *testing.T) {
 
 	s := startServeWAF(t, "", nil)
 
-	over := strings.NewReader(strings.Repeat("x", proxy.QuestionBodyMaxBytes+1))
+	over := strings.NewReader(strings.Repeat("x", servewaf.QuestionBodyMaxBytes+1))
 	got := do(t, s.questionWith(http.MethodPost, siteA, client, "/", over))
 	wantDisposition(t, got, http.StatusBadRequest, "")
 	wantProcessMessages(t, s, "a question is refused", 1)
 	wantNoRequestLines(t, s)
 
-	whole := strings.NewReader(strings.Repeat("x", proxy.QuestionBodyMaxBytes))
+	whole := strings.NewReader(strings.Repeat("x", servewaf.QuestionBodyMaxBytes))
 	got = do(t, s.questionWith(http.MethodPost, siteA, client, "/", whole))
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 }
 
 func TestQuestionWithAHeldIDIsRefused(t *testing.T) {
@@ -385,15 +385,15 @@ func TestQuestionWithAHeldIDIsRefused(t *testing.T) {
 	wantProcessMessages(t, s, "a question is refused", 1)
 
 	// A denied request's id is held as well.
-	denied := s.question(siteA, otherClient, proxy.HealthPath)
-	wantDisposition(t, do(t, denied), http.StatusNotFound, proxy.DispositionDeny)
+	denied := s.question(siteA, otherClient, servewaf.HealthPath)
+	wantDisposition(t, do(t, denied), http.StatusNotFound, servewaf.DispositionDeny)
 
 	again = s.question(siteA, client, "/")
 	again.Header.Set(requestIDHeader, denied.Header.Get(requestIDHeader))
 	wantDisposition(t, do(t, again), http.StatusBadRequest, "")
 
 	// The report ends the holding, and the refused questions changed nothing.
-	got := s.report(proxy.Report{RequestID: id, ResponseBytes: answerBytes})
+	got := s.report(servewaf.Report{RequestID: id, ResponseBytes: answerBytes})
 	wantStatus(t, got, http.StatusNoContent)
 
 	if history := s.history(); history.ResponseBytes != answerBytes {
@@ -402,7 +402,7 @@ func TestQuestionWithAHeldIDIsRefused(t *testing.T) {
 
 	again = s.question(siteA, client, "/")
 	again.Header.Set(requestIDHeader, id)
-	wantDisposition(t, do(t, again), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, do(t, again), http.StatusOK, servewaf.DispositionAllow)
 }
 
 func TestReportNeverReachesAQuestionStillBeingHandled(t *testing.T) {
@@ -436,7 +436,7 @@ func TestReportNeverReachesAQuestionStillBeingHandled(t *testing.T) {
 
 	// A report for a question not yet answered is ignored, and that question's
 	// id is taken.
-	got := s.report(proxy.Report{RequestID: id, ResponseBytes: 1000})
+	got := s.report(servewaf.Report{RequestID: id, ResponseBytes: 1000})
 	wantStatus(t, got, http.StatusNoContent)
 
 	// This would wait on the same lookup were the id not taken.
@@ -451,7 +451,7 @@ func TestReportNeverReachesAQuestionStillBeingHandled(t *testing.T) {
 
 	select {
 	case got := <-answered:
-		wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+		wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 	case <-time.After(waitLimit):
 		t.Fatal("the question got no answer")
 	}
@@ -466,7 +466,7 @@ func TestReportNeverReachesAQuestionStillBeingHandled(t *testing.T) {
 	}
 
 	// The true report comes after, and is the one that counts.
-	got = s.report(proxy.Report{RequestID: id, ResponseBytes: answerBytes})
+	got = s.report(servewaf.Report{RequestID: id, ResponseBytes: answerBytes})
 	wantStatus(t, got, http.StatusNoContent)
 
 	if history := s.history(); history.ResponseBytes != answerBytes {
@@ -484,13 +484,13 @@ func TestPeerAbsentOrUnreadableIsAnsweredAndLoggedInvalid(t *testing.T) {
 			s := startServeWAF(t, "", nil)
 
 			req := s.question(siteA, client, "/")
-			req.Header.Del(proxy.PeerHeader)
+			req.Header.Del(servewaf.PeerHeader)
 
 			if peer != "" {
-				req.Header.Set(proxy.PeerHeader, peer)
+				req.Header.Set(servewaf.PeerHeader, peer)
 			}
 
-			wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+			wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 
 			if line := s.out.requestLine(t); line.PeerIP != "invalid IP" {
 				t.Errorf("log line has peer_ip %q, want invalid IP", line.PeerIP)
@@ -511,8 +511,8 @@ func TestContentLengthUnreadableOrNegativeCountsAsAbsent(t *testing.T) {
 			})
 
 			req := s.question(siteA, client, "/")
-			req.Header.Set(proxy.ContentLengthHeader, announced)
-			wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+			req.Header.Set(servewaf.ContentLengthHeader, announced)
+			wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 
 			if line := s.out.requestLine(t); line.ContentLength != 0 {
 				t.Errorf("log line has content_length %d, want none", line.ContentLength)
@@ -527,13 +527,13 @@ func TestHeaderSentTwiceUsesItsFirstValue(t *testing.T) {
 	s := startServeWAF(t, "", nil)
 
 	req := s.question(siteA, client, "/")
-	req.Header.Add(proxy.ClientHeader, otherClient)
-	req.Header.Add(proxy.PeerHeader, "172.18.0.3")
+	req.Header.Add(servewaf.ClientHeader, otherClient)
+	req.Header.Add(servewaf.PeerHeader, "172.18.0.3")
 	req.Header.Set(requestIDHeader, "first")
 	req.Header.Add(requestIDHeader, "second")
-	req.Header.Set(proxy.ContentLengthHeader, "1234")
-	req.Header.Add(proxy.ContentLengthHeader, "5678")
-	wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+	req.Header.Set(servewaf.ContentLengthHeader, "1234")
+	req.Header.Add(servewaf.ContentLengthHeader, "5678")
+	wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 
 	line := s.out.requestLine(t)
 	if line.ClientIP != client || line.PeerIP != rproxyPeer ||
@@ -562,7 +562,7 @@ func sendQuestionWithPartOfItsBody(t *testing.T, conn net.Conn) {
 	_, err := fmt.Fprintf(conn,
 		"POST / HTTP/1.1\r\nHost: %s\r\n%s: %s\r\n%s: an-id\r\n"+
 			"Content-Length: 100\r\n\r\npart",
-		siteA, proxy.ClientHeader, client, requestIDHeader)
+		siteA, servewaf.ClientHeader, client, requestIDHeader)
 	if err != nil {
 		t.Fatalf("send the question: %v", err)
 	}
@@ -592,7 +592,7 @@ func TestQuestionWhoseBodyStopsArrivingGetsNoAnswer(t *testing.T) {
 			t.Parallel()
 
 			s := startServeWAFWith(t, "", map[string]string{metricsToken: token},
-				func(server *proxy.Server) { server.ReadTimeout = readTimeout })
+				func(server *servewaf.Server) { server.ReadTimeout = readTimeout })
 
 			conn := dial(t, s.addr)
 			sendQuestionWithPartOfItsBody(t, conn)
@@ -615,7 +615,7 @@ func TestQuestionWhoseBodyStopsArrivingGetsNoAnswer(t *testing.T) {
 			// The id was not taken.
 			again := s.question(siteA, client, "/")
 			again.Header.Set(requestIDHeader, "an-id")
-			wantDisposition(t, do(t, again), http.StatusOK, proxy.DispositionAllow)
+			wantDisposition(t, do(t, again), http.StatusOK, servewaf.DispositionAllow)
 		})
 	}
 }
@@ -632,7 +632,7 @@ func TestQuestionDeniedGetsTheBanResponse(t *testing.T) {
 			})
 
 			got := s.ask(client, "/")
-			wantDisposition(t, got, status, proxy.DispositionDeny)
+			wantDisposition(t, got, status, servewaf.DispositionDeny)
 			wantBody(t, got, http.StatusText(status)+"\n")
 			wantLine(t, s.out.requestLine(t), status, requestlog.ActionDenied)
 		})
@@ -647,7 +647,7 @@ func TestBanResponseCloseIsAnAnswerOfItsOwn(t *testing.T) {
 	})
 
 	got := s.ask(client, "/")
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionClose)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionClose)
 	wantBody(t, got, "")
 	// The visitor is sent nothing.
 	wantLine(t, s.out.requestLine(t), 0, requestlog.ActionDenied)
@@ -664,12 +664,12 @@ func TestBlockRuleIsDeniedWith403AndABanRuleWithTheBanResponse(t *testing.T) {
 	})
 
 	got := s.ask(client, "/blocked")
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 	wantLine(t, s.out.requestLine(t), http.StatusForbidden,
 		requestlog.ActionRuleBlocked)
 
 	got = s.ask(client, "/.env")
-	wantDisposition(t, got, http.StatusTooManyRequests, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusTooManyRequests, servewaf.DispositionDeny)
 	wantLine(t, s.out.requestLines(t, 2)[1], http.StatusTooManyRequests,
 		requestlog.ActionBanned)
 }
@@ -681,15 +681,17 @@ func TestQuestionUnderTheOwnPrefixIsDeniedWith404AfterTheChecks(t *testing.T) {
 		metricsToken: token, denyNets: otherClient,
 	})
 
-	for _, path := range []string{proxy.HealthPath, proxy.MetricsPath, proxy.ReportPath} {
+	for _, path := range []string{
+		servewaf.HealthPath, servewaf.MetricsPath, servewaf.ReportPath,
+	} {
 		got := s.ask(client, path)
-		wantDisposition(t, got, http.StatusNotFound, proxy.DispositionDeny)
+		wantDisposition(t, got, http.StatusNotFound, servewaf.DispositionDeny)
 	}
 
 	wantLine(t, s.out.requestLine(t), http.StatusNotFound, requestlog.ActionAdmin)
 
-	got := s.ask(otherClient, proxy.MetricsPath)
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	got := s.ask(otherClient, servewaf.MetricsPath)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 }
 
 func TestObserveModeAllowsAndLogsWhatEnforceModeWouldHaveDone(t *testing.T) {
@@ -698,7 +700,7 @@ func TestObserveModeAllowsAndLogsWhatEnforceModeWouldHaveDone(t *testing.T) {
 	s := startServeWAF(t, "", map[string]string{mode: observe, denyNets: client})
 
 	got := s.ask(client, "/")
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 
 	line := s.out.requestLine(t)
 	wantLine(t, line, http.StatusOK, requestlog.ActionForward)
@@ -714,7 +716,7 @@ func TestObserveModeRefusalAnsweredAllowCountsForTheErrorBurst(t *testing.T) {
 
 	for range 2 {
 		got := s.ask(client, "/blocked")
-		wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+		wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 	}
 
 	lines := s.out.requestLines(t, 2)
@@ -733,7 +735,7 @@ func TestDeniedQuestionCountsForTheErrorBurst(t *testing.T) {
 
 	for range 2 {
 		got := s.ask(client, "/blocked")
-		wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+		wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 	}
 
 	lines := s.out.requestLines(t, 2)
@@ -762,7 +764,7 @@ func TestAllowCarriesTheLookupHeadersWhileTheSettingIsSet(t *testing.T) {
 			})
 
 			got := s.ask(fromDE, "/")
-			wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+			wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 
 			asn, country := got.header.Get("X-Client-Asn"), got.header.Get("X-Client-Country")
 			if asn != tc.wantASN || country != tc.wantCountry {
@@ -787,7 +789,7 @@ func TestReportCountsTowardAByteLimitWhichThenBans(t *testing.T) {
 	}
 
 	// 100 bytes are over the limit of 99.
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID: id, Status: http.StatusBadGateway,
 		RequestBytes: bodyBytes, ResponseBytes: answerBytes,
 	})
@@ -811,7 +813,7 @@ func TestReportCountsTowardAByteLimitWhichThenBans(t *testing.T) {
 	}
 
 	got = s.ask(client, "/")
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 }
 
 func TestReportCountsAtThePercentageItsQuestionWasGiven(t *testing.T) {
@@ -825,10 +827,10 @@ func TestReportCountsAtThePercentageItsQuestionWasGiven(t *testing.T) {
 	})
 
 	s.passedOn(fromKP)
-	wantDisposition(t, s.ask(fromKP, "/"), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, s.ask(fromKP, "/"), http.StatusOK, servewaf.DispositionAllow)
 
 	s.passedOn(fromDE)
-	wantDisposition(t, s.ask(fromDE, "/"), http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, s.ask(fromDE, "/"), http.StatusForbidden, servewaf.DispositionDeny)
 }
 
 func TestReportAddsTheRequestToItsClientsHistoryAndTheAnomalyCounters(t *testing.T) {
@@ -846,7 +848,7 @@ func TestReportAddsTheRequestToItsClientsHistoryAndTheAnomalyCounters(t *testing
 		t.Errorf("anomaly counters %v before the report, want none", counters)
 	}
 
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID: id, Status: http.StatusBadGateway,
 		RequestBytes: bodyBytes, ResponseBytes: answerBytes,
 	})
@@ -874,7 +876,7 @@ func TestDeniedRequestIsFinishedAtItsDecision(t *testing.T) {
 	s.allowed(client)
 
 	denied := s.question(siteA, client, "/")
-	wantDisposition(t, do(t, denied), http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, do(t, denied), http.StatusForbidden, servewaf.DispositionDeny)
 
 	counters := s.server.Anomalies.Snapshot()
 	if len(counters) != 1 || counters[0].Minute.Current != 1 {
@@ -891,7 +893,7 @@ func TestDeniedRequestIsFinishedAtItsDecision(t *testing.T) {
 
 	wantMetric(t, s.metrics(), series, 1)
 
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID: denied.Header.Get(requestIDHeader), Status: http.StatusForbidden,
 		ResponseBytes: 1000, DurationTotal: 2,
 	})
@@ -924,7 +926,7 @@ func TestMetricsCountAnAllowedRequestFromItsReport(t *testing.T) {
 	wantMetric(t, metrics, `smallwebwaf_requests_in_flight{instance="`+alertInstance+`"}`,
 		1) // the scrape itself
 
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID: id, Status: http.StatusBadGateway,
 		RequestBytes: bodyBytes, ResponseBytes: answerBytes,
 		DurationTotal: 5, DurationUpstreamTotal: 4,
@@ -942,7 +944,7 @@ func TestMetricsCountAnAllowedRequestFromItsReport(t *testing.T) {
 	// check needs a server that has not been scraped yet.
 	unscraped := startServeWAF(t, "", map[string]string{metricsToken: token})
 
-	got = unscraped.report(proxy.Report{
+	got = unscraped.report(servewaf.Report{
 		RequestID: unscraped.allowed(client), Status: http.StatusBadGateway, DurationTotal: 5,
 	})
 	wantStatus(t, got, http.StatusNoContent)
@@ -955,7 +957,7 @@ func TestReportForARequestNotHeldIsIgnored(t *testing.T) {
 
 	s := startServeWAF(t, "", map[string]string{bytesLimitPerMinute: byteLimit})
 
-	got := s.report(proxy.Report{RequestID: "no-such-request", ResponseBytes: 1000})
+	got := s.report(servewaf.Report{RequestID: "no-such-request", ResponseBytes: 1000})
 	wantStatus(t, got, http.StatusNoContent)
 
 	if clients := s.server.Limiter.Snapshot(); len(clients) != 0 {
@@ -972,7 +974,7 @@ func TestReportForARequestNotHeldIsIgnored(t *testing.T) {
 	// A second report of the same request does not count it twice.
 	id := s.allowed(client)
 	for range 2 {
-		got = s.report(proxy.Report{RequestID: id, ResponseBytes: answerBytes})
+		got = s.report(servewaf.Report{RequestID: id, ResponseBytes: answerBytes})
 		wantStatus(t, got, http.StatusNoContent)
 	}
 
@@ -1160,7 +1162,7 @@ func TestBytesAtTheirMostEachWayBanRatherThanOverflow(t *testing.T) {
 
 	s := startServeWAF(t, "", map[string]string{bytesLimitPerMinute: byteLimit})
 
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID: s.allowed(client), Status: http.StatusOK,
 		RequestBytes: reportedBytesLimit, ResponseBytes: reportedBytesLimit,
 	})
@@ -1245,9 +1247,9 @@ func TestReportWritesTheLastLineWithTheDecisionsAndTheReportsFields(t *testing.T
 	req.Header.Set("X-Forwarded-Proto", "https")
 	id := req.Header.Get(requestIDHeader)
 
-	wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 
-	got := s.report(proxy.Report{
+	got := s.report(servewaf.Report{
 		RequestID: id, Status: http.StatusCreated,
 		RequestBytes: bodyBytes, ResponseBytes: answerBytes,
 		DurationTotal: 12.5, DurationUpstreamTotal: 10.25,
@@ -1294,7 +1296,7 @@ func TestEveryDeniedRequestsReportGetsItsLastLine(t *testing.T) {
 			"close", map[string]string{denyNets: client, banResponse: banResponseClose}, "/",
 			0, requestlog.ActionDenied,
 		},
-		{"own prefix", nil, proxy.HealthPath, http.StatusNotFound, requestlog.ActionAdmin},
+		{"own prefix", nil, servewaf.HealthPath, http.StatusNotFound, requestlog.ActionAdmin},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			t.Parallel()
@@ -1305,7 +1307,7 @@ func TestEveryDeniedRequestsReportGetsItsLastLine(t *testing.T) {
 			id := req.Header.Get(requestIDHeader)
 			do(t, req)
 
-			got := s.report(proxy.Report{
+			got := s.report(servewaf.Report{
 				RequestID: id, Status: tc.status, ResponseBytes: 8, DurationTotal: 3,
 			})
 			wantStatus(t, got, http.StatusNoContent)
@@ -1341,18 +1343,18 @@ func TestOldestAnsweredRequestIsDroppedPastTheBound(t *testing.T) {
 			t.Fatalf("question: %v", err)
 		}
 
-		wantDisposition(t, readAnswer(res), http.StatusOK, proxy.DispositionAllow)
+		wantDisposition(t, readAnswer(res), http.StatusOK, servewaf.DispositionAllow)
 	}
 
 	// The table is full again with next and those, without oldest.
-	got := s.report(proxy.Report{RequestID: oldest, ResponseBytes: answerBytes})
+	got := s.report(servewaf.Report{RequestID: oldest, ResponseBytes: answerBytes})
 	wantStatus(t, got, http.StatusNoContent)
 
 	if counted := s.history().Requests; counted != 0 {
 		t.Errorf("history holds %d requests, want the dropped one not counted", counted)
 	}
 
-	got = s.report(proxy.Report{RequestID: next, ResponseBytes: answerBytes})
+	got = s.report(servewaf.Report{RequestID: next, ResponseBytes: answerBytes})
 	wantStatus(t, got, http.StatusNoContent)
 
 	if counted := s.history().Requests; counted != 1 {
@@ -1366,10 +1368,10 @@ func TestBanMadeThroughOneHostRefusesTheClientOnAnother(t *testing.T) {
 	s := startServeWAF(t, "", map[string]string{rulesDir: writeRules(t, testRules)})
 
 	got := do(t, s.question(siteA, client, "/.env"))
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 
 	got = do(t, s.question(siteB, client, "/"))
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 
 	lines := s.out.requestLines(t, 2)
 	if lines[0].Host != siteA || lines[1].Host != siteB {
@@ -1395,7 +1397,7 @@ func TestRequestsOnEverySiteCountTowardOneSetOfLimits(t *testing.T) {
 	s.allowed(client)
 
 	got := do(t, s.question(siteB, client, "/"))
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 }
 
 func TestOwnEndpointsAnswerOnlyWithoutTheClientHeader(t *testing.T) {
@@ -1410,13 +1412,13 @@ func TestOwnEndpointsAnswerOnlyWithoutTheClientHeader(t *testing.T) {
 		path, authorization string
 		want                int
 	}{
-		{proxy.HealthPath, "", http.StatusOK},
-		{proxy.MetricsPath, bearer, http.StatusOK},
-		{proxy.MetricsPath, "", http.StatusUnauthorized},
-		{proxy.BansPath, adminBearer, http.StatusOK},
-		{proxy.BansPath, "", http.StatusUnauthorized},
-		{proxy.ClientsPath + client, adminBearer, http.StatusOK},
-		{proxy.ReportPath, "", http.StatusNotFound},
+		{servewaf.HealthPath, "", http.StatusOK},
+		{servewaf.MetricsPath, bearer, http.StatusOK},
+		{servewaf.MetricsPath, "", http.StatusUnauthorized},
+		{servewaf.BansPath, adminBearer, http.StatusOK},
+		{servewaf.BansPath, "", http.StatusUnauthorized},
+		{servewaf.ClientsPath + client, adminBearer, http.StatusOK},
+		{servewaf.ReportPath, "", http.StatusNotFound},
 		{"/_smallwebwaf/other", "", http.StatusNotFound},
 		{"/", "", http.StatusNotFound},
 	} {
@@ -1429,9 +1431,9 @@ func TestOwnEndpointsAnswerOnlyWithoutTheClientHeader(t *testing.T) {
 		req.Header.Set("Authorization", tc.authorization)
 
 		if strings.HasPrefix(tc.path, "/_smallwebwaf/") {
-			wantDisposition(t, do(t, req), http.StatusNotFound, proxy.DispositionDeny)
+			wantDisposition(t, do(t, req), http.StatusNotFound, servewaf.DispositionDeny)
 		} else {
-			wantDisposition(t, do(t, req), http.StatusOK, proxy.DispositionAllow)
+			wantDisposition(t, do(t, req), http.StatusOK, servewaf.DispositionAllow)
 		}
 	}
 }
@@ -1441,10 +1443,11 @@ func TestOwnEndpointsLinesDoNotSayWhichOfTheTwoTheyAre(t *testing.T) {
 
 	s := startServeWAF(t, "", nil)
 
-	wantStatus(t, get(t, s.addr, proxy.HealthPath), http.StatusOK)
+	wantStatus(t, get(t, s.addr, servewaf.HealthPath), http.StatusOK)
 
 	line := s.out.requestLine(t)
-	if _, there := line.fields["servewaf_line"]; there || line.Path != proxy.HealthPath {
+	if _, there := line.fields["servewaf_line"]; there ||
+		line.Path != servewaf.HealthPath {
 		t.Errorf("the health check's log line is %+v", line.fields)
 	}
 }
@@ -1456,12 +1459,12 @@ func TestALargeBodyAnnouncedAndLongHeadersAreNoReasonToRefuse(t *testing.T) {
 
 	req := s.questionWith(http.MethodPost, siteA, client, "/",
 		strings.NewReader("a body"))
-	req.Header.Set(proxy.ContentLengthHeader, "1073741824")
+	req.Header.Set(servewaf.ContentLengthHeader, "1073741824")
 	req.Header.Set(forwardedFor, otherClient)
 	req.Header.Set("X-Long", strings.Repeat("x", 40<<10))
 
 	got := do(t, req)
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 
 	line := s.out.requestLine(t)
 	if line.ClientIP != client || line.ContentLength != 1<<30 {
@@ -1529,7 +1532,7 @@ carried     header:Content-Length                block  ^6$
 			strings.NewReader("a body"))
 
 		if tc.announced != "" {
-			req.Header.Set(proxy.ContentLengthHeader, tc.announced)
+			req.Header.Set(servewaf.ContentLengthHeader, tc.announced)
 		}
 
 		wantStatus(t, do(t, req), tc.want)
@@ -1547,19 +1550,19 @@ func TestCoreRuleSetReadsTheBodyAQuestionCarries(t *testing.T) {
 		req := s.questionWith(http.MethodPost, siteA, client, "/",
 			strings.NewReader(body))
 		req.Header.Set("Content-Type", contentType)
-		req.Header.Set(proxy.ContentLengthHeader, "100000")
+		req.Header.Set(servewaf.ContentLengthHeader, "100000")
 
 		return do(t, req)
 	}
 
 	got := ask(formData, "id=1'%20OR%20'1'='1")
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 
 	// The first 64 KiB of a longer JSON body cannot be parsed, which is no
 	// attack, so the Core Rule Set does not read it.
-	cut := `{"text":"` + strings.Repeat("x", proxy.QuestionBodyMaxBytes)
-	got = ask("application/json", cut[:proxy.QuestionBodyMaxBytes])
-	wantDisposition(t, got, http.StatusOK, proxy.DispositionAllow)
+	cut := `{"text":"` + strings.Repeat("x", servewaf.QuestionBodyMaxBytes)
+	got = ask("application/json", cut[:servewaf.QuestionBodyMaxBytes])
+	wantDisposition(t, got, http.StatusOK, servewaf.DispositionAllow)
 }
 
 func TestCoreRuleSetAlertNamesTheSite(t *testing.T) {
@@ -1568,7 +1571,7 @@ func TestCoreRuleSetAlertNamesTheSite(t *testing.T) {
 	s := startServeWAF(t, "", map[string]string{wafMode: block})
 
 	got := s.ask(client, sqlInjection)
-	wantDisposition(t, got, http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, got, http.StatusForbidden, servewaf.DispositionDeny)
 
 	waiting := s.queue.Snapshot().Waiting[alerts.DestinationWebhook]
 	if len(waiting) != 1 || waiting[0].Event != alerts.EventWAFBlock ||
@@ -1583,7 +1586,7 @@ func TestReputationHitAlertNamesTheSite(t *testing.T) {
 	s := startServeWAF(t, "", map[string]string{blocklistURLs: dropURL})
 	loadLists(t, s.server, map[string][]string{dropURL: {client}})
 
-	wantDisposition(t, s.ask(client, "/"), http.StatusForbidden, proxy.DispositionDeny)
+	wantDisposition(t, s.ask(client, "/"), http.StatusForbidden, servewaf.DispositionDeny)
 
 	waiting := s.queue.Snapshot().Waiting[alerts.DestinationWebhook]
 	if len(waiting) != 1 || waiting[0].Event != alerts.EventReputationHit ||

internal/servewaf/staticlists_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"

internal/servewaf/trappaths_test.go

@@ -1,4 +1,4 @@
-package proxy_test
+package servewaf_test
 
 import (
 	"net/http"

internal/smallwebwaf/healthcheck.go

@@ -10,8 +10,10 @@ import (
 	"net/url"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/config"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 )
 
 // healthCheckTimeout bounds the whole health check.
@@ -31,7 +33,7 @@ var errHealthEndpoint = errors.New("the health endpoint answered")
 // args are the arguments after `healthcheck`; it takes none, and given
 // one it names it on stderr and returns 1 without checking anything.
 func HealthCheck(
-	ctx context.Context, args []string, lookupEnv func(string) (string, bool),
+	ctx context.Context, args []string, v *viper.Viper,
 	stderr io.Writer,
 ) int {
 	if len(args) > 0 {
@@ -44,15 +46,15 @@ func HealthCheck(
 	ctx, cancel := context.WithTimeout(ctx, healthCheckTimeout)
 	defer cancel()
 
-	command, err := config.Command(lookupEnv)
+	command, err := config.Command(v)
 
 	switch {
 	case err != nil:
 		err = fmt.Errorf("invalid setting: %w", err)
 	case command == "servewaf":
-		err = checkServeWAF(ctx, lookupEnv)
+		err = checkServeWAF(ctx, v)
 	default:
-		err = checkRProxyAndApp(ctx, lookupEnv)
+		err = checkRProxyAndApp(ctx, v)
 	}
 
 	if err != nil {
@@ -65,8 +67,8 @@ func HealthCheck(
 }
 
 // checkServeWAF asks servewaf's health endpoint.
-func checkServeWAF(ctx context.Context, lookupEnv func(string) (string, bool)) error {
-	listenAddr, err := config.ServeWAFListenAddr(lookupEnv)
+func checkServeWAF(ctx context.Context, v *viper.Viper) error {
+	listenAddr, err := config.ServeWAFListenAddr(v)
 	if err != nil {
 		return fmt.Errorf("invalid setting: %w", err)
 	}
@@ -81,9 +83,9 @@ func checkServeWAF(ctx context.Context, lookupEnv func(string) (string, bool)) e
 
 // checkRProxyAndApp asks rproxy's health endpoint, and connects to the app.
 func checkRProxyAndApp(
-	ctx context.Context, lookupEnv func(string) (string, bool),
+	ctx context.Context, v *viper.Viper,
 ) error {
-	listenAddr, upstreamURL, err := config.RProxyListenAddrAndUpstreamURL(lookupEnv)
+	listenAddr, upstreamURL, err := config.RProxyListenAddrAndUpstreamURL(v)
 	if err != nil {
 		return fmt.Errorf("invalid setting: %w", err)
 	}
@@ -107,7 +109,7 @@ func checkRProxyAndApp(
 // listenAddr, which the settings have checked has one.
 func askHealthEndpoint(ctx context.Context, listenAddr string) error {
 	_, port, _ := net.SplitHostPort(listenAddr)
-	health := "http://" + net.JoinHostPort("127.0.0.1", port) + proxy.HealthPath
+	health := "http://" + net.JoinHostPort("127.0.0.1", port) + servewaf.HealthPath
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, health, http.NoBody)
 	if err != nil {

internal/smallwebwaf/healthcheck_test.go

@@ -125,11 +125,12 @@ func TestHealthCheckInRProxysContainer(t *testing.T) {
 	wantHealthCheck(t, settings(rproxyListenAddr, "8080"), 1,
 		"unhealthy: invalid setting: SWRP_LISTEN_ADDR: ")
 
-	// No setting of rproxy's has a form given as a file.
+	// A setting of rproxy's can be given as a file too, here the listen
+	// address, which the health check reads.
 	wantHealthCheck(t, map[string]string{
 		rproxyListenAddr + "_FILE": writeFile(t, ":"+port+"\n"),
 		rproxyUpstreamURL:          app.URL,
-	}, 1, "unhealthy: ask rproxy: ")
+	}, 0, "")
 }
 
 func TestHealthCheckFailsWithAnyOtherCommand(t *testing.T) {
@@ -145,11 +146,7 @@ func TestHealthCheckRefusesAnArgument(t *testing.T) {
 
 	var stderr bytes.Buffer
 
-	noSettings := func(string) (string, bool) {
-		return "", false
-	}
-
-	got := smallwebwaf.HealthCheck(t.Context(), []string{"now"}, noSettings, &stderr)
+	got := smallwebwaf.HealthCheck(t.Context(), []string{"now"}, viperFrom(nil), &stderr)
 
 	want := "smallwebwaf healthcheck: unexpected argument \"now\"\n"
 	if got != 1 || stderr.String() != want {
@@ -166,11 +163,7 @@ func wantHealthCheck(t *testing.T, env map[string]string, status int, message st
 
 	var stderr bytes.Buffer
 
-	got := smallwebwaf.HealthCheck(t.Context(), nil, func(name string) (string, bool) {
-		value, ok := env[name]
-
-		return value, ok
-	}, &stderr)
+	got := smallwebwaf.HealthCheck(t.Context(), nil, viperFrom(env), &stderr)
 
 	wrote := stderr.String()
 	if got != status || !strings.HasPrefix(wrote, message) ||

internal/smallwebwaf/rproxy.go

@@ -23,7 +23,7 @@ func RunRProxy(ctx context.Context, params Params) int {
 	hostname, _ := os.Hostname() // "" when the host has no name to give
 	processLog := requestlog.NewProcessLogger(params.Stdout, hostname, slog.LevelInfo)
 
-	cfg, err := config.RProxyFromEnvironment(params.LookupEnv)
+	cfg, err := config.RProxyFromEnvironment(params.Viper)
 	if err != nil {
 		processLog.Error("invalid setting", "error", err.Error())
 

internal/smallwebwaf/rproxy_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 	"sneak.berlin/go/smallwebwaf/internal/smallwebwaf"
 )
 
@@ -43,12 +43,8 @@ const (
 func runRProxy(ctx context.Context, env map[string]string, out *output) int {
 	return smallwebwaf.RunRProxy(ctx, smallwebwaf.Params{
 		Version: testVersion,
-		LookupEnv: func(name string) (string, bool) {
-			value, ok := env[name]
-
-			return value, ok
-		},
-		Stdout: out,
+		Viper:   viperFrom(env),
+		Stdout:  out,
 	})
 }
 
@@ -153,7 +149,7 @@ func TestABanThroughOneSiteRefusesTheClientOnTheOther(t *testing.T) {
 
 	// One request's three lines carry one id, rproxy's with servewaf's answer.
 	line := firstOut.line(t, "path", bannedProbe)
-	if line["disposition"] != proxy.DispositionDeny || line["client_ip"] != placed {
+	if line["disposition"] != servewaf.DispositionDeny || line["client_ip"] != placed {
 		t.Errorf("rproxy's line is %v", line)
 	}
 
@@ -225,7 +221,7 @@ func TestTheSiteAnswersWhileServeWAFIsStoppedAndStartedAgain(t *testing.T) {
 	wantStatus(t, site+"/after-stop", placed, http.StatusOK)
 
 	line := out.line(t, "path", "/after-stop")
-	if line["disposition"] != proxy.DispositionAllow ||
+	if line["disposition"] != servewaf.DispositionAllow ||
 		line["default_disposition"] != true {
 		t.Errorf("rproxy's line is %v", line)
 	}
@@ -318,7 +314,7 @@ func TestAChunkedBodyStaysABodyAtServeWAF(t *testing.T) {
 	const smuggledID = "smuggled-request"
 
 	smuggled := "GET " + bannedProbe + " HTTP/1.1\r\nHost: site.example\r\n" +
-		proxy.ClientHeader + ": " + otherClient + "\r\n" +
+		servewaf.ClientHeader + ": " + otherClient + "\r\n" +
 		"X-Request-ID: " + smuggledID + "\r\n\r\n"
 
 	status := sendRaw(t, site, "POST /upload HTTP/1.1\r\nHost: site.example\r\n"+
@@ -459,10 +455,10 @@ func TestRProxyAsksAServeWAFThatSpeaksHTTP2OverHTTP1(t *testing.T) {
 	protocols := make(chan string, 10)
 	backend := httptest.NewUnstartedServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			if r.Header.Get(proxy.ClientHeader) != "" {
+			if r.Header.Get(servewaf.ClientHeader) != "" {
 				protocols <- r.Proto
 
-				w.Header().Set(proxy.DispositionHeader, proxy.DispositionDeny)
+				w.Header().Set(servewaf.DispositionHeader, servewaf.DispositionDeny)
 				w.WriteHeader(http.StatusForbidden)
 			}
 		}))
@@ -532,8 +528,8 @@ func TestRProxyStoppingWaitsForAReportBeingSent(t *testing.T) {
 	release := make(chan struct{})
 	backend := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {
-			if r.Header.Get(proxy.ClientHeader) != "" {
-				w.Header().Set(proxy.DispositionHeader, proxy.DispositionAllow)
+			if r.Header.Get(servewaf.ClientHeader) != "" {
+				w.Header().Set(servewaf.DispositionHeader, servewaf.DispositionAllow)
 
 				return
 			}
@@ -640,7 +636,7 @@ func TestRProxyStoppingCutsOffARequestAfterFiveSeconds(t *testing.T) {
 
 	backend := httptest.NewServer(http.HandlerFunc(
 		func(w http.ResponseWriter, _ *http.Request) {
-			w.Header().Set(proxy.DispositionHeader, proxy.DispositionAllow)
+			w.Header().Set(servewaf.DispositionHeader, servewaf.DispositionAllow)
 		}))
 	t.Cleanup(backend.Close)
 
@@ -757,7 +753,7 @@ func TestMainRunsRProxy(t *testing.T) {
 	addr, cmd, out := startRProxyProcess(t, wafBackend+"=http://127.0.0.1:9")
 
 	req, err := http.NewRequestWithContext(t.Context(), http.MethodGet,
-		"http://"+addr+proxy.HealthPath, http.NoBody)
+		"http://"+addr+servewaf.HealthPath, http.NoBody)
 	if err != nil {
 		t.Fatalf("new request: %v", err)
 	}

internal/smallwebwaf/servewaf_test.go

@@ -14,7 +14,7 @@ import (
 	"testing"
 	"time"
 
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 	"sneak.berlin/go/smallwebwaf/internal/smallwebwaf"
 )
 
@@ -67,7 +67,7 @@ func TestMainRunsServeWAF(t *testing.T) {
 	})
 
 	addr, _ := out.line(t, "msg", "starting")["address"].(string)
-	ask(t, addr, "/", http.StatusOK, proxy.DispositionAllow)
+	ask(t, addr, "/", http.StatusOK, servewaf.DispositionAllow)
 
 	err = cmd.Process.Signal(syscall.SIGTERM)
 	if err != nil {
@@ -132,7 +132,7 @@ func ask(t *testing.T, addr, path string, status int, disposition string) {
 		t.Fatalf("new request: %v", err)
 	}
 
-	req.Header.Set(proxy.ClientHeader, placed)
+	req.Header.Set(servewaf.ClientHeader, placed)
 	req.Header.Set("X-Request-ID", rand.Text())
 
 	transport := &http.Transport{}
@@ -147,9 +147,9 @@ func ask(t *testing.T, addr, path string, status int, disposition string) {
 	_ = res.Body.Close()
 
 	if res.StatusCode != status ||
-		res.Header.Get(proxy.DispositionHeader) != disposition {
+		res.Header.Get(servewaf.DispositionHeader) != disposition {
 		t.Errorf("answered %d with disposition %q, want %d with %q", res.StatusCode,
-			res.Header.Get(proxy.DispositionHeader), status, disposition)
+			res.Header.Get(servewaf.DispositionHeader), status, disposition)
 	}
 }
 
@@ -193,12 +193,12 @@ func TestServeWAFKeepsItsBansAcrossARestartAndNeedsNoApp(t *testing.T) {
 	}
 
 	runServeWAF(t, env, func(addr string) {
-		ask(t, addr, "/", http.StatusOK, proxy.DispositionAllow)
+		ask(t, addr, "/", http.StatusOK, servewaf.DispositionAllow)
 		// The default rule file bans a probe for this.
-		ask(t, addr, "/.env", http.StatusForbidden, proxy.DispositionDeny)
+		ask(t, addr, "/.env", http.StatusForbidden, servewaf.DispositionDeny)
 	})
 
 	runServeWAF(t, env, func(addr string) {
-		ask(t, addr, "/", http.StatusForbidden, proxy.DispositionDeny)
+		ask(t, addr, "/", http.StatusForbidden, servewaf.DispositionDeny)
 	})
 }

internal/smallwebwaf/smallwebwaf.go

@@ -20,15 +20,18 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/spf13/viper"
+
 	"sneak.berlin/go/smallwebwaf/internal/alerts"
 	"sneak.berlin/go/smallwebwaf/internal/config"
 	"sneak.berlin/go/smallwebwaf/internal/lookup"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
 	"sneak.berlin/go/smallwebwaf/internal/remotelog"
 	"sneak.berlin/go/smallwebwaf/internal/reputation"
 	"sneak.berlin/go/smallwebwaf/internal/requestlog"
 	"sneak.berlin/go/smallwebwaf/internal/rules"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 	"sneak.berlin/go/smallwebwaf/internal/state"
+	"sneak.berlin/go/smallwebwaf/internal/waf"
 )
 
 // shutdownTimeout is how long requests in progress may take to finish
@@ -58,8 +61,9 @@ commands:
 type Params struct {
 	// Version is the version of the binary, set when it is built.
 	Version string
-	// LookupEnv reads an environment variable, normally os.LookupEnv.
-	LookupEnv func(string) (string, bool)
+	// Viper reads the settings, normally the viper config.NewViper returns
+	// for the process's environment.
+	Viper *viper.Viper
 	// Stdout receives the request log and the process's own messages.
 	Stdout io.Writer
 }
@@ -78,7 +82,7 @@ func Main(version string) int {
 		syscall.SIGTERM, os.Interrupt)
 	defer stop()
 
-	params := Params{Version: version, LookupEnv: os.LookupEnv, Stdout: os.Stdout}
+	params := Params{Version: version, Viper: config.NewViper(), Stdout: os.Stdout}
 
 	switch args[0] {
 	case "rproxy":
@@ -86,7 +90,7 @@ func Main(version string) int {
 	case "servewaf":
 		return RunServeWAF(ctx, params)
 	case "healthcheck":
-		return HealthCheck(ctx, args[1:], os.LookupEnv, os.Stderr)
+		return HealthCheck(ctx, args[1:], params.Viper, os.Stderr)
 	default:
 		return printUsage(os.Stderr)
 	}
@@ -106,9 +110,9 @@ func RunServeWAF(ctx context.Context, params Params) int {
 	// Until the settings are read, the one message is an invalid setting's
 	// error, which every SWWAF_LOG_LEVEL lets through.
 	processLog := requestlog.NewProcessLogger(params.Stdout,
-		config.InstanceName(params.LookupEnv), slog.LevelError)
+		config.InstanceName(params.Viper), slog.LevelError)
 
-	cfg, err := config.FromEnvironment(params.LookupEnv)
+	cfg, err := config.FromEnvironment(params.Viper)
 	if err != nil {
 		processLog.Error("invalid setting", "error", err.Error())
 
@@ -150,7 +154,14 @@ func RunServeWAF(ctx context.Context, params Params) int {
 		return 1
 	}
 
-	server, err := newServer(cfg, stdout, processLog, now, ruleFiles, alertQueue)
+	crs, err := servewaf.NewCoreRuleSet(cfg)
+	if err != nil {
+		processLog.Error("cannot use the Core Rule Set", "error", err.Error())
+
+		return 1
+	}
+
+	server, err := newServer(cfg, stdout, processLog, now, ruleFiles, alertQueue, crs)
 	if err != nil {
 		processLog.Error("cannot use the lookup database", "error", err.Error())
 
@@ -170,8 +181,7 @@ func RunServeWAF(ctx context.Context, params Params) int {
 
 	listener, err := (&net.ListenConfig{}).Listen(ctx, "tcp", cfg.ListenAddr)
 	if err != nil {
-		processLog.Error("cannot listen on SWWAF_LISTEN_ADDR",
-			"error", err.Error())
+		processLog.Error("cannot listen on SWWAF_LISTEN_ADDR", "error", err.Error())
 
 		return 1
 	}
@@ -190,7 +200,8 @@ func RunServeWAF(ctx context.Context, params Params) int {
 func newServer(
 	cfg *config.Config, stdout io.Writer, processLog *slog.Logger,
 	now func() time.Time, ruleFiles *rules.Files, alertQueue *alerts.Queue,
-) (*proxy.Server, error) {
+	crs *waf.CoreRuleSet,
+) (*servewaf.Server, error) {
 	var lookupFile *lookup.File
 
 	if cfg.LookupSource == "file" {
@@ -207,13 +218,14 @@ func newServer(
 		}
 	}
 
-	server := proxy.NewServeWAF(proxy.Params{
+	server := servewaf.New(servewaf.Params{
 		Config:       cfg,
 		RequestLog:   stdout,
 		ProcessLog:   processLog,
 		GeoJSURL:     lookup.URL,
 		AbuseIPDBURL: reputation.AbuseIPDBURL,
 		LookupFile:   lookupFile,
+		CoreRuleSet:  crs,
 		Now:          now,
 		Rules:        ruleFiles,
 		Alerts:       alertQueue,
@@ -230,7 +242,7 @@ func newServer(
 // loadStateFiles reads the state files into the parts of server and into
 // alertQueue, as state.Load does.
 func loadStateFiles(
-	cfg *config.Config, server *proxy.Server, alertQueue *alerts.Queue,
+	cfg *config.Config, server *servewaf.Server, alertQueue *alerts.Queue,
 	now func() time.Time, processLog *slog.Logger,
 ) (*state.Files, error) {
 	return state.Load(state.Params{
@@ -316,7 +328,7 @@ func startSending(
 // shutdownTimeout to finish, and writes every state file, alerts.json with
 // the alerts still waiting.
 func serve(
-	ctx context.Context, server *proxy.Server, listener net.Listener,
+	ctx context.Context, server *servewaf.Server, listener net.Listener,
 	files *state.Files, ruleFiles *rules.Files, alertQueue *alerts.Queue,
 	processLog *slog.Logger,
 ) int {

internal/smallwebwaf/smallwebwaf_test.go

@@ -19,8 +19,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/spf13/viper"
+
+	"sneak.berlin/go/smallwebwaf/internal/config"
 	"sneak.berlin/go/smallwebwaf/internal/lookup/lookuptest"
-	"sneak.berlin/go/smallwebwaf/internal/proxy"
+	"sneak.berlin/go/smallwebwaf/internal/servewaf"
 	"sneak.berlin/go/smallwebwaf/internal/smallwebwaf"
 )
 
@@ -49,7 +52,7 @@ const (
 	adminSecret = "fedcba9876543210fedcba9876543210"
 	// instance is the SWWAF_INSTANCE_NAME the tests set where they look at
 	// it.
-	instance = "fsn1app1/gitea"
+	instance = "fsn1app1/blog"
 	// greeting is what the tests' app answers.
 	greeting = "hello from the app"
 	// placed is the client the tests' lookup databases place.
@@ -122,21 +125,30 @@ func (o *output) text() string {
 	return o.buf.String()
 }
 
+// viperFrom returns a viper Set with each of settings, as the viper
+// config.NewViper returns one bound to a process's environment.
+func viperFrom(settings map[string]string) *viper.Viper {
+	v := viper.New()
+	for name, value := range settings {
+		v.Set(name, value)
+	}
+
+	return v
+}
+
 // run runs `smallwebwaf servewaf` with the settings in env until ctx is done,
 // and returns its exit status. SWWAF_LOOKUP_SOURCE is off unless env sets it,
 // so that no test sends GeoJS its clients' addresses.
 func run(ctx context.Context, env map[string]string, out *output) int {
+	v := viperFrom(env)
+	if _, set := env["SWWAF_LOOKUP_SOURCE"]; !set {
+		v.Set("SWWAF_LOOKUP_SOURCE", "off")
+	}
+
 	return smallwebwaf.RunServeWAF(ctx, smallwebwaf.Params{
 		Version: testVersion,
-		LookupEnv: func(name string) (string, bool) {
-			value, ok := env[name]
-			if !ok && name == "SWWAF_LOOKUP_SOURCE" {
-				return "off", true
-			}
-
-			return value, ok
-		},
-		Stdout: out,
+		Viper:   v,
+		Stdout:  out,
 	})
 }
 
@@ -341,8 +353,8 @@ func TestEveryLogLineAndMetricCarriesTheInstanceName(t *testing.T) {
 	// the comments.
 	for line := range strings.Lines(metrics) {
 		if !strings.HasPrefix(line, "#") &&
-			!strings.Contains(line, `instance="fsn1app1/gitea"`) {
-			t.Errorf("series %q, without instance=\"fsn1app1/gitea\"", line)
+			!strings.Contains(line, `instance="fsn1app1/blog"`) {
+			t.Errorf("series %q, without instance=\"fsn1app1/blog\"", line)
 		}
 	}
 }
@@ -551,6 +563,56 @@ func TestRulesDirThatDoesNotExistStopsTheStart(t *testing.T) {
 		": no such file or directory")
 }
 
+func TestCoreRuleSetExclusionsFileThatCannotBeReadStopsTheStart(t *testing.T) {
+	t.Parallel()
+
+	path := filepath.Join(t.TempDir(), "crs-exclusions.conf")
+	out := &output{}
+
+	status := run(t.Context(), map[string]string{
+		listenAddr: localhost + ":0", stateDir: t.TempDir(), rulesDir: t.TempDir(),
+		"SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE": path,
+	}, out)
+	if status != 1 {
+		t.Fatalf("exit status %d, want 1", status)
+	}
+
+	line := out.line(t, "msg", "cannot use the Core Rule Set")
+	want := "SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE: read the exclusions file: open " +
+		path + ": no such file or directory"
+
+	if line["error"] != want {
+		t.Errorf("start refused with %v, want the error %q", line, want)
+	}
+}
+
+func TestCoreRuleSetExclusionsFileThatCannotBeUsedStopsTheStartWhileTheCoreRuleSetIsOff(
+	t *testing.T,
+) {
+	t.Parallel()
+
+	broken := filepath.Join(t.TempDir(), "broken.conf")
+
+	err := os.WriteFile(broken, []byte("SecNoSuchDirective On\n"), 0o600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, path := range []string{filepath.Join(t.TempDir(), "missing.conf"), broken} {
+		out := &output{}
+
+		status := run(t.Context(), map[string]string{
+			listenAddr: localhost + ":0", stateDir: t.TempDir(), rulesDir: t.TempDir(),
+			"SWWAF_WAF_MODE": config.WAFModeOff, "SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE": path,
+		}, out)
+		if status != 1 {
+			t.Fatalf("%s: exit status %d, want 1", path, status)
+		}
+
+		out.line(t, "msg", "cannot use the Core Rule Set")
+	}
+}
+
 func TestLookupDatabaseReplacedWhileRunningTakesEffect(t *testing.T) {
 	t.Parallel()
 
@@ -610,9 +672,9 @@ func TestLookupDatabaseReplacedWhileRunningTakesEffect(t *testing.T) {
 		rename(t, replacement, path)
 
 		metrics := metricsWith(t, url+"_smallwebwaf/metrics", token,
-			`smallwebwaf_lookup_database_read_failures_total{instance="fsn1app1/gitea"} 1`)
+			`smallwebwaf_lookup_database_read_failures_total{instance="fsn1app1/blog"} 1`)
 		lastRead = seriesValue(t, metrics,
-			`smallwebwaf_lookup_database_last_read_timestamp_seconds{instance="fsn1app1/gitea"}`)
+			`smallwebwaf_lookup_database_last_read_timestamp_seconds{instance="fsn1app1/blog"}`)
 
 		wantStatus(t, url, placed, http.StatusOK)
 	})
@@ -668,7 +730,7 @@ func TestBlocklistTriesAndCopiesKeptInReputationJSONAcrossRestarts(t *testing.T)
 		// too.
 		rateLimitExemptNets: placed + "," + localhost,
 	}
-	failures := `smallwebwaf_reputation_failures_total{instance="fsn1app1/gitea",` +
+	failures := `smallwebwaf_reputation_failures_total{instance="fsn1app1/blog",` +
 		`source="` + torURL + `"} `
 
 	// tor.txt cannot be fetched at first, which is counted.
@@ -909,8 +971,8 @@ func TestStalledRemoteLogEndpointHoldsUpNoRequest(t *testing.T) {
 		// last.
 		metrics := metricsText(t, url+"_smallwebwaf/metrics", token)
 		for _, series := range []string{
-			`smallwebwaf_remote_log_lines_sent_total{instance="fsn1app1/gitea"} 0`,
-			`smallwebwaf_remote_log_buffer_depth{instance="fsn1app1/gitea"} 1`,
+			`smallwebwaf_remote_log_lines_sent_total{instance="fsn1app1/blog"} 0`,
+			`smallwebwaf_remote_log_buffer_depth{instance="fsn1app1/blog"} 1`,
 		} {
 			if !strings.Contains(metrics, "\n"+series+"\n") {
 				t.Errorf("no %q in the metrics:\n%s", series, metrics)
@@ -918,7 +980,7 @@ func TestStalledRemoteLogEndpointHoldsUpNoRequest(t *testing.T) {
 		}
 
 		const dropped = "\nsmallwebwaf_remote_log_lines_dropped_total" +
-			`{instance="fsn1app1/gitea"} `
+			`{instance="fsn1app1/blog"} `
 		if strings.Contains(metrics, dropped+"0\n") || !strings.Contains(metrics, dropped) {
 			t.Errorf("no line dropped in the metrics:\n%s", metrics)
 		}
@@ -1011,7 +1073,7 @@ func TestBanIsAlertedAndAnAlertNotSentIsKeptAcrossARestart(t *testing.T) {
 	runUntilStopped(t, env, func(url string) {
 		webhook.waitFor(t, "permanent_ban", true)
 
-		const ofWebhook = `{destination="webhook",instance="fsn1app1/gitea"}`
+		const ofWebhook = `{destination="webhook",instance="fsn1app1/blog"}`
 
 		metrics := metricsWith(t, url+"_smallwebwaf/metrics", token,
 			"\nsmallwebwaf_alerts_sent_total"+ofWebhook+" 1\n")
@@ -1062,13 +1124,13 @@ func TestBanIsAlertedToSlackAndNtfy(t *testing.T) {
 		slackPost := slack.firstPost(t)
 		err := json.Unmarshal([]byte(slackPost.body), &message)
 
-		if err != nil || !strings.HasPrefix(message.Text, "*fsn1app1/gitea: ban*\n") ||
+		if err != nil || !strings.HasPrefix(message.Text, "*fsn1app1/blog: ban*\n") ||
 			!strings.Contains(message.Text, "\nclient: "+client+"\n") {
 			t.Errorf("Slack was sent %s", slackPost.body)
 		}
 
 		ntfyPost := ntfy.firstPost(t)
-		if ntfyPost.header.Get("Title") != "fsn1app1/gitea: ban" ||
+		if ntfyPost.header.Get("Title") != "fsn1app1/blog: ban" ||
 			ntfyPost.header.Get("Authorization") != "Bearer "+ntfyToken ||
 			!strings.Contains(ntfyPost.body, "\nclient: "+client+"\n") {
 			t.Errorf("ntfy was sent %s, with the headers %v", ntfyPost.body,
@@ -1080,9 +1142,9 @@ func TestBanIsAlertedToSlackAndNtfy(t *testing.T) {
 		// test process cannot fail the test.
 		sent := []string{
 			"\nsmallwebwaf_alerts_sent_total{destination=\"slack\"," +
-				"instance=\"fsn1app1/gitea\"} 1\n",
+				"instance=\"fsn1app1/blog\"} 1\n",
 			"\nsmallwebwaf_alerts_sent_total{destination=\"ntfy\"," +
-				"instance=\"fsn1app1/gitea\"} 1\n",
+				"instance=\"fsn1app1/blog\"} 1\n",
 		}
 
 		metrics := metricsWith(t, url+"_smallwebwaf/metrics", token, sent...)
@@ -1627,7 +1689,7 @@ func statusFrom(t *testing.T, url, from string) int {
 	}
 
 	req.Header.Set("X-Forwarded-For", from)
-	req.Header.Set(proxy.ClientHeader, from)
+	req.Header.Set(servewaf.ClientHeader, from)
 	req.Header.Set("X-Request-ID", rand.Text())
 
 	transport := &http.Transport{}

internal/state/state_test.go

@@ -143,7 +143,7 @@ const filledAlertsJSON = `{
     "waiting": {
         "webhook": [
             {
-                "instance": "fsn1app1/gitea",
+                "instance": "fsn1app1/blog",
                 "time": "2026-10-06T00:00:00Z",
                 "event": "ban",
                 "client": "203.0.113.9",
@@ -158,7 +158,7 @@ const filledAlertsJSON = `{
                 "suppressed_repeats": 0
             },
             {
-                "instance": "fsn1app1/gitea",
+                "instance": "fsn1app1/blog",
                 "time": "2026-10-06T00:00:00Z",
                 "event": "file_error",
                 "client": "",
@@ -1721,7 +1721,7 @@ func newParams(dir string) state.Params {
 		Events:     alerts.Events(),
 		Cooldown:   15 * time.Minute,
 		MaxPerHour: 2,
-		Instance:   "fsn1app1/gitea",
+		Instance:   "fsn1app1/blog",
 		Now:        midnight,
 	})
 

internal/waf/gitea.conf

@@ -0,0 +1,283 @@
+# The eighth change: on gitea's paths, some fields skip the rules that refused
+# ordinary gitea requests there. They are the fields where gitea sends a search,
+# a file name or a branch name. Each exclusion runs with the request, before the
+# rules it switches off, those of phase 1 included, so this file is loaded before
+# the Core Rule Set's rules. Each comment names a request the rule refused.
+
+# gitea's searches of code, of issues and pull requests, and of commits send the
+# text searched for in q, which skips these rules there:
+#   930110: ../
+#   930120: .gitignore
+#   931100: http://127.0.0.1:8080
+#   932120: Invoke-WebRequest
+#   932130: $(pwd)
+#   932140: if (a == b) {
+#   932160: /bin/sh
+#   932235: `make check`
+#   932250: ls -la
+#   932260: python3
+#   932380: `whoami`
+#   933100: <?php echo
+#   933130: $_GET[
+#   933135: ${VAR}
+#   934100: process.env
+#   934110: http://127.0.0.1:8080
+#   934130: __proto__
+#   941100: <script>
+#   941110: <script>
+#   941160: <img src=
+#   941180: document.cookie
+#   941390: fetch(
+#   942100: SELECT * FROM users WHERE
+#   942140: information_schema
+#   942190: union select
+#   942230: if (a == b) {
+#   944100: java.lang.Runtime
+#   944110: java.lang.Runtime
+#   944130: java.lang.Runtime
+SecRule REQUEST_FILENAME "@rx ^/(?:explore/code|issues(?:/search)?|pulls|\
+    [^/]+/-/code|\
+    [^/]+/[^/]+/(?:search|issues(?:/search)?|pulls|\
+    commits/(?:branch|tag|commit)/.+/search)|\
+    api/v1/repos/(?:issues/search|[^/]+/[^/]+/issues))$" \
+    "id:900600,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930110;ARGS:q,\
+    ctl:ruleRemoveTargetById=930120;ARGS:q,\
+    ctl:ruleRemoveTargetById=931100;ARGS:q,\
+    ctl:ruleRemoveTargetById=932120;ARGS:q,\
+    ctl:ruleRemoveTargetById=932130;ARGS:q,\
+    ctl:ruleRemoveTargetById=932140;ARGS:q,\
+    ctl:ruleRemoveTargetById=932160;ARGS:q,\
+    ctl:ruleRemoveTargetById=932235;ARGS:q,\
+    ctl:ruleRemoveTargetById=932250;ARGS:q,\
+    ctl:ruleRemoveTargetById=932260;ARGS:q,\
+    ctl:ruleRemoveTargetById=932380;ARGS:q,\
+    ctl:ruleRemoveTargetById=933100;ARGS:q,\
+    ctl:ruleRemoveTargetById=933130;ARGS:q,\
+    ctl:ruleRemoveTargetById=933135;ARGS:q,\
+    ctl:ruleRemoveTargetById=934100;ARGS:q,\
+    ctl:ruleRemoveTargetById=934110;ARGS:q,\
+    ctl:ruleRemoveTargetById=934130;ARGS:q,\
+    ctl:ruleRemoveTargetById=941100;ARGS:q,\
+    ctl:ruleRemoveTargetById=941110;ARGS:q,\
+    ctl:ruleRemoveTargetById=941160;ARGS:q,\
+    ctl:ruleRemoveTargetById=941180;ARGS:q,\
+    ctl:ruleRemoveTargetById=941390;ARGS:q,\
+    ctl:ruleRemoveTargetById=942100;ARGS:q,\
+    ctl:ruleRemoveTargetById=942140;ARGS:q,\
+    ctl:ruleRemoveTargetById=942190;ARGS:q,\
+    ctl:ruleRemoveTargetById=942230;ARGS:q,\
+    ctl:ruleRemoveTargetById=944100;ARGS:q,\
+    ctl:ruleRemoveTargetById=944110;ARGS:q,\
+    ctl:ruleRemoveTargetById=944130;ARGS:q"
+
+# A page opened from the results of one of those searches has the search's
+# address in Referer, which skips these rules then:
+#   941110: <script>
+#   941120: onClick={
+#   941160: <img src=
+#   942100: LIKE '%foo%'
+#   944100: java.lang.Runtime
+SecRule REQUEST_HEADERS:Referer "@rx ^https?://[^/]+/(?:explore/code|\
+    issues(?:/search)?|pulls|[^/]+/-/code|\
+    [^/]+/[^/]+/(?:search|issues(?:/search)?|pulls|\
+    commits/(?:branch|tag|commit)/.+/search)|\
+    api/v1/repos/(?:issues/search|[^/]+/[^/]+/issues))\?" \
+    "id:900601,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=941110;REQUEST_HEADERS:Referer,\
+    ctl:ruleRemoveTargetById=941120;REQUEST_HEADERS:Referer,\
+    ctl:ruleRemoveTargetById=941160;REQUEST_HEADERS:Referer,\
+    ctl:ruleRemoveTargetById=942100;REQUEST_HEADERS:Referer,\
+    ctl:ruleRemoveTargetById=944100;REQUEST_HEADERS:Referer"
+
+# gitea's searches of repositories, users, branches, tags and packages send a
+# name in q, which skips these rules there:
+#   930120: .profile
+#   932120: powershell-scripts
+#   932260: python3-app
+#   944130: org.apache.commons.logging
+SecRule REQUEST_FILENAME "@rx ^/(?:explore/repos|user/search_candidates|\
+    [^/]+/-/packages|[^/]+/[^/]+/(?:branches|tags)|api/v1/repos/search)$" \
+    "id:900602,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930120;ARGS:q,\
+    ctl:ruleRemoveTargetById=932120;ARGS:q,\
+    ctl:ruleRemoveTargetById=932260;ARGS:q,\
+    ctl:ruleRemoveTargetById=944130;ARGS:q"
+
+# gitea's other searches for a name send it in q too, which skips only these
+# rules there:
+#   930120: .profile
+#   932120: powershell-scripts
+#   932260: python3-app
+# The searches:
+#   - the dashboard's filter of repositories;
+#   - the repositories on a user's or an organisation's page, whose path has
+#     one segment;
+#   - the author filter of the issue and pull request lists;
+#   - the lists of users and organisations, and the API's search for users.
+SecRule REQUEST_FILENAME "@rx ^/(?:[^/]+|repo/search|\
+    explore/(?:users|organizations)|api/v1/users/search|\
+    [^/]+/[^/]+/(?:issues|pulls)/posters)$" \
+    "id:900603,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930120;ARGS:q,\
+    ctl:ruleRemoveTargetById=932120;ARGS:q,\
+    ctl:ruleRemoveTargetById=932260;ARGS:q"
+
+# These requests name a file in the path, which skips these rules there:
+#   920500: notes.txt~
+#   934100: process.env.d.ts
+#   941130: docs/a b.xhtml
+#   944130: java.lang.String.md
+# The requests:
+#   - a file's page, raw file and download;
+#   - its blame, history, edit, preview and delete pages;
+#   - the API's call for its contents;
+#   - a release attachment's download.
+SecRule REQUEST_FILENAME \
+    "@rx ^/(?:api/v1/repos/)?[^/]+/[^/]+/(?:src|raw|media|blame|commits|_edit|_preview|_delete|contents|releases/download)/" \
+    "id:900610,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=920500;REQUEST_FILENAME,\
+    ctl:ruleRemoveTargetById=934100;REQUEST_FILENAME,\
+    ctl:ruleRemoveTargetById=941130;REQUEST_FILENAME,\
+    ctl:ruleRemoveTargetById=944130;REQUEST_FILENAME"
+
+# The requests below name a file in a query parameter. These rules refused
+# them for the file named:
+#   930120: .gitignore
+#   932120: install-script.sh
+#   932130: [draft].md
+#   932160: bin/docker-entrypoint
+#   932260: docker-compose.yml
+#   934100: process.env.d.ts
+#   934130: __proto__.json
+#   941130: index.xhtml
+#   941180: document.write.js
+#   942140: information_schema.sql
+#   944110: java/lang/Runtime.java
+#   944130: java.lang.String.md
+# Each request skips the rules that refused it. The fourth change already has
+# path and redirect_to skip 930120, 932160 and 932260 on every path.
+
+# A file's commit graph, in file.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/graph$" \
+    "id:900620,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930120;ARGS:file,\
+    ctl:ruleRemoveTargetById=932120;ARGS:file,\
+    ctl:ruleRemoveTargetById=932160;ARGS:file,\
+    ctl:ruleRemoveTargetById=932260;ARGS:file,\
+    ctl:ruleRemoveTargetById=934100;ARGS:file,\
+    ctl:ruleRemoveTargetById=934130;ARGS:file,\
+    ctl:ruleRemoveTargetById=941130;ARGS:file,\
+    ctl:ruleRemoveTargetById=941180;ARGS:file,\
+    ctl:ruleRemoveTargetById=942140;ARGS:file,\
+    ctl:ruleRemoveTargetById=944110;ARGS:file,\
+    ctl:ruleRemoveTargetById=944130;ARGS:file"
+
+# The API's list of a file's commits, in path.
+SecRule REQUEST_FILENAME "@rx ^/api/v1/repos/[^/]+/[^/]+/commits$" \
+    "id:900621,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=932120;ARGS:path,\
+    ctl:ruleRemoveTargetById=934100;ARGS:path,\
+    ctl:ruleRemoveTargetById=934130;ARGS:path,\
+    ctl:ruleRemoveTargetById=941130;ARGS:path,\
+    ctl:ruleRemoveTargetById=941180;ARGS:path,\
+    ctl:ruleRemoveTargetById=942140;ARGS:path,\
+    ctl:ruleRemoveTargetById=944110;ARGS:path,\
+    ctl:ruleRemoveTargetById=944130;ARGS:path"
+
+# The API's call for the contents of several files, in body, as JSON.
+SecRule REQUEST_FILENAME "@rx ^/api/v1/repos/[^/]+/[^/]+/file-contents$" \
+    "id:900622,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930120;ARGS:body,\
+    ctl:ruleRemoveTargetById=932120;ARGS:body,\
+    ctl:ruleRemoveTargetById=932160;ARGS:body,\
+    ctl:ruleRemoveTargetById=934100;ARGS:body,\
+    ctl:ruleRemoveTargetById=934130;ARGS:body,\
+    ctl:ruleRemoveTargetById=941130;ARGS:body,\
+    ctl:ruleRemoveTargetById=941180;ARGS:body,\
+    ctl:ruleRemoveTargetById=942140;ARGS:body,\
+    ctl:ruleRemoveTargetById=944110;ARGS:body,\
+    ctl:ruleRemoveTargetById=944130;ARGS:body"
+
+# An issue opened from a template, in template.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/issues/new$" \
+    "id:900623,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930120;ARGS:template,\
+    ctl:ruleRemoveTargetById=932120;ARGS:template,\
+    ctl:ruleRemoveTargetById=932130;ARGS:template,\
+    ctl:ruleRemoveTargetById=932160;ARGS:template,\
+    ctl:ruleRemoveTargetById=932260;ARGS:template,\
+    ctl:ruleRemoveTargetById=934100;ARGS:template,\
+    ctl:ruleRemoveTargetById=934130;ARGS:template,\
+    ctl:ruleRemoveTargetById=941130;ARGS:template,\
+    ctl:ruleRemoveTargetById=941180;ARGS:template,\
+    ctl:ruleRemoveTargetById=942140;ARGS:template,\
+    ctl:ruleRemoveTargetById=944110;ARGS:template,\
+    ctl:ruleRemoveTargetById=944130;ARGS:template"
+
+# The sign-in page on the way to a file's edit page, in redirect_to.
+SecRule REQUEST_FILENAME "@rx ^/user/login$" \
+    "id:900624,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=932120;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=932130;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=934100;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=934130;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=941130;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=941180;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=942140;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=944110;ARGS:redirect_to,\
+    ctl:ruleRemoveTargetById=944130;ARGS:redirect_to"
+
+# An attachment uploaded through the API to a release, an issue or a comment,
+# in name.
+SecRule REQUEST_FILENAME \
+    "@rx ^/api/v1/repos/[^/]+/[^/]+/(?:releases|issues|issues/comments)/[0-9]+/assets$" \
+    "id:900625,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=930120;ARGS:name,\
+    ctl:ruleRemoveTargetById=932120;ARGS:name,\
+    ctl:ruleRemoveTargetById=932260;ARGS:name,\
+    ctl:ruleRemoveTargetById=934100;ARGS:name,\
+    ctl:ruleRemoveTargetById=934130;ARGS:name,\
+    ctl:ruleRemoveTargetById=941130;ARGS:name,\
+    ctl:ruleRemoveTargetById=941180;ARGS:name,\
+    ctl:ruleRemoveTargetById=942140;ARGS:name,\
+    ctl:ruleRemoveTargetById=944130;ARGS:name"
+
+# A diff's hidden lines, fetched when shown, in path.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/blob_excerpt/[0-9a-f]+$" \
+    "id:900626,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=932120;ARGS:path,\
+    ctl:ruleRemoveTargetById=934100;ARGS:path,\
+    ctl:ruleRemoveTargetById=934130;ARGS:path,\
+    ctl:ruleRemoveTargetById=941130;ARGS:path,\
+    ctl:ruleRemoveTargetById=941180;ARGS:path,\
+    ctl:ruleRemoveTargetById=942140;ARGS:path,\
+    ctl:ruleRemoveTargetById=944110;ARGS:path,\
+    ctl:ruleRemoveTargetById=944130;ARGS:path"
+
+# The requests below name a branch or tag in a query parameter, which skips
+# the list of command names (932260) there. It refused names such as
+# docker-build, python3-migration and feat/docker-support.
+
+# Deleting or restoring a branch, in name.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/branches/(?:delete|restore)$" \
+    "id:900630,phase:1,pass,nolog,ctl:ruleRemoveTargetById=932260;ARGS:name"
+
+# A release started from a tag, in tag.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/releases/new$" \
+    "id:900631,phase:1,pass,nolog,ctl:ruleRemoveTargetById=932260;ARGS:tag"
+
+# A branch protection rule opened for editing, in rule_name.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/settings/branches/edit$" \
+    "id:900632,phase:1,pass,nolog,ctl:ruleRemoveTargetById=932260;ARGS:rule_name"
+
+# A directory listing's last commits, in refSubUrl.
+SecRule REQUEST_FILENAME "@rx ^/[^/]+/[^/]+/lastcommit/" \
+    "id:900633,phase:1,pass,nolog,ctl:ruleRemoveTargetById=932260;ARGS:refSubUrl"
+
+# An artifact upload from actions/upload-artifact@v3 sends the header
+# Content-Range, which the Core Rule Set refused (920450).
+SecRule REQUEST_FILENAME \
+    "@rx ^/api/actions_pipeline/_apis/pipelines/workflows/[0-9]+/artifacts/[^/]+/upload$" \
+    "id:900640,phase:1,pass,nolog,\
+    ctl:ruleRemoveTargetById=920450;REQUEST_HEADERS_NAMES:Content-Range"

internal/waf/testdata/gitea-requests.txt

@@ -0,0 +1,393 @@
+# Ordinary gitea 1.27 requests that the Core Rule Set must let through at the
+# defaults. Each line is a path and query, and may end with one header after a
+# space. The tests of internal/waf inspect each as a GET. The Core Rule Set reads
+# the query and the headers the same way for any method.
+
+# Searches with ordinary words and symbols.
+/owner/repo/search?q=package.json
+/owner/repo/search?q=.gitignore
+/owner/repo/search?q=docker-compose.yml
+/owner/repo/search?q=python3
+/owner/repo/search?q=ssh%20key
+/owner/repo/search?q=feat%2Fdocker-support
+/owner/repo/search?q=ls%20-la
+/owner/repo/search?q=sed%20-i
+/owner/repo/search?q=%2Fbin%2Fsh
+/owner/repo/search?q=%60make%20check%60
+/owner/repo/search?q=%60whoami%60
+/owner/repo/search?q=fetch%28
+/owner/repo/search?q=%24%7BVAR%7D
+/owner/repo/search?q=%24%28pwd%29
+/owner/repo/search?q=process.env
+/owner/repo/search?q=%3Cimg%20src%3D
+/owner/repo/search?q=%3Cscript%3E
+/owner/repo/search?q=SELECT%20%2A%20FROM%20users%20WHERE
+/owner/repo/search?q=union%20select
+/owner/repo/search?q=http%3A%2F%2F127.0.0.1%3A8080
+/owner/repo/search?q=..%2F
+/owner/repo/search?q=%2Fetc%2Fpasswd
+/owner/repo/search?q=eval%28
+/owner/repo/search?q=chmod%20%2Bx
+/owner/repo/search?q=echo%20%24PATH
+/owner/repo/search?q=java.lang.Runtime
+/owner/repo/search?q=document.cookie
+/owner/repo/search?q=alert%281%29
+/owner/repo/search?q=__proto__
+/owner/repo/search?q=C%3A%5CWindows%5CSystem32
+/owner/repo/search?q=Invoke-WebRequest
+/owner/repo/search?q=if%20%28a%20%3D%3D%20b%29%20%7B
+/owner/repo/search?q=sudo%20apt%20install
+/owner/repo/search?q=~%2F.ssh%2Fconfig
+/owner/repo/search?q=.htaccess
+/owner/repo/search?q=%24_GET%5B
+/owner/repo/search?q=%24_POST
+/owner/repo/search?q=%24_SERVER%5B%27REQUEST_URI%27%5D
+/owner/repo/search?q=%3C%3Fphp%20echo
+/owner/repo/search?q=information_schema
+/owner/repo/search?q=LIKE%20%27%25foo%25%27
+/owner/repo/search?q=onClick%3D%7B
+/explore/code?q=SELECT%20%2A%20FROM%20users%20WHERE
+/explore/code?q=%3Cimg%20src%3D
+/owner/-/code?q=SELECT%20%2A%20FROM%20users%20WHERE
+/owner/-/code?q=%3Cimg%20src%3D
+/owner/repo/issues?type=all&state=open&q=SELECT%20%2A%20FROM%20users%20WHERE
+/owner/repo/issues?type=all&state=open&q=%3Cimg%20src%3D
+/owner/repo/issues/search?q=SELECT%20%2A%20FROM%20users%20WHERE
+/owner/repo/issues/search?q=%3Cimg%20src%3D
+/owner/repo/pulls?q=SELECT%20%2A%20FROM%20users%20WHERE
+/owner/repo/pulls?q=%3Cimg%20src%3D
+/issues?type=your_repositories&q=SELECT%20%2A%20FROM%20users%20WHERE
+/issues?type=your_repositories&q=%3Cimg%20src%3D
+/issues/search?q=SELECT%20%2A%20FROM%20users%20WHERE
+/issues/search?q=%3Cimg%20src%3D
+/pulls?type=your_repositories&q=SELECT%20%2A%20FROM%20users%20WHERE
+/pulls?type=your_repositories&q=%3Cimg%20src%3D
+/owner/repo/commits/branch/main/search?q=SELECT%20%2A%20FROM%20users%20WHERE
+/owner/repo/commits/branch/main/search?q=%3Cimg%20src%3D
+/api/v1/repos/issues/search?q=SELECT%20%2A%20FROM%20users%20WHERE
+/api/v1/repos/issues/search?q=%3Cimg%20src%3D
+/api/v1/repos/owner/repo/issues?q=SELECT%20%2A%20FROM%20users%20WHERE
+/api/v1/repos/owner/repo/issues?q=%3Cimg%20src%3D
+
+# Searches for the names of repositories, users, branches, tags and packages.
+/explore/repos?q=python3-app
+/explore/repos?q=.profile
+/explore/repos?q=powershell-scripts
+/api/v1/repos/search?q=docker-build
+/user/search_candidates?q=docker-ci
+/owner/repo/branches?q=feat%2Fdocker-support
+/owner/repo/tags?q=docker-v1.0
+/owner/-/packages?q=python3-requests
+/owner/-/packages?q=org.apache.commons.logging
+/repo/search?q=python3-app
+/repo/search?q=docker-build
+/repo/search?q=powershell-scripts
+/repo/search?q=.profile
+/owner?tab=repositories&q=python3-app
+/org?q=python3-app
+/owner/repo/issues/posters?q=docker-ci
+/owner/repo/pulls/posters?q=docker-ci
+/explore/users?q=docker-ci
+/explore/organizations?q=docker-ci
+/api/v1/users/search?q=docker-ci
+
+# Pages, raw files and edit pages of files, and the API's call for their
+# contents.
+/owner/repo/src/branch/main/package.json
+/owner/repo/raw/branch/main/package.json
+/owner/repo/_edit/main/package.json
+/api/v1/repos/owner/repo/contents/package.json
+/owner/repo/src/branch/main/.gitignore
+/owner/repo/raw/branch/main/.gitignore
+/owner/repo/_edit/main/.gitignore
+/api/v1/repos/owner/repo/contents/.gitignore
+/owner/repo/src/branch/main/docker-compose.yml
+/owner/repo/raw/branch/main/docker-compose.yml
+/owner/repo/_edit/main/docker-compose.yml
+/api/v1/repos/owner/repo/contents/docker-compose.yml
+/owner/repo/src/branch/main/Dockerfile
+/owner/repo/raw/branch/main/Dockerfile
+/owner/repo/_edit/main/Dockerfile
+/api/v1/repos/owner/repo/contents/Dockerfile
+/owner/repo/src/branch/main/.htaccess
+/owner/repo/raw/branch/main/.htaccess
+/owner/repo/_edit/main/.htaccess
+/api/v1/repos/owner/repo/contents/.htaccess
+/owner/repo/src/branch/main/rootfs/etc/passwd
+/owner/repo/raw/branch/main/rootfs/etc/passwd
+/owner/repo/_edit/main/rootfs/etc/passwd
+/api/v1/repos/owner/repo/contents/rootfs/etc/passwd
+/owner/repo/src/branch/main/bin/docker-entrypoint
+/owner/repo/raw/branch/main/bin/docker-entrypoint
+/owner/repo/_edit/main/bin/docker-entrypoint
+/api/v1/repos/owner/repo/contents/bin/docker-entrypoint
+/owner/repo/src/branch/main/scripts/python3-setup.sh
+/owner/repo/raw/branch/main/scripts/python3-setup.sh
+/owner/repo/_edit/main/scripts/python3-setup.sh
+/api/v1/repos/owner/repo/contents/scripts/python3-setup.sh
+/owner/repo/src/branch/main/src/java.base/share/classes/java/lang/Runtime.java
+/owner/repo/raw/branch/main/src/java.base/share/classes/java/lang/Runtime.java
+/owner/repo/_edit/main/src/java.base/share/classes/java/lang/Runtime.java
+/api/v1/repos/owner/repo/contents/src/java.base/share/classes/java/lang/Runtime.java
+/owner/repo/src/branch/main/java.lang.String.md
+/owner/repo/raw/branch/main/java.lang.String.md
+/owner/repo/_edit/main/java.lang.String.md
+/api/v1/repos/owner/repo/contents/java.lang.String.md
+/owner/repo/src/branch/main/META-INF/services/org.apache.commons.logging.LogFactory
+/owner/repo/raw/branch/main/META-INF/services/org.apache.commons.logging.LogFactory
+/owner/repo/_edit/main/META-INF/services/org.apache.commons.logging.LogFactory
+/api/v1/repos/owner/repo/contents/META-INF/services/org.apache.commons.logging.LogFactory
+/owner/repo/src/branch/main/process.env.d.ts
+/owner/repo/raw/branch/main/process.env.d.ts
+/owner/repo/_edit/main/process.env.d.ts
+/api/v1/repos/owner/repo/contents/process.env.d.ts
+/owner/repo/src/branch/main/document.write.js
+/owner/repo/raw/branch/main/document.write.js
+/owner/repo/_edit/main/document.write.js
+/api/v1/repos/owner/repo/contents/document.write.js
+/owner/repo/src/branch/main/test/fixtures/__proto__.json
+/owner/repo/raw/branch/main/test/fixtures/__proto__.json
+/owner/repo/_edit/main/test/fixtures/__proto__.json
+/api/v1/repos/owner/repo/contents/test/fixtures/__proto__.json
+/owner/repo/src/branch/main/install-script.sh
+/owner/repo/raw/branch/main/install-script.sh
+/owner/repo/_edit/main/install-script.sh
+/api/v1/repos/owner/repo/contents/install-script.sh
+/owner/repo/src/branch/main/src/backend/catalog/information_schema.sql
+/owner/repo/raw/branch/main/src/backend/catalog/information_schema.sql
+/owner/repo/_edit/main/src/backend/catalog/information_schema.sql
+/api/v1/repos/owner/repo/contents/src/backend/catalog/information_schema.sql
+/owner/repo/src/branch/main/docs/a%20b.xhtml
+/owner/repo/raw/branch/main/docs/a%20b.xhtml
+/owner/repo/_edit/main/docs/a%20b.xhtml
+/api/v1/repos/owner/repo/contents/docs/a%20b.xhtml
+/owner/repo/src/branch/main/%5Bdraft%5D.md
+/owner/repo/raw/branch/main/%5Bdraft%5D.md
+/owner/repo/_edit/main/%5Bdraft%5D.md
+/api/v1/repos/owner/repo/contents/%5Bdraft%5D.md
+/owner/repo/src/branch/main/notes.txt~
+/owner/repo/raw/branch/main/notes.txt~
+/owner/repo/_edit/main/notes.txt~
+/api/v1/repos/owner/repo/contents/notes.txt~
+
+# The download, blame, history, delete and preview pages of the files above
+# whose names the Core Rule Set checks in the path, and their downloads as
+# release attachments.
+/owner/repo/media/branch/main/notes.txt~
+/owner/repo/blame/branch/main/notes.txt~
+/owner/repo/commits/branch/main/notes.txt~
+/owner/repo/_delete/main/notes.txt~
+/owner/repo/media/branch/main/process.env.d.ts
+/owner/repo/blame/branch/main/process.env.d.ts
+/owner/repo/commits/branch/main/process.env.d.ts
+/owner/repo/_delete/main/process.env.d.ts
+/owner/repo/media/branch/main/docs/a%20b.xhtml
+/owner/repo/blame/branch/main/docs/a%20b.xhtml
+/owner/repo/commits/branch/main/docs/a%20b.xhtml
+/owner/repo/_delete/main/docs/a%20b.xhtml
+/owner/repo/media/branch/main/java.lang.String.md
+/owner/repo/blame/branch/main/java.lang.String.md
+/owner/repo/commits/branch/main/java.lang.String.md
+/owner/repo/_delete/main/java.lang.String.md
+/owner/repo/_preview/main/notes.txt~
+/owner/repo/_preview/main/process.env.d.ts
+/owner/repo/_preview/main/java.lang.String.md
+/owner/repo/releases/download/v1.0/notes.txt~
+/owner/repo/releases/download/v1.0/process.env.d.ts
+/owner/repo/releases/download/v1.0/java.lang.String.md
+/owner/repo/releases/download/v1.0/a%20b.xhtml
+
+# File names in the query string: the commit graph of a file, the API's lists
+# of its commits and of its contents, an issue opened from a template, the
+# sign-in page on the way to its edit page, and a diff's hidden lines.
+/owner/repo/graph?file=package.json
+/api/v1/repos/owner/repo/commits?path=package.json
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22package.json%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fpackage.json
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fpackage.json
+/owner/repo/graph?file=.gitignore
+/api/v1/repos/owner/repo/commits?path=.gitignore
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22.gitignore%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2F.gitignore
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2F.gitignore
+/owner/repo/graph?file=docker-compose.yml
+/api/v1/repos/owner/repo/commits?path=docker-compose.yml
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22docker-compose.yml%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fdocker-compose.yml
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fdocker-compose.yml
+/owner/repo/graph?file=.htaccess
+/api/v1/repos/owner/repo/commits?path=.htaccess
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22.htaccess%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2F.htaccess
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2F.htaccess
+/owner/repo/graph?file=rootfs%2Fetc%2Fpasswd
+/api/v1/repos/owner/repo/commits?path=rootfs%2Fetc%2Fpasswd
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22rootfs%2Fetc%2Fpasswd%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Frootfs%2Fetc%2Fpasswd
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Frootfs%2Fetc%2Fpasswd
+/owner/repo/graph?file=bin%2Fdocker-entrypoint
+/api/v1/repos/owner/repo/commits?path=bin%2Fdocker-entrypoint
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22bin%2Fdocker-entrypoint%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fbin%2Fdocker-entrypoint
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fbin%2Fdocker-entrypoint
+/owner/repo/graph?file=scripts%2Fpython3-setup.sh
+/api/v1/repos/owner/repo/commits?path=scripts%2Fpython3-setup.sh
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22scripts%2Fpython3-setup.sh%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fscripts%2Fpython3-setup.sh
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fscripts%2Fpython3-setup.sh
+/owner/repo/graph?file=src%2Fjava.base%2Fshare%2Fclasses%2Fjava%2Flang%2FRuntime.java
+/api/v1/repos/owner/repo/commits?path=src%2Fjava.base%2Fshare%2Fclasses%2Fjava%2Flang%2FRuntime.java
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22src%2Fjava.base%2Fshare%2Fclasses%2Fjava%2Flang%2FRuntime.java%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fsrc%2Fjava.base%2Fshare%2Fclasses%2Fjava%2Flang%2FRuntime.java
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fsrc%2Fjava.base%2Fshare%2Fclasses%2Fjava%2Flang%2FRuntime.java
+/owner/repo/graph?file=java.lang.String.md
+/api/v1/repos/owner/repo/commits?path=java.lang.String.md
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22java.lang.String.md%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fjava.lang.String.md
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fjava.lang.String.md
+/owner/repo/graph?file=META-INF%2Fservices%2Forg.apache.commons.logging.LogFactory
+/api/v1/repos/owner/repo/commits?path=META-INF%2Fservices%2Forg.apache.commons.logging.LogFactory
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22META-INF%2Fservices%2Forg.apache.commons.logging.LogFactory%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2FMETA-INF%2Fservices%2Forg.apache.commons.logging.LogFactory
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2FMETA-INF%2Fservices%2Forg.apache.commons.logging.LogFactory
+/owner/repo/graph?file=process.env.d.ts
+/api/v1/repos/owner/repo/commits?path=process.env.d.ts
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22process.env.d.ts%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fprocess.env.d.ts
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fprocess.env.d.ts
+/owner/repo/graph?file=document.write.js
+/api/v1/repos/owner/repo/commits?path=document.write.js
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22document.write.js%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fdocument.write.js
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fdocument.write.js
+/owner/repo/graph?file=test%2Ffixtures%2F__proto__.json
+/api/v1/repos/owner/repo/commits?path=test%2Ffixtures%2F__proto__.json
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22test%2Ffixtures%2F__proto__.json%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Ftest%2Ffixtures%2F__proto__.json
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Ftest%2Ffixtures%2F__proto__.json
+/owner/repo/graph?file=install-script.sh
+/api/v1/repos/owner/repo/commits?path=install-script.sh
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22install-script.sh%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Finstall-script.sh
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Finstall-script.sh
+/owner/repo/graph?file=src%2Fbackend%2Fcatalog%2Finformation_schema.sql
+/api/v1/repos/owner/repo/commits?path=src%2Fbackend%2Fcatalog%2Finformation_schema.sql
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22src%2Fbackend%2Fcatalog%2Finformation_schema.sql%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fsrc%2Fbackend%2Fcatalog%2Finformation_schema.sql
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fsrc%2Fbackend%2Fcatalog%2Finformation_schema.sql
+/owner/repo/graph?file=docs%2Fa%20b.xhtml
+/api/v1/repos/owner/repo/commits?path=docs%2Fa%20b.xhtml
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22docs%2Fa%20b.xhtml%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2Fdocs%2Fa%20b.xhtml
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2Fdocs%2Fa%20b.xhtml
+/owner/repo/graph?file=%5Bdraft%5D.md
+/api/v1/repos/owner/repo/commits?path=%5Bdraft%5D.md
+/api/v1/repos/owner/repo/file-contents?body=%7B%22files%22%3A%5B%22%5Bdraft%5D.md%22%5D%7D
+/owner/repo/issues/new?template=.gitea%2FISSUE_TEMPLATE%2F%5Bdraft%5D.md
+/user/login?redirect_to=%2Fowner%2Frepo%2F_edit%2Fmain%2F%5Bdraft%5D.md
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=process.env.d.ts&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=java.lang.String.md&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=install-script.sh&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=information_schema.sql&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=document.write.js&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=__proto__.json&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=src%2Fjava.base%2Fshare%2Fclasses%2Fjava%2Flang%2FRuntime.java&style=unified&direction=down&wiki=false
+/owner/repo/blob_excerpt/0123456789abcdef0123456789abcdef01234567?last_left=10&last_right=10&left=20&right=20&left_hunk_size=5&right_hunk_size=5&path=index.xhtml&style=unified&direction=down&wiki=false
+
+# File names of attachments uploaded through the API, to a release, an issue and
+# a comment.
+/api/v1/repos/owner/repo/releases/1/assets?name=package.json
+/api/v1/repos/owner/repo/releases/1/assets?name=.gitignore
+/api/v1/repos/owner/repo/releases/1/assets?name=docker-compose.yml
+/api/v1/repos/owner/repo/releases/1/assets?name=.htaccess
+/api/v1/repos/owner/repo/releases/1/assets?name=docker-entrypoint
+/api/v1/repos/owner/repo/releases/1/assets?name=python3-setup.sh
+/api/v1/repos/owner/repo/releases/1/assets?name=Runtime.java
+/api/v1/repos/owner/repo/releases/1/assets?name=org.apache.commons.logging.LogFactory
+/api/v1/repos/owner/repo/releases/1/assets?name=%5Bdraft%5D.md
+/api/v1/repos/owner/repo/releases/1/assets?name=notes.txt~
+/api/v1/repos/owner/repo/releases/1/assets?name=install-script.sh
+/api/v1/repos/owner/repo/issues/1/assets?name=install-script.sh
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=install-script.sh
+/api/v1/repos/owner/repo/releases/1/assets?name=process.env.d.ts
+/api/v1/repos/owner/repo/issues/1/assets?name=process.env.d.ts
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=process.env.d.ts
+/api/v1/repos/owner/repo/releases/1/assets?name=java.lang.String.md
+/api/v1/repos/owner/repo/issues/1/assets?name=java.lang.String.md
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=java.lang.String.md
+/api/v1/repos/owner/repo/releases/1/assets?name=information_schema.sql
+/api/v1/repos/owner/repo/issues/1/assets?name=information_schema.sql
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=information_schema.sql
+/api/v1/repos/owner/repo/releases/1/assets?name=document.write.js
+/api/v1/repos/owner/repo/issues/1/assets?name=document.write.js
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=document.write.js
+/api/v1/repos/owner/repo/releases/1/assets?name=__proto__.json
+/api/v1/repos/owner/repo/issues/1/assets?name=__proto__.json
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=__proto__.json
+/api/v1/repos/owner/repo/releases/1/assets?name=index.xhtml
+/api/v1/repos/owner/repo/issues/1/assets?name=index.xhtml
+/api/v1/repos/owner/repo/issues/comments/1/assets?name=index.xhtml
+
+# An artifact upload from actions/upload-artifact@v3, which sends Content-Range.
+/api/actions_pipeline/_apis/pipelines/workflows/1/artifacts/9b7c1f3a/upload?itemPath=artifact%2Freport.txt Content-Range: bytes 0-9/10
+
+# Branch and tag names in the query string: deleting and restoring a branch,
+# starting a release from a tag, a branch protection rule, a directory listing's
+# last commits, and a container image push that reuses a layer.
+/owner/repo/branches/delete?name=docker-build&page=1
+/owner/repo/branches/restore?branch_id=1&name=docker-build&page=1
+/owner/repo/releases/new?tag=docker-build
+/owner/repo/settings/branches/edit?rule_name=docker-build
+/owner/repo/lastcommit/main/src?refSubUrl=branch%2Fdocker-build
+/v2/owner/app/blobs/uploads/?mount=sha256%3A0000&from=owner%2Fdocker-build
+/owner/repo/branches/delete?name=feat%2Fdocker-support&page=1
+/owner/repo/branches/restore?branch_id=1&name=feat%2Fdocker-support&page=1
+/owner/repo/releases/new?tag=feat%2Fdocker-support
+/owner/repo/settings/branches/edit?rule_name=feat%2Fdocker-support
+/owner/repo/lastcommit/main/src?refSubUrl=branch%2Ffeat%2Fdocker-support
+/v2/owner/app/blobs/uploads/?mount=sha256%3A0000&from=owner%2Ffeat%2Fdocker-support
+/owner/repo/branches/delete?name=renovate%2Fdocker-build-push-action-6.x&page=1
+/owner/repo/branches/restore?branch_id=1&name=renovate%2Fdocker-build-push-action-6.x&page=1
+/owner/repo/releases/new?tag=renovate%2Fdocker-build-push-action-6.x
+/owner/repo/settings/branches/edit?rule_name=renovate%2Fdocker-build-push-action-6.x
+/owner/repo/lastcommit/main/src?refSubUrl=branch%2Frenovate%2Fdocker-build-push-action-6.x
+/v2/owner/app/blobs/uploads/?mount=sha256%3A0000&from=owner%2Frenovate%2Fdocker-build-push-action-6.x
+/owner/repo/branches/delete?name=python3-migration&page=1
+/owner/repo/branches/restore?branch_id=1&name=python3-migration&page=1
+/owner/repo/releases/new?tag=python3-migration
+/owner/repo/settings/branches/edit?rule_name=python3-migration
+/owner/repo/lastcommit/main/src?refSubUrl=branch%2Fpython3-migration
+/v2/owner/app/blobs/uploads/?mount=sha256%3A0000&from=owner%2Fpython3-migration
+/owner/repo/branches/delete?name=ansible-roles&page=1
+/owner/repo/branches/restore?branch_id=1&name=ansible-roles&page=1
+/owner/repo/releases/new?tag=ansible-roles
+/owner/repo/settings/branches/edit?rule_name=ansible-roles
+/owner/repo/lastcommit/main/src?refSubUrl=branch%2Fansible-roles
+/v2/owner/app/blobs/uploads/?mount=sha256%3A0000&from=owner%2Fansible-roles
+/owner/repo/branches/delete?name=whoami&page=1
+/owner/repo/branches/restore?branch_id=1&name=whoami&page=1
+/owner/repo/releases/new?tag=whoami
+/owner/repo/settings/branches/edit?rule_name=whoami
+/owner/repo/lastcommit/main/src?refSubUrl=branch%2Fwhoami
+/v2/owner/app/blobs/uploads/?mount=sha256%3A0000&from=owner%2Fwhoami
+
+# Pages a signed-in user opens.
+/
+/owner/repo
+/owner/repo/issues
+/owner/repo/pulls
+/owner/repo/releases
+/owner/repo/wiki
+/owner/repo/activity
+/owner/repo/branches
+/owner/repo/tags
+/owner/repo/settings
+/owner/repo/actions
+/owner/repo/compare/main...main
+/owner/repo/commits/branch/main
+/owner/repo/archive/main.zip
+/notifications
+/user/settings
+/user/settings/applications
+/explore/repos
+/-/admin

internal/waf/waf.go

@@ -1,8 +1,9 @@
 // Package waf runs the OWASP Core Rule Set 4.25.0, through Coraza, on the
 // method, the URL with its query and the headers of a request, and on its
-// body while SWWAF_WAF_BODY_LIMIT is set, with the six changes smallwebwaf
-// makes to it, as "Attack detection" under "Settings" in SPEC.md describes
-// them. It reads no response.
+// body while SWWAF_WAF_BODY_LIMIT is set, with the eight changes smallwebwaf
+// makes to it and the exclusions in SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE, as
+// "Attack detection" under "Settings" in SPEC.md describes them. It reads no
+// response.
 //
 // smallwebwaf writes only to its state directory, so Coraza is built with
 // its no_fs_access tag, as the Dockerfile and script/build build it: of a
@@ -11,10 +12,14 @@
 package waf
 
 import (
+	_ "embed"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/netip"
+	"os"
+	"regexp"
 	"slices"
 	"strconv"
 	"strings"
@@ -26,12 +31,14 @@ import (
 )
 
 // directives are the Core Rule Set as smallwebwaf runs it, with the
-// paranoia level for %d, and bodyDirectives for %s while
-// SWWAF_WAF_BODY_LIMIT is set. Each rule smallwebwaf adds has an id from
-// 900000 to 900999, the ids the Core Rule Set keeps for the rules that set
-// it up, which SWWAF_WAF_DISABLED_RULES refuses, so that no setting
-// switches one off. Coraza joins a line ending in \ to the next, without
-// the spaces at the start of the next.
+// paranoia level for %d, bodyDirectives for the first %s while
+// SWWAF_WAF_BODY_LIMIT is set, the exclusions file for the second, and
+// giteaExclusions for the third.
+// Each rule smallwebwaf adds has an id from 900000 to 900999, the ids the
+// Core Rule Set keeps for the rules that set it up, which
+// SWWAF_WAF_DISABLED_RULES and the exclusions file refuse, so that no
+// setting switches one off. Coraza joins a line ending in \ to the next,
+// without the spaces at the start of the next.
 const directives = `
 # The engine only detects. smallwebwaf compares the request's anomaly
 # score with SWWAF_WAF_ANOMALY_THRESHOLD itself, in block and detect mode
@@ -69,6 +76,14 @@ SecArgumentsLimit 1000
 SecRule ARGUMENTS_LIMIT_REACHED "@eq 1" "id:900300,phase:2,pass,\
     severity:'CRITICAL',setvar:'tx.inbound_anomaly_score_pl1=+5'"
 
+# The exclusions file comes before the rules, where the Core Rule Set puts
+# its own file of exclusions that run before the rules, so that they run
+# before the rules of phase 1 too.
+%s
+
+# The eighth change comes before the rules for the same reason.
+%s
+
 # The sixth: only the rules for requests are loaded, and no response is
 # inspected.
 Include @owasp_crs/REQUEST-*.conf
@@ -96,10 +111,19 @@ SecRuleUpdateTargetById 932260 "!ARGS:path|!ARGS:files|!ARGS:skip-to|\
     !ARGS:artifactName|!ARGS:redirect_to"
 
 # The fifth, for Referer: it is not checked for a Unix command without
-# arguments, or for Java starting a process. The cookies are left out in
-# Inspect.
+# arguments, for Java starting a process, or for a Java class name. 944130
+# refused every page opened from the page of java.lang.String.md. The
+# cookies are left out in Inspect.
 SecRuleUpdateTargetById 932340 "!REQUEST_HEADERS:Referer"
 SecRuleUpdateTargetById 944110 "!REQUEST_HEADERS:Referer"
+SecRuleUpdateTargetById 944130 "!REQUEST_HEADERS:Referer"
+
+# The seventh: a container image push that reuses a layer names the image
+# it takes the layer from in the query parameter from, which is not
+# checked for command names. 932260 refused the push of a layer from
+# owner/python3-app.
+SecRule REQUEST_FILENAME "@rx ^/v2/.+/blobs/uploads/$" \
+    "id:900500,phase:1,pass,nolog,ctl:ruleRemoveTargetById=932260;ARGS:from"
 `
 
 // bodyDirectives have the Core Rule Set read the part of a request body
@@ -144,6 +168,13 @@ SecRule MULTIPART_STRICT_ERROR "!@eq 0" "id:900450,phase:2,pass,\
     severity:'CRITICAL',setvar:'tx.inbound_anomaly_score_pl1=+5'"
 `
 
+// giteaExclusions are the eighth change: the fields of gitea's own
+// requests that skip the rules that refused them there, as Coraza
+// directives.
+//
+//go:embed gitea.conf
+var giteaExclusions string
+
 // cookiesNotRead are the cookies the Core Rule Set reads a request
 // without, the rest of the fifth change.
 //
@@ -160,6 +191,94 @@ type Params struct {
 	// BodyLimit is the most of a request body the Core Rule Set reads
 	// (SWWAF_WAF_BODY_LIMIT), 0 while it is off and it reads none.
 	BodyLimit int64
+	// ExclusionsFile is the path of a file of exclusions loaded before the
+	// Core Rule Set's rules (SWWAF_CORE_RULE_SET_EXCLUSIONS_FILE), "" while
+	// there is none.
+	ExclusionsFile string
+}
+
+// The ids of smallwebwaf's own rules, which an exclusions file may not
+// name.
+const (
+	firstOwnRuleID = 900000
+	lastOwnRuleID  = 900999
+)
+
+// numberOrRange matches a number, or a range of numbers such as
+// 900000-900999. Coraza reads a number with a + before it too, so the
+// end of a range may have one.
+var numberOrRange = regexp.MustCompile(`(\d+)(?:-\+?(\d+))?`)
+
+// errSmallwebwafRuleID is the error of an exclusions file that names an
+// id of smallwebwaf's own rules.
+var errSmallwebwafRuleID = errors.New("an id of smallwebwaf's own rules")
+
+// errChangesNoRule is the error of an exclusions file that holds a
+// directive that removes or changes rules as it loads, such as
+// SecRuleRemoveById. The Core Rule Set's rules load after the file, so
+// the directive finds none of them.
+var errChangesNoRule = errors.New("the Core Rule Set's rules load after the file; " +
+	"switch a rule off with SWWAF_WAF_DISABLED_RULES, or on some requests " +
+	"with a ctl exclusion")
+
+// directivesIn returns the directives in text as Coraza reads them: it
+// skips blank lines and comment lines, and joins a line ending in \ to
+// the next, without the spaces around either.
+func directivesIn(text string) []string {
+	var directives []string
+
+	joined := ""
+
+	for line := range strings.Lines(text) {
+		line = strings.TrimSpace(line)
+		if line == "" || strings.HasPrefix(line, "#") {
+			continue
+		}
+
+		if start, found := strings.CutSuffix(line, `\`); found {
+			joined += start
+
+			continue
+		}
+
+		directives = append(directives, joined+line)
+		joined = ""
+	}
+
+	return directives
+}
+
+// checkExclusions returns an error if exclusions, the text of an
+// exclusions file, names an id of smallwebwaf's own rules, alone or in a
+// range, or holds a directive whose name starts with SecRuleRemove or
+// SecRuleUpdate.
+func checkExclusions(exclusions string) error {
+	for _, directive := range directivesIn(exclusions) {
+		for _, match := range numberOrRange.FindAllStringSubmatch(directive, -1) {
+			first, _ := strconv.Atoi(match[1])
+
+			last := first
+			if match[2] != "" {
+				last, _ = strconv.Atoi(match[2])
+			}
+
+			if first <= lastOwnRuleID && last >= firstOwnRuleID {
+				return fmt.Errorf("the exclusions file names %s: %w", match[0],
+					errSmallwebwafRuleID)
+			}
+		}
+
+		// Coraza takes the directive's name up to the first space, without
+		// regard to case.
+		name, _, _ := strings.Cut(directive, " ")
+		if lower := strings.ToLower(name); strings.HasPrefix(lower, "secruleremove") ||
+			strings.HasPrefix(lower, "secruleupdate") {
+			return fmt.Errorf("%s in the exclusions file changes no rule: %w", name,
+				errChangesNoRule)
+		}
+	}
+
+	return nil
 }
 
 // CoreRuleSet is the Core Rule Set, ready to inspect requests. It is safe
@@ -169,16 +288,35 @@ type CoreRuleSet struct {
 	bodyLimit int64
 }
 
-// New returns the Core Rule Set with the six changes, at params'
-// paranoia level, without the rules it switches off, and reading request
-// bodies up to params' limit.
+// New returns the Core Rule Set with the eight changes, at params'
+// paranoia level, without the rules it switches off, reading request
+// bodies up to params' limit, and with params' exclusions file loaded
+// before the Core Rule Set's rules. An exclusions file is an error if it
+// cannot be read or does not parse, or if checkExclusions refuses it.
 func New(params Params) (*CoreRuleSet, error) {
 	body := ""
 	if params.BodyLimit > 0 {
 		body = fmt.Sprintf(bodyDirectives, params.BodyLimit)
 	}
 
-	text := fmt.Sprintf(directives, params.ParanoiaLevel, body)
+	exclusions := ""
+
+	if params.ExclusionsFile != "" {
+		file, err := os.ReadFile(params.ExclusionsFile)
+		if err != nil {
+			return nil, fmt.Errorf("read the exclusions file: %w", err)
+		}
+
+		exclusions = string(file)
+
+		err = checkExclusions(exclusions)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	text := fmt.Sprintf(directives, params.ParanoiaLevel, body, exclusions,
+		giteaExclusions)
 
 	if len(params.DisabledRules) > 0 {
 		ids := make([]string, len(params.DisabledRules))

internal/waf/waf_test.go

@@ -5,6 +5,7 @@ import (
 	"net/http/httptest"
 	"net/netip"
 	"net/url"
+	"os"
 	"path/filepath"
 	"reflect"
 	"strconv"
@@ -119,7 +120,7 @@ func atDefaults(t *testing.T) *waf.CoreRuleSet {
 }
 
 // wantChange checks that crs lets through passes, a gitea request one of
-// the six changes is for, and still finds result in refused, a request
+// the eight changes is for, and still finds result in refused, a request
 // like it that the change is not for.
 func wantChange(
 	t *testing.T, crs *waf.CoreRuleSet, passes, refused request, result waf.Result,
@@ -308,13 +309,14 @@ func TestCookiesGiteaFlashAndRedirectToAreNotRead(t *testing.T) {
 		matched(930120))
 }
 
-func TestRefererIsNotCheckedForACommandOrJavaStartingAProcess(t *testing.T) {
+func TestRefererIsNotCheckedForACommandOrJava(t *testing.T) {
 	t.Parallel()
 
 	const (
 		search      = "https://git.example/explore/repos?q=env"
 		runtimeJava = "https://git.example/openjdk/jdk/src/branch/master/src/" +
 			"java.base/share/classes/java/lang/Runtime.java"
+		stringMD = "https://git.example/owner/repo/src/branch/main/java.lang.String.md"
 	)
 
 	crs := atDefaults(t)
@@ -323,6 +325,8 @@ func TestRefererIsNotCheckedForACommandOrJavaStartingAProcess(t *testing.T) {
 		matched(932340))
 	wantChange(t, crs, get("/", "Referer: "+runtimeJava),
 		get("/", "X-Page: "+runtimeJava), matched(944110))
+	wantChange(t, crs, get("/", "Referer: "+stringMD), get("/", "X-Page: "+stringMD),
+		matched(944130))
 
 	// It is still checked for script and SQL injection.
 	wantResult(t, crs,
@@ -362,6 +366,190 @@ func TestEachDisabledRuleIsSwitchedOff(t *testing.T) {
 	wantResult(t, newCoreRuleSet(t, 1, 920350, 911100), r, waf.Result{})
 }
 
+func TestImagePushThatReusesALayerIsNotCheckedForCommandNames(t *testing.T) {
+	t.Parallel()
+
+	crs := atDefaults(t)
+	reuse := "?mount=sha256:0000&from=owner/python3-app"
+
+	wantChange(t, crs, get("/v2/owner/app/blobs/uploads/"+reuse), get("/upload/"+reuse),
+		matched(932260))
+
+	// A command after the image's name is still refused.
+	wantResult(t, crs,
+		get("/v2/owner/app/blobs/uploads/?from=owner/app;cat%20/etc/passwd"),
+		matched(930120, 932160))
+}
+
+// withExclusions returns the Core Rule Set at the defaults, with the
+// exclusions file at path.
+func withExclusions(path string) (*waf.CoreRuleSet, error) {
+	return waf.New(waf.Params{
+		ParanoiaLevel: 1, DisabledRules: defaultDisabledRules, ExclusionsFile: path,
+	})
+}
+
+// exclusionsFile writes text to a file of exclusions and returns its path.
+func exclusionsFile(t *testing.T, text string) string {
+	t.Helper()
+
+	path := filepath.Join(t.TempDir(), "exclusions.conf")
+
+	err := os.WriteFile(path, []byte(text), 0o600)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return path
+}
+
+// backupFileExclusion is an exclusions file that switches 920500, a rule
+// of phase 1, off for the path of a backup file under /files/.
+const backupFileExclusion = `SecRule REQUEST_FILENAME "@beginsWith /files/" ` +
+	`"id:1,phase:1,pass,nolog,ctl:ruleRemoveTargetById=920500;REQUEST_FILENAME"` + "\n"
+
+func TestExclusionsFileIsLoadedBeforeTheRules(t *testing.T) {
+	t.Parallel()
+
+	crs, err := withExclusions(exclusionsFile(t, backupFileExclusion))
+	if err != nil {
+		t.Fatalf("load the exclusions: %v", err)
+	}
+
+	wantChange(t, crs, get("/files/notes.txt~"), get("/notes.txt~"), matched(920500))
+}
+
+func TestRuleSwitchedOffAndNamedInTheExclusionsFileIsOff(t *testing.T) {
+	t.Parallel()
+
+	crs, err := waf.New(waf.Params{
+		ParanoiaLevel: 1, DisabledRules: []int{920500},
+		ExclusionsFile: exclusionsFile(t, backupFileExclusion),
+	})
+	if err != nil {
+		t.Fatalf("load the exclusions: %v", err)
+	}
+
+	wantResult(t, crs, get("/notes.txt~"), waf.Result{})
+}
+
+func TestExclusionsFileMayNameAnyNumberInAComment(t *testing.T) {
+	t.Parallel()
+
+	_, err := withExclusions(exclusionsFile(t,
+		"# 942100: GET /issues/900123\n"+backupFileExclusion))
+	if err != nil {
+		t.Errorf("the exclusions did not load: %v", err)
+	}
+}
+
+func TestExclusionsFileThatCannotBeUsedIsAnError(t *testing.T) {
+	t.Parallel()
+
+	missing := filepath.Join(t.TempDir(), "missing.conf")
+
+	_, err := withExclusions(missing)
+	if err == nil {
+		t.Errorf("%s loaded", missing)
+	}
+
+	for _, tc := range []struct{ text, want string }{
+		{"SecNoSuchDirective On\n", "unknown directive"},
+		// smallwebwaf's own rules may not be switched off or changed, by
+		// id or in a range, on one line or split over several.
+		{"SecRuleRemoveById 899999-901000\n", "names 899999-901000"},
+		{
+			"SecAction \"id:1,phase:1,pass,nolog,ctl:ruleRemoveById=899999-901000\"\n",
+			"names 899999-901000",
+		},
+		{
+			"SecAction \"id:1,phase:1,pass,nolog,ctl:ruleRemoveById=899999-+901000\"\n",
+			"names 899999-+901000",
+		},
+		{
+			"SecAction \"id:1,phase:1,pass,nolog,ctl:ruleRemoveTargetById=900500;ARGS:from\"\n",
+			"names 900500",
+		},
+		{"SecRuleRemoveById 899000-\\\n    901000\n", "names 899000-901000"},
+		{
+			"SecAction \"id:1,phase:1,pass,nolog,\\\n" +
+				"    ctl:ruleRemoveById=9005\\\n    00\"\n",
+			"names 900500",
+		},
+		// The Core Rule Set's rules load after the file.
+		{"SecRuleRemoveById 942100\n", "SecRuleRemoveById in the exclusions file"},
+		{
+			"SecRuleUpdateTargetById 942100 \"!ARGS:id\"\n",
+			"SecRuleUpdateTargetById in the exclusions file",
+		},
+	} {
+		_, err := withExclusions(exclusionsFile(t, tc.text))
+		if err == nil || !strings.Contains(err.Error(), tc.want) {
+			t.Errorf("%q gave the error %v, want one with %q", tc.text, err, tc.want)
+		}
+	}
+}
+
+// giteaRequests returns the recorded ordinary gitea requests in testdata.
+// Each has the Referer of a page that names the same, as a page opened
+// from it has.
+func giteaRequests(t *testing.T) []request {
+	t.Helper()
+
+	text, err := os.ReadFile(filepath.Join("testdata", "gitea-requests.txt"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	var requests []request
+
+	for line := range strings.Lines(string(text)) {
+		line = strings.TrimSpace(line)
+		if line == "" || strings.HasPrefix(line, "#") {
+			continue
+		}
+
+		target, header, _ := strings.Cut(line, " ")
+
+		headers := []string{"Referer: http://git.example" + target}
+		if header != "" {
+			headers = append(headers, header)
+		}
+
+		requests = append(requests, get(target, headers...))
+	}
+
+	return requests
+}
+
+func TestOrdinaryGiteaRequestsPassAndAttacksAreRefused(t *testing.T) {
+	t.Parallel()
+
+	const threshold = 5 // SWWAF_WAF_ANOMALY_THRESHOLD's default
+
+	crs := atDefaults(t)
+
+	for _, r := range giteaRequests(t) {
+		if got := inspect(t, crs, r); got.Score >= threshold {
+			t.Errorf("%s %q refused: %+v", r.target, r.headers[1:], got)
+		}
+	}
+
+	// In q too, off gitea's search pages.
+	for _, parameter := range []string{"id", "q"} {
+		for _, attack := range []string{
+			"1'%20OR%20'1'='1",
+			"..%2Fcustom%2Fconf%2Fapp.ini",
+			"%3Cscript%3Ealert(1)%3C%2Fscript%3E",
+		} {
+			target := "/owner/repo?" + parameter + "=" + attack
+			if got := inspect(t, crs, get(target)); got.Score < threshold {
+				t.Errorf("%s let through: %+v", target, got)
+			}
+		}
+	}
+}
+
 // bodyLimit is SWWAF_WAF_BODY_LIMIT in the tests that read bodies.
 const bodyLimit = 8 << 10
 

script/gitea-requests

@@ -1,350 +0,0 @@
-#!/bin/sh
-# script/gitea-requests: build the image and run gitea 1.27.3 behind rproxy
-# and servewaf, three containers on one network. Every setting is at its
-# default but these: SWRP_UPSTREAM_URL names gitea's container, SWRP_WAF_BACKEND
-# names servewaf's, and SWWAF_LOG_REQUEST_HEADERS adds the header that labels a
-# request. Then send through rproxy the gitea requests that reading gitea's
-# source found the Core Rule Set refuses, which docs/gitea.md records, and a
-# short sample of gitea's ordinary use: signing in, pages of files and commits,
-# a diff, the API, a push, clone and fetch over HTTP, and two container image
-# pushes. Last, print each request servewaf logged, with what it did with it and
-# the ids of the Core Rule Set's rules that matched it.
-# Every request comes from one client, docker's gateway, so more than
-# SWWAF_ERROR_BURST_THRESHOLD, 30, refusals in a minute would ban it, and
-# the requests after would show as banned. The containers, the network,
-# the images and the files the script makes are removed however it ends;
-# gitea's own image stays, as the base images of a build do. It needs
-# network access, and a docker daemon that pushes to a registry on
-# localhost over plain HTTP, as docker does by default. script/check does
-# not run this.
-set -eu
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
-ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
-
-# gitea 1.27.3, 2026-08-29
-GITEA_IMAGE="gitea/gitea@sha256:87a67ee09d3ae0d1df5fda5dcda3e2a1f9236a45b0a59025d6e00e46adc43bef"
-
-# Named after this run, so that runs in other clones on the same host
-# never touch each other's.
-NAME="$("$SCRIPT_DIR/projectname")-gitea-$$"
-IMAGE="$NAME-image"
-NETWORK="$NAME"
-RPROXY="$NAME-rproxy"
-SERVEWAF="$NAME-servewaf"
-GITEA="$NAME-gitea"
-
-# gitea's one user, who owns the repository and the container images.
-PASSWORD="owner-password"
-
-BROWSER="Mozilla/5.0 (X11; Linux x86_64; rv:131.0) Gecko/20100101 Firefox/131.0"
-
-# The header that labels a request in the report. rproxy makes every request's
-# id itself, so a label cannot be the X-Request-ID.
-LABEL_HEADER="X-Case"
-
-# The default of SWWAF_LOG_REQUEST_HEADERS, and the header above.
-LOGGED_HEADERS="accept,accept-language,accept-encoding,content-type,origin,range,x-case"
-
-# The files the script makes, and rproxy's address once it runs, localhost and
-# the port docker publishes it on: a host name, since the Core Rule Set takes a
-# Host that is an IP address for a warning (920350).
-WORK=""
-address=""
-
-cleanup() {
-    # So that a signal cannot stop it partway through.
-    trap '' HUP INT TERM
-    docker rm --force --volumes "$RPROXY" "$SERVEWAF" "$GITEA" >/dev/null 2>&1 || true
-    docker network rm "$NETWORK" >/dev/null 2>&1 || true
-    docker rmi --force "$IMAGE" >/dev/null 2>&1 || true
-    if [ -n "$address" ]; then
-        docker rmi --force "$address/owner/python3-app:1" "$address/owner/app:1" \
-            >/dev/null 2>&1 || true
-    fi
-    rm -rf "$WORK"
-}
-
-fail() {
-    echo "gitea-requests: $*" >&2
-    report
-    exit 1
-}
-
-# wait_for <what fails> <command>...: run the command every second until
-# it succeeds, for at most a minute.
-wait_for() {
-    failure="$1"
-    shift
-    tries=0
-    until "$@"; do
-        tries=$((tries + 1))
-        [ "$tries" -lt 60 ] || fail "$failure"
-        sleep 1
-    done
-}
-
-# healthy <container>: docker says the container's health check passes.
-healthy() {
-    status="$(docker inspect --format '{{.State.Health.Status}}' "$1")"
-    [ "$status" = healthy ]
-}
-
-# logged <text>...: a line of servewaf's output holds every text, in any order.
-logged() {
-    lines="$(docker logs "$SERVEWAF" 2>&1)"
-    for text in "$@"; do
-        lines="$(printf '%s\n' "$lines" | grep -F "$text")" || return 1
-    done
-}
-
-# send <label> <path> <curl option>...: send a request for path to rproxy, with
-# label in LABEL_HEADER, which the report gives, and keep the body of the answer
-# in $WORK/answer. The Core Rule Set reads that header too, so a label names no
-# file the cases name.
-send() {
-    label="$1"
-    path="$2"
-    shift 2
-    curl --silent --show-error --max-time 30 --output "$WORK/answer" \
-        --header "$LABEL_HEADER: $label" "$@" "http://$address$path"
-}
-
-# page <label> <path> <curl option>...: send the request as a browser
-# does, with the cookies gitea has set. Its Referer is the repository's
-# page, which links to the others, and never a page the Core Rule Set
-# refused: its address would have the next request refused too.
-page() {
-    label="$1"
-    path="$2"
-    shift 2
-    send "$label" "$path" --compressed --user-agent "$BROWSER" \
-        --header "Accept: text/html,application/xhtml+xml,*/*;q=0.8" \
-        --header "Accept-Language: en-US,en;q=0.5" \
-        --cookie "$WORK/cookies" --cookie-jar "$WORK/cookies" \
-        --referer "http://$address/owner/repo" "$@"
-}
-
-# api <label> <path> <curl option>...: send the request as a client of
-# gitea's API does, as the owner.
-api() {
-    label="$1"
-    path="$2"
-    shift 2
-    send "$label" "$path" --user "owner:$PASSWORD" \
-        --header "Accept: application/json" "$@"
-}
-
-# repo_git <git argument>...: run git as the owner, without the host's
-# own git settings, so that nothing it does is kept outside $WORK.
-repo_git() {
-    GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_NOSYSTEM=1 git \
-        -c user.name=owner -c user.email=owner@example.invalid "$@"
-}
-
-# lines: forty lines of text, enough for a diff to hide some of them.
-lines() {
-    i=1
-    while [ "$i" -le 40 ]; do
-        echo "line $i"
-        i=$((i + 1))
-    done
-}
-
-# make_repository: create the repository owner/repo, holding a file of
-# each name the cases name, and push it, which is the push over HTTP of
-# the sample. The second commit adds a line at the end of Runtime.java,
-# so that its diff hides the lines above.
-make_repository() {
-    status="$(api create-repository /api/v1/user/repos \
-        --header "Content-Type: application/json" --data '{"name":"repo"}' \
-        --write-out '%{http_code}')"
-    [ "$status" = 201 ] || fail "creating the repository was answered $status"
-
-    dir="$WORK/repo"
-    repo_git init --quiet --initial-branch=main "$dir"
-    for file in \
-        src/java.base/share/classes/java/lang/Runtime.java \
-        java.lang.String.md \
-        META-INF/services/org.apache.commons.logging.LogFactory \
-        document.write.js \
-        process.env.d.ts \
-        test/fixtures/__proto__.json \
-        install-script.sh \
-        src/backend/catalog/information_schema.sql \
-        .../notes.txt \
-        README.md; do
-        mkdir -p "$dir/$(dirname "$file")"
-        lines >"$dir/$file"
-        repo_git -C "$dir" add "$file"
-    done
-    repo_git -C "$dir" commit --quiet --message "Add the files"
-    echo "line 41" >>"$dir/src/java.base/share/classes/java/lang/Runtime.java"
-    repo_git -C "$dir" commit --quiet --all --message "Add a line"
-
-    repo_git -C "$dir" -c "http.extraHeader=$LABEL_HEADER: git-push" push --quiet \
-        "http://owner:$PASSWORD@$address/owner/repo.git" main ||
-        fail "the push of the repository failed"
-}
-
-# browse: sign in, then open pages as a person does. The cases are those
-# of https://git.eeqj.de/sneak/smallwebwaf/issues/30.
-browse() {
-    # Case: gitea sends a visitor who is not signed in to the sign-in
-    # page, with the page asked for in redirect_to, when that page needs
-    # signing in, as a file's edit page does.
-    page issue-30-case /owner/repo/_edit/main/document.write.js --location
-
-    page sign-in /user/login
-    status="$(page sign-in /user/login --header "Origin: http://$address" \
-        --data-urlencode user_name=owner --data-urlencode "password=$PASSWORD" \
-        --write-out '%{http_code}')"
-    [ "$status" = 303 ] || fail "signing in was answered $status"
-
-    page browse /
-    page browse /owner/repo
-    page browse /owner/repo/src/branch/main/README.md
-    page browse /owner/repo/commits/branch/main
-    page browse "/owner/repo/commit/$(repo_git -C "$WORK/repo" rev-parse HEAD)"
-
-    # Case: expanding the lines the diff hides, by the link the diff's
-    # page gives for it.
-    excerpt="$(sed -n 's/.*data-fetch-url="\([^"]*blob_excerpt[^"]*\)".*/\1/p' \
-        "$WORK/answer" | head -n 1 | sed 's/&amp;/\&/g')"
-    [ -n "$excerpt" ] || fail "the diff's page has no link to its hidden lines"
-    page issue-30-case "$excerpt"
-
-    # Cases: the commit graph of one file, and the pages of files whose
-    # path the Core Rule Set takes for an attack.
-    page issue-30-case "/owner/repo/graph?file=src/java.base/share/classes/java/lang/Runtime.java"
-    page issue-30-case /owner/repo/src/branch/main/META-INF/services/org.apache.commons.logging.LogFactory
-    page issue-30-case /owner/repo/src/branch/main/java.lang.String.md
-    page issue-30-case /owner/repo/src/branch/main/process.env.d.ts
-    page issue-30-case /owner/repo/src/branch/main/.../notes.txt
-}
-
-# call_api: the API's calls the cases name: the commits of a file, for a
-# file of each name the Core Rule Set takes for an attack in the query
-# parameter path, and the file-contents call, which takes its list of
-# files as JSON in the query parameter body.
-call_api() {
-    for file in \
-        src/java.base/share/classes/java/lang/Runtime.java \
-        java.lang.String.md \
-        document.write.js \
-        process.env.d.ts \
-        test/fixtures/__proto__.json \
-        install-script.sh \
-        src/backend/catalog/information_schema.sql; do
-        api issue-30-case /api/v1/repos/owner/repo/commits --get --data-urlencode "path=$file"
-    done
-    api issue-30-case /api/v1/repos/owner/repo/file-contents --get \
-        --data-urlencode 'body={"files":["src/java.base/share/classes/java/lang/Runtime.java"]}'
-}
-
-# push_images: push a container image to owner/python3-app, then the same
-# image to owner/app. For the second, the case, docker asks gitea to take
-# its layer from owner/python3-app, naming it in the query parameter
-# from. docker sends no label, so the report gives its requests none. The image
-# is one small file, imported rather than built.
-push_images() {
-    echo "$NAME" >"$WORK/layer.txt"
-    tar -cf - -C "$WORK" layer.txt |
-        docker import - "$address/owner/python3-app:1" >/dev/null
-    docker tag "$address/owner/python3-app:1" "$address/owner/app:1"
-
-    # The login is written here rather than made with docker login, which
-    # would keep it in the host's credential helper when it has one.
-    mkdir "$WORK/docker"
-    printf '{"auths":{"%s":{"auth":"%s"}}}\n' "$address" \
-        "$(printf 'owner:%s' "$PASSWORD" | base64)" >"$WORK/docker/config.json"
-    for image in "$address/owner/python3-app:1" "$address/owner/app:1"; do
-        DOCKER_CONFIG="$WORK/docker" docker push --quiet "$image" >/dev/null ||
-            echo "gitea-requests: the push of $image failed" >&2
-    done
-}
-
-# clone_and_fetch: the clone and fetch over HTTP of the sample.
-clone_and_fetch() {
-    repo_git -c "http.extraHeader=$LABEL_HEADER: git-clone" clone --quiet \
-        "http://owner:$PASSWORD@$address/owner/repo.git" "$WORK/clone" ||
-        fail "the clone failed"
-    repo_git -C "$WORK/clone" -c "http.extraHeader=$LABEL_HEADER: git-fetch" fetch --quiet ||
-        fail "the fetch failed"
-}
-
-# field <name> <line>: the text of the field name in line, a line of the
-# request log, or nothing when it has none.
-field() {
-    printf '%s\n' "$2" | sed -n "s/.*\"$1\":\"\([^\"]*\)\".*/\1/p"
-}
-
-# report: print a line for each request rproxy reported to servewaf: what
-# servewaf did with the request, the ids of the Core Rule Set's rules that
-# matched it, its label, and the request. waf_blocked is a refusal by the Core
-# Rule Set, and forward a request passed on to gitea, whatever gitea answered.
-report() {
-    docker logs "$SERVEWAF" 2>/dev/null | grep '"servewaf_line":"report"' |
-        sed 's/\\u0026/\&/g' >"$WORK/requests"
-    while IFS= read -r line; do
-        ids="$(printf '%s\n' "$line" | sed -n 's/.*"waf_rule_ids":\[\([0-9,]*\)\].*/\1/p')"
-        query="$(field query "$line")"
-        label="$(field x-case "$line")"
-        printf '%-11s %-13s %-17s %s %s%s\n' "$(field action "$line")" "${ids:--}" \
-            "${label:--}" "$(field method "$line")" \
-            "$(field path "$line")" "${query:+?$query}"
-    done <"$WORK/requests"
-    echo "gitea-requests: $(grep -c . "$WORK/requests") requests," \
-        "$(grep -c '"action":"waf_blocked"' "$WORK/requests") refused by the Core Rule Set"
-}
-
-main() {
-    cd "$ROOT"
-    trap cleanup EXIT
-    trap 'exit 1' HUP INT TERM
-    WORK="$(mktemp -d)"
-
-    docker build --no-cache -t "$IMAGE" .
-
-    # rproxy first, so that gitea can be given the address it is reached at,
-    # and gitea's image pulled before, so that gitea starts within the minute
-    # rproxy's health check waits for it.
-    docker pull --quiet "$GITEA_IMAGE" >/dev/null
-    docker network create "$NETWORK" >/dev/null
-    docker run --detach --name "$SERVEWAF" --network "$NETWORK" \
-        --env SMALLWEBWAF_COMMAND=servewaf \
-        --env SWWAF_LOG_REQUEST_HEADERS="$LOGGED_HEADERS" \
-        "$IMAGE" >/dev/null
-    wait_for "servewaf's health check did not pass" healthy "$SERVEWAF"
-    docker run --detach --name "$RPROXY" --network "$NETWORK" \
-        --publish 127.0.0.1::8080 \
-        --env SWRP_UPSTREAM_URL="http://$GITEA:3000" \
-        --env SWRP_WAF_BACKEND="http://$SERVEWAF:8080" \
-        "$IMAGE" >/dev/null
-    published="$(docker port "$RPROXY" 8080/tcp)"
-    address="localhost:${published##*:}"
-
-    docker run --detach --name "$GITEA" --network "$NETWORK" \
-        --env GITEA__security__INSTALL_LOCK=true \
-        --env GITEA__server__ROOT_URL="http://$address/" \
-        "$GITEA_IMAGE" >/dev/null
-    # rproxy's health check passes once gitea takes connections.
-    wait_for "rproxy's health check did not pass" healthy "$RPROXY"
-    docker exec --user git "$GITEA" gitea admin user create --admin \
-        --username owner --password "$PASSWORD" --email owner@example.invalid \
-        --must-change-password=false >/dev/null
-
-    make_repository
-    browse
-    call_api
-    push_images
-    clone_and_fetch
-
-    # The fetch's last request is the last of all; once it is logged, so
-    # is every other.
-    wait_for "servewaf logged no report of the fetch" \
-        logged '"x-case":"git-fetch"' '"method":"POST"' '"servewaf_line":"report"'
-    report
-}
-
-main "$@"