1 Commits
Author SHA1 Message Date
clawbot e3b159db07 rproxy and servewaf replace the one-process smallwebwaf (closes #172, closes #165)
check / check (push) Failing after 8m17s
`smallwebwaf` with no command now prints the commands and exits with status 2.
The image runs rproxy, or servewaf with SMALLWEBWAF_COMMAND=servewaf. The
passing-on code, its settings and its log fields and metric go. internal/proxy
keeps the checks, answers, reports and own endpoints; its tests run through the
real rproxy. The documents describe the pair.

Judgement call: clients.json keeps token_refused, since state files refuse unknown fields.
Deviation: script/gitea-requests sets SWWAF_LOG_REQUEST_HEADERS, to label requests.

Model: opus-5-5
2026-11-05 08:54:11 +00:00
+15 -15
View File
@@ -1575,13 +1575,12 @@ It sets no `ENTRYPOINT` or `USER` of its own. The container must start
writes. `runsvinit` starts runit's `runsvdir`, which runs the `run` script of writes. `runsvinit` starts runit's `runsvdir`, which runs the `run` script of
each directory under `/etc/service`. Ubuntu's `sv` looks for services there each directory under `/etc/service`. Ubuntu's `sv` looks for services there
too. too.
- The image's `run` script is `/etc/service/smallwebwaf/run`. It starts - The image's `run` script, `/etc/service/smallwebwaf/run`, starts the command
`servewaf` when `SMALLWEBWAF_COMMAND` is `servewaf`, and `rproxy` when it is `SMALLWEBWAF_COMMAND` names, `rproxy` when it is unset or empty, as the
`rproxy`, unset or empty. It runs either as the `smallwebwaf` user (uid and `smallwebwaf` user (uid and gid 65532) with runit's `chpst`. For `servewaf`,
gid 65532), with runit's `chpst`. For `servewaf`, it first makes it first makes `SWWAF_STATE_DIR` and every file in it belong to that user. For
`SWWAF_STATE_DIR` and every file in it belong to that user. For `rproxy` it `rproxy` it changes no owner. With any other value, it starts nothing, and
changes no owner. With any other value, it starts nothing, and stops with a stops with a message naming `SMALLWEBWAF_COMMAND` and its value.
message naming `SMALLWEBWAF_COMMAND` and its value.
Every `run` script, the app's included, is a bash script. It starts with Every `run` script, the app's included, is a bash script. It starts with
`#!/usr/bin/env bash` and `set -euo pipefail`, and puts its code in a `main` `#!/usr/bin/env bash` and `set -euo pipefail`, and puts its code in a `main`
@@ -1701,14 +1700,15 @@ ranges traefik is on.
### upaas ### upaas
upaas rebuilds and restarts an app's Docker container when its repository An app deployed by upaas, which rebuilds and restarts an app's Docker container
changes. An app it deploys takes the shape of "`rproxy` in the app's container" when its repository changes, takes the shape of "`rproxy` in the app's
with no change to upaas. upaas builds the app's Dockerfile and runs the one container" with no change to upaas. upaas builds the app's Dockerfile and runs
container as it runs any app. The traefik labels route to port 8080, and the the one container as it runs any app. The traefik labels route to port 8080, and
`SWRP_` settings go with the app's environment variables. `servewaf` runs in a the `SWRP_` settings go with the app's environment variables. `servewaf` runs in
container of its own, on a network the app's container can reach, with its state a container of its own, on a network the app's container can reach, with its
volume and the directory of any token file. `docs/gitea.md` records what the state volume and the directory of any token file. `docs/gitea.md` records what
defaults do in front of gitea, and `script/gitea-requests` checks those notes. the defaults do in front of gitea, and `script/gitea-requests` checks those
notes.
## Planned, not built ## Planned, not built