Add the new CELPHASE art to the stable branch (#209 )

* web: add artist credit to footer Signed-off-by: Xe Iaso <me@xeiaso.net> * v1.15.2 Signed-off-by: Xe Iaso <me@xeiaso.net> --------- Signed-off-by: Xe Iaso <me@xeiaso.net>
v1.15.1: Zenos yae Galvus: Echo 1 (#181 )
2026-04-05 16:28:17 +00:00 · 2025-04-03 10:59:59 -04:00 · 2025-03-31 18:27:01 -04:00 · 2025-03-27 15:31:13 -04:00
166 changed files with 1721 additions and 8517 deletions
--- a/.air.toml
+++ b/.air.toml
@@ -1,12 +0,0 @@
-root = "."
-tmp_dir = "var"
-
-[build]
-cmd = "go build -o ./var/main ./cmd/anubis"
-bin = "./var/main"
-args = ["--use-remote-address"]
-exclude_dir = ["var", "vendor", "docs", "node_modules"]
-
-[logger]
-time = true
-# to change flags at runtime, prepend with -- e.g. $ air -- --target http://localhost:3000 --difficulty 20 --use-remote-address
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-web/index_templ.go linguist-generated
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
-patreon: cadey
-github: xe
+patreon: cadey
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +0,0 @@
-<!--
-delete me and describe your change here, give enough context for a maintainer to understand what and why
-
-See https://anubis.techaro.lol/docs/developer/code-quality for more information
-->
-
-Checklist:
-
- [ ] Added a description of the changes to the `[Unreleased]` section of docs/docs/CHANGELOG.md
- [ ] Added test cases to [the relevant parts of the codebase](https://anubis.techaro.lol/docs/developer/code-quality)
- [ ] Ran integration tests `npm run test:integration` (unsupported on Windows, please use WSL)
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,28 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-    groups:
-      github-actions:
-        patterns:
-          - "*"
-
-  - package-ecosystem: gomod
-    directory: /
-    schedule:
-      interval: weekly
-    groups:
-      gomod:
-        patterns:
-          - "*"
-
-  - package-ecosystem: npm
-    directory: /
-    schedule:
-      interval: weekly
-    groups:
-      npm:
-        patterns:
-          - "*"
--- a/.github/workflows/docker-pr.yml
+++ b/.github/workflows/docker-pr.yml
@@ -12,57 +12,33 @@ permissions:

 jobs:
  build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
        with:
          fetch-tags: true
          fetch-depth: 0
-          persist-credentials: false

-      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
-      - name: Setup Homebrew cellar cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      - uses: actions/setup-go@v5
        with:
-          path: |
-            /home/linuxbrew/.linuxbrew/Cellar
-            /home/linuxbrew/.linuxbrew/bin
-            /home/linuxbrew/.linuxbrew/etc
-            /home/linuxbrew/.linuxbrew/include
-            /home/linuxbrew/.linuxbrew/lib
-            /home/linuxbrew/.linuxbrew/opt
-            /home/linuxbrew/.linuxbrew/sbin
-            /home/linuxbrew/.linuxbrew/share
-            /home/linuxbrew/.linuxbrew/var
-          key: ${{ runner.os }}-go-homebrew-cellar-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-homebrew-cellar-
+          go-version: '1.24.x'

-      - name: Install Brew dependencies
-        run: |
-          brew bundle
+      - uses: ko-build/setup-ko@v0.8

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@v5
        with:
          images: ghcr.io/techarohq/anubis

      - name: Build and push
        id: build
        run: |
-          npm ci
-          npm run container
+          go run ./cmd/containerbuild --docker-repo ghcr.io/techarohq/anubis --slog-level debug
        env:
          PULL_REQUEST_ID: ${{ github.event.number }}
-          DOCKER_REPO: ghcr.io/techarohq/anubis
-          SLOG_LEVEL: debug

      - run: |
          echo "Test this with:"
-          echo "docker pull ${DOCKER_IMAGE}"
-        env:
-          DOCKER_IMAGE: ${{ steps.build.outputs.docker_image }}
+          echo "docker pull ${{ steps.build.outputs.docker_image }}"
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -18,41 +18,22 @@ permissions:

 jobs:
  build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@v4
        with:
          fetch-tags: true
          fetch-depth: 0
-          persist-credentials: false

-      - name: Set up Homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
-      - name: Setup Homebrew cellar cache
-        uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      - uses: actions/setup-go@v5
        with:
-          path: |
-            /home/linuxbrew/.linuxbrew/Cellar
-            /home/linuxbrew/.linuxbrew/bin
-            /home/linuxbrew/.linuxbrew/etc
-            /home/linuxbrew/.linuxbrew/include
-            /home/linuxbrew/.linuxbrew/lib
-            /home/linuxbrew/.linuxbrew/opt
-            /home/linuxbrew/.linuxbrew/sbin
-            /home/linuxbrew/.linuxbrew/share
-            /home/linuxbrew/.linuxbrew/var
-          key: ${{ runner.os }}-go-homebrew-cellar-${{ hashFiles('go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-homebrew-cellar-
+          go-version: '1.24.x'

-      - name: Install Brew dependencies
-        run: |
-          brew bundle
+      - uses: ko-build/setup-ko@v0.8

      - name: Log into registry 
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: techarohq
@@ -60,22 +41,19 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@v5
        with:
          images: ghcr.io/techarohq/anubis

      - name: Build and push
        id: build
        run: |
-          npm ci
-          npm run container
-        env:
-          DOCKER_REPO: ghcr.io/techarohq/anubis
-          SLOG_LEVEL: debug
+          go run ./cmd/containerbuild --docker-repo ghcr.io/techarohq/anubis --slog-level debug
      
      - name: Generate artifact attestation
-        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
+        uses: actions/attest-build-provenance@v2
+        if: ${{github.event_name == 'pull_request'}}
        with:
          subject-name: ghcr.io/techarohq/anubis
          subject-digest: ${{ steps.build.outputs.digest }}
-          push-to-registry: true
+          push-to-registry: true
--- a/.github/workflows/docs-deploy.yml
+++ b/.github/workflows/docs-deploy.yml
@@ -13,18 +13,16 @@ permissions:

 jobs:
  build:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
+      - uses: actions/checkout@v4

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
+        uses: docker/setup-buildx-action@v3

      - name: Log into registry 
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@v3
        with:
          registry: ghcr.io
          username: techarohq
@@ -32,13 +30,13 @@ jobs:

      - name: Docker meta
        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
+        uses: docker/metadata-action@v5
        with:
          images: ghcr.io/techarohq/anubis/docs

      - name: Build and push
        id: build
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
+        uses: docker/build-push-action@v6
        with:
          context: ./docs
          cache-to: type=gha
@@ -49,14 +47,14 @@ jobs:
          push: true

      - name: Apply k8s manifests to aeacus
-        uses: actions-hub/kubectl@9270913c29699788b51bc04becd0ebdf048ffb49 # v1.32.3
+        uses: actions-hub/kubectl@master
        env:
          KUBE_CONFIG: ${{ secrets.AEACUS_KUBECONFIG }}
        with:
          args: apply -k docs/manifest

      - name: Apply k8s manifests to aeacus
-        uses: actions-hub/kubectl@9270913c29699788b51bc04becd0ebdf048ffb49 # v1.32.3
+        uses: actions-hub/kubectl@master
        env:
          KUBE_CONFIG: ${{ secrets.AEACUS_KUBECONFIG }}
        with:
--- a/.github/workflows/docs-test.yml
+++ b/.github/workflows/docs-test.yml
@@ -1,39 +0,0 @@
-name: Docs test build
-
-on:
-  pull_request:
-    branches: [ "main" ]
-
-permissions:
-  contents: read
-  actions: write
-
-jobs:
-  build:
-    runs-on: ubuntu-24.04
-
-    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@902fa8ec7d6ecbf8d84d538b9b233a880e428804 # v5.7.0
-        with:
-          images: ghcr.io/techarohq/anubis/docs
-
-      - name: Build and push
-        id: build
-        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
-        with:
-          context: ./docs
-          cache-to: type=gha
-          cache-from: type=gha
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64
-          push: false
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -11,13 +11,11 @@ permissions:
  actions: write

 jobs:
-  go_tests:
+  build:
    #runs-on: alrest-techarohq
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        persist-credentials: false
+    - uses: actions/checkout@v4

    - name: build essential
      run: |
@@ -28,7 +26,7 @@ jobs:
      uses: Homebrew/actions/setup-homebrew@master

    - name: Setup Homebrew cellar cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@v4
      with:
        path: |
          /home/linuxbrew/.linuxbrew/Cellar
@@ -49,7 +47,7 @@ jobs:
        brew bundle

    - name: Setup Golang caches
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@v4
      with:
        path: |
          ~/.cache/go-build
@@ -59,7 +57,7 @@ jobs:
          ${{ runner.os }}-golang-

    - name: Cache playwright binaries
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@v3
      id: playwright-cache
      with:
        path: |
@@ -68,20 +66,11 @@ jobs:

    - name: install playwright browsers
      run: |
-        npx --yes playwright@1.51.1 install --with-deps
-        npx --yes playwright@1.51.1 run-server --port 9001 &
-
-    - name: install node deps
-      run: |
-        npm ci
-        npm run assets
+        npx --yes playwright@1.50.1 install --with-deps
+        npx --yes playwright@1.50.1 run-server --port 3000 &

    - name: Build
-      run: npm run build
+      run: go build ./...

    - name: Test
-      run: npm run test
-
-    - uses: dominikh/staticcheck-action@fe1dd0c3658873b46f8c9bb3291096a617310ca6 # v1.3.1
-      with:
-        version: "latest"
+      run: go test -v ./...
--- a/.github/workflows/package-builds-stable.yml
+++ b/.github/workflows/package-builds-stable.yml
@@ -1,82 +0,0 @@
-name: Package builds (stable)
-
-on:
-  release:
-    types: [published]
-
-permissions:
-  contents: write
-  actions: write
-
-jobs:
-  package_builds:
-    #runs-on: alrest-techarohq
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        persist-credentials: false
-        fetch-tags: true
-        fetch-depth: 0
-
-    - name: build essential
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y build-essential
-
-    - name: Set up Homebrew
-      uses: Homebrew/actions/setup-homebrew@master
-
-    - name: Setup Homebrew cellar cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      with:
-        path: |
-          /home/linuxbrew/.linuxbrew/Cellar
-          /home/linuxbrew/.linuxbrew/bin
-          /home/linuxbrew/.linuxbrew/etc
-          /home/linuxbrew/.linuxbrew/include
-          /home/linuxbrew/.linuxbrew/lib
-          /home/linuxbrew/.linuxbrew/opt
-          /home/linuxbrew/.linuxbrew/sbin
-          /home/linuxbrew/.linuxbrew/share
-          /home/linuxbrew/.linuxbrew/var
-        key: ${{ runner.os }}-go-homebrew-cellar-${{ hashFiles('go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-homebrew-cellar-
-
-    - name: Install Brew dependencies
-      run: |
-        brew bundle
-
-    - name: Setup Golang caches
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-golang-
-
-    - name: install node deps
-      run: |
-        npm ci
-
-    - name: Build Packages
-      run: |
-        wget https://github.com/TecharoHQ/yeet/releases/download/v0.1.1/yeet_0.1.1_amd64.deb -O var/yeet.deb
-        sudo apt -y install -f ./var/yeet.deb
-        rm ./var/yeet.deb
-        yeet
-
-    - name: Upload released artifacts
-      env:
-        GITHUB_TOKEN: ${{ github.TOKEN }}
-        RELEASE_VERSION: ${{github.event.release.tag_name}}
-      shell: bash
-      run: |
-        RELEASE="${RELEASE_VERSION}"
-        cd var
-        for file in *; do
-          gh release upload $RELEASE $file
-        done
--- a/.github/workflows/package-builds-unstable.yml
+++ b/.github/workflows/package-builds-unstable.yml
@@ -1,77 +0,0 @@
-name: Package builds (unstable)
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-permissions:
-  contents: read
-  actions: write
-
-jobs:
-  package_builds:
-    #runs-on: alrest-techarohq
-    runs-on: ubuntu-24.04
-    steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      with:
-        persist-credentials: false
-        fetch-tags: true
-        fetch-depth: 0
-
-    - name: build essential
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y build-essential
-
-    - name: Set up Homebrew
-      uses: Homebrew/actions/setup-homebrew@master
-
-    - name: Setup Homebrew cellar cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      with:
-        path: |
-          /home/linuxbrew/.linuxbrew/Cellar
-          /home/linuxbrew/.linuxbrew/bin
-          /home/linuxbrew/.linuxbrew/etc
-          /home/linuxbrew/.linuxbrew/include
-          /home/linuxbrew/.linuxbrew/lib
-          /home/linuxbrew/.linuxbrew/opt
-          /home/linuxbrew/.linuxbrew/sbin
-          /home/linuxbrew/.linuxbrew/share
-          /home/linuxbrew/.linuxbrew/var
-        key: ${{ runner.os }}-go-homebrew-cellar-${{ hashFiles('go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-homebrew-cellar-
-
-    - name: Install Brew dependencies
-      run: |
-        brew bundle
-
-    - name: Setup Golang caches
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-      with:
-        path: |
-          ~/.cache/go-build
-          ~/go/pkg/mod
-        key: ${{ runner.os }}-golang-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-golang-
-
-    - name: install node deps
-      run: |
-        npm ci
-
-    - name: Build Packages
-      run: |
-        wget https://github.com/TecharoHQ/yeet/releases/download/v0.1.1/yeet_0.1.1_amd64.deb -O var/yeet.deb
-        sudo apt -y install -f ./var/yeet.deb
-        rm ./var/yeet.deb
-        yeet
-
-    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-      with:
-        name: packages
-        path: var/*
--- a/.github/workflows/zizmor.yml
+++ b/.github/workflows/zizmor.yml
@@ -1,35 +0,0 @@
-name: zizmor
-
-on:
-    push:
-      paths:
-        - '.github/workflows/*.ya?ml'
-    pull_request:
-      paths:
-        - '.github/workflows/*.ya?ml'
-
-jobs:
-  zizmor:
-    name: zizmor latest via PyPI
-    runs-on: ubuntu-24.04
-    permissions:
-      security-events: write
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-        with:
-          persist-credentials: false
-
-      - name: Install the latest version of uv
-        uses: astral-sh/setup-uv@d4b2f3b6ecc6e67c4457f6d3e41ec42d3d0fcb86 # v5.4.2
-
-      - name: Run zizmor 🌈
-        run: uvx zizmor --format sarif . > results.sarif 
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} 
-
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
-        with:
-          sarif_file: results.sarif
-          category: zizmor
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,6 @@
 .env
-*.deb
 *.rpm

-# Additional package locks
-pnpm-lock.yaml
-yarn.lock
-
 # Go binaries and test artifacts
 main
 *.test
-
-node_modules
-
-# MacOS
-.DS_store
-
-# Intellij
-.idea
-
-# how does this get here
-doc/VERSION
--- a/5
+++ b/5
@@ -1,7 +1,4 @@
 # programming languages
 brew "go@1.24"
 brew "node"
-brew "ko"
-brew "esbuild"
-brew "zstd"
-brew "brotli"
+brew "ko"
--- a/23
+++ b/23
@@ -0,0 +1,23 @@
+FROM docker.io/library/golang:1.24 AS build
+ARG BUILDKIT_SBOM_SCAN_CONTEXT=true BUILDKIT_SBOM_SCAN_STAGE=true
+
+WORKDIR /app
+COPY go.mod go.sum /app/
+RUN go mod download
+
+COPY . .
+RUN --mount=type=cache,target=/root/.cache \
+  VERSION=$(git describe --tags --always --dirty) \
+  && go build -o /app/bin/anubis -ldflags="-X github.com/TecharoHQ/anubis.Version=${VERSION}" ./cmd/anubis
+
+FROM docker.io/library/debian:bookworm AS runtime
+ARG BUILDKIT_SBOM_SCAN_STAGE=true
+RUN apt-get update \
+  && apt-get -y install ca-certificates
+
+COPY --from=build /app/bin/anubis /app/bin/anubis
+
+HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 CMD ["/app/bin/anubis", "--healthcheck"]
+CMD ["/app/bin/anubis"]
+
+LABEL org.opencontainers.image.source="https://github.com/TecharoHQ/anubis"
--- a/31
+++ b/31
@@ -1,31 +0,0 @@
-VERSION= $(shell cat ./VERSION)
-GO?= go
-NPM?= npm
-
-.PHONY: build assets deps lint prebaked-build test
-
-all: build
-
-deps:
-	$(NPM) ci
-	$(GO) mod download
-
-assets: PATH:=$(PWD)/node_modules/.bin:$(PATH)
-assets: deps
-	$(GO) generate ./...
-	./web/build.sh
-	./xess/build.sh
-
-build: assets
-	$(GO) build -o ./var/anubis ./cmd/anubis
-	@echo "Anubis is now built to ./var/anubis"
-
-lint: assets
-	$(GO) vet ./...
-	$(GO) tool staticcheck ./...
-
-prebaked-build:
-	$(GO) build -o ./var/anubis -ldflags "-X 'github.com/TecharoHQ/anubis.Version=$(VERSION)'" ./cmd/anubis
-
-test: assets
-	$(GO) test ./...
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,6 @@
+<!-- delete me and describe your change here -->
+
+Checklist:
+
+- [ ] Added a description of the changes to the `[Unreleased]` section of docs/docs/CHANGELOG.md
+- [ ] Tested this at least manually
--- a/README.md
+++ b/README.md
@@ -10,19 +10,11 @@
 ![language count](https://img.shields.io/github/languages/count/TecharoHQ/anubis)
 ![repo size](https://img.shields.io/github/repo-size/TecharoHQ/anubis)

-## Sponsors
+Anubis [weighs the soul of your connection](https://en.wikipedia.org/wiki/Weighing_of_souls) using a sha256 proof-of-work challenge in order to protect upstream resources from scraper bots.

-Anubis is brought to you by sponsors and donors like:
+Installing and using this will likely result in your website not being indexed by some search engines. This is considered a feature of Anubis, not a bug.

-[![Distrust](./docs/static/img/sponsors/distrust-logo.webp)](https://distrust.co)
-
-## Overview
-
-Anubis [weighs the soul of your connection](https://en.wikipedia.org/wiki/Weighing_of_souls) using a proof-of-work challenge in order to protect upstream resources from scraper bots.
-
-This program is designed to help protect the small internet from the endless storm of requests that flood in from AI companies. Anubis is as lightweight as possible to ensure that everyone can afford to protect the communities closest to them.
-
-Anubis is a bit of a nuclear response. This will result in your website being blocked from smaller scrapers and may inhibit "good bots" like the Internet Archive. You can configure [bot policy definitions](./admin/policies.mdx) to explicitly allowlist them and we are working on a curated set of "known good" bots to allow for a compromise between discoverability and uptime.
+This is a bit of a nuclear response, but AI scraper bots scraping so aggressively have forced my hand. I hate that I have to do this, but this is what we get for the modern Internet because bots don't conform to standards like robots.txt, even when they claim to.

 In most cases, you should not need this and can probably get by using Cloudflare to protect a given origin. However, for circumstances where you can't or won't use Cloudflare, Anubis is there for you.

@@ -30,28 +22,10 @@ If you want to try this out, connect to [anubis.techaro.lol](https://anubis.tech

 ## Support

-If you run into any issues running Anubis, please [open an issue](https://github.com/TecharoHQ/anubis/issues/new?template=Blank+issue). Please include all the information I would need to diagnose your issue.
+If you run into any issues running Anubis, please [open an issue](https://github.com/TecharoHQ/anubis/issues/new?template=Blank+issue) and tag it with the Anubis tag. Please include all the information I would need to diagnose your issue.

 For live chat, please join the [Patreon](https://patreon.com/cadey) and ask in the Patron discord in the channel `#anubis`.

 ## Star History

-<a href="https://www.star-history.com/#TecharoHQ/anubis&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date" />
- </picture>
-</a>
-
-## Packaging Status
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/anubis-anti-crawler.svg?columns=3)](https://repology.org/project/anubis-anti-crawler/versions)
-
-## Contributors
-
-<a href="https://github.com/TecharoHQ/anubis/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=TecharoHQ/anubis" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
+[![Star History Chart](https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date)](https://www.star-history.com/#TecharoHQ/anubis&Date)
--- a/2
+++ b/2
@@ -1 +1 @@
-1.16.0
+1.15.2
--- a/anubis.go
+++ b/anubis.go
@@ -1,4 +1,4 @@
-// Package anubis contains the version number of Anubis.
+// Package Anubis contains the version number of Anubis.
 package anubis

 // Version is the current version of Anubis.
@@ -11,15 +11,9 @@ var Version = "devel"
 // access.
 const CookieName = "within.website-x-cmd-anubis-auth"

-// BasePrefix is a global prefix for all Anubis endpoints. Can be emptied to remove the prefix entirely.
-var BasePrefix = ""
-
 // StaticPath is the location where all static Anubis assets are located.
 const StaticPath = "/.within.website/x/cmd/anubis/"

-// APIPrefix is the location where all Anubis API endpoints are located.
-const APIPrefix = "/.within.website/x/cmd/anubis/api/"
-
 // DefaultDifficulty is the default "difficulty" (number of leading zeroes)
 // that must be met by the client in order to pass the challenge.
 const DefaultDifficulty = 4
--- a/cmd/anubis/main.go
+++ b/cmd/anubis/main.go
@@ -1,16 +1,12 @@
 package main

 import (
-	"bytes"
 	"context"
 	"crypto/ed25519"
 	"crypto/rand"
-	"embed"
 	"encoding/hex"
-	"errors"
 	"flag"
 	"fmt"
-	"io/fs"
 	"log"
 	"log/slog"
 	"net"
@@ -19,7 +15,6 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
-	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
@@ -27,10 +22,8 @@ import (
 	"time"

 	"github.com/TecharoHQ/anubis"
-	"github.com/TecharoHQ/anubis/data"
 	"github.com/TecharoHQ/anubis/internal"
 	libanubis "github.com/TecharoHQ/anubis/lib"
-	botPolicy "github.com/TecharoHQ/anubis/lib/policy"
 	"github.com/TecharoHQ/anubis/lib/policy/config"
 	"github.com/TecharoHQ/anubis/web"
 	"github.com/facebookgo/flagenv"
@@ -38,29 +31,21 @@ import (
 )

 var (
-	basePrefix               = flag.String("base-prefix", "", "base prefix (root URL) the application is served under e.g. /myapp")
-	bind                     = flag.String("bind", ":8923", "network address to bind HTTP to")
-	bindNetwork              = flag.String("bind-network", "tcp", "network family to bind HTTP to, e.g. unix, tcp")
-	challengeDifficulty      = flag.Int("difficulty", anubis.DefaultDifficulty, "difficulty of the challenge")
-	cookieDomain             = flag.String("cookie-domain", "", "if set, the top-level domain that the Anubis cookie will be valid for")
-	cookiePartitioned        = flag.Bool("cookie-partitioned", false, "if true, sets the partitioned flag on Anubis cookies, enabling CHIPS support")
-	ed25519PrivateKeyHex     = flag.String("ed25519-private-key-hex", "", "private key used to sign JWTs, if not set a random one will be assigned")
-	ed25519PrivateKeyHexFile = flag.String("ed25519-private-key-hex-file", "", "file name containing value for ed25519-private-key-hex")
-	metricsBind              = flag.String("metrics-bind", ":9090", "network address to bind metrics to")
-	metricsBindNetwork       = flag.String("metrics-bind-network", "tcp", "network family for the metrics server to bind to")
-	socketMode               = flag.String("socket-mode", "0770", "socket mode (permissions) for unix domain sockets.")
-	robotsTxt                = flag.Bool("serve-robots-txt", false, "serve a robots.txt file that disallows all robots")
-	policyFname              = flag.String("policy-fname", "", "full path to anubis policy document (defaults to a sensible built-in policy)")
-	redirectDomains          = flag.String("redirect-domains", "", "list of domains separated by commas which anubis is allowed to redirect to. Leaving this unset allows any domain.")
-	slogLevel                = flag.String("slog-level", "INFO", "logging level (see https://pkg.go.dev/log/slog#hdr-Levels)")
-	target                   = flag.String("target", "http://localhost:3923", "target to reverse proxy to, set to an empty string to disable proxying when only using auth request")
-	healthcheck              = flag.Bool("healthcheck", false, "run a health check against Anubis")
-	useRemoteAddress         = flag.Bool("use-remote-address", false, "read the client's IP address from the network request, useful for debugging and running Anubis on bare metal")
-	debugBenchmarkJS         = flag.Bool("debug-benchmark-js", false, "respond to every request with a challenge for benchmarking hashrate")
-	ogPassthrough            = flag.Bool("og-passthrough", false, "enable Open Graph tag passthrough")
-	ogTimeToLive             = flag.Duration("og-expiry-time", 24*time.Hour, "Open Graph tag cache expiration time")
-	extractResources         = flag.String("extract-resources", "", "if set, extract the static resources to the specified folder")
-	webmasterEmail           = flag.String("webmaster-email", "", "if set, displays webmaster's email on the reject page for appeals")
+	bind                 = flag.String("bind", ":8923", "network address to bind HTTP to")
+	bindNetwork          = flag.String("bind-network", "tcp", "network family to bind HTTP to, e.g. unix, tcp")
+	challengeDifficulty  = flag.Int("difficulty", anubis.DefaultDifficulty, "difficulty of the challenge")
+	cookieDomain         = flag.String("cookie-domain", "", "if set, the top-level domain that the Anubis cookie will be valid for")
+	cookiePartitioned    = flag.Bool("cookie-partitioned", false, "if true, sets the partitioned flag on Anubis cookies, enabling CHIPS support")
+	ed25519PrivateKeyHex = flag.String("ed25519-private-key-hex", "", "private key used to sign JWTs, if not set a random one will be assigned")
+	metricsBind          = flag.String("metrics-bind", ":9090", "network address to bind metrics to")
+	metricsBindNetwork   = flag.String("metrics-bind-network", "tcp", "network family for the metrics server to bind to")
+	socketMode           = flag.String("socket-mode", "0770", "socket mode (permissions) for unix domain sockets.")
+	robotsTxt            = flag.Bool("serve-robots-txt", false, "serve a robots.txt file that disallows all robots")
+	policyFname          = flag.String("policy-fname", "", "full path to anubis policy document (defaults to a sensible built-in policy)")
+	slogLevel            = flag.String("slog-level", "INFO", "logging level (see https://pkg.go.dev/log/slog#hdr-Levels)")
+	target               = flag.String("target", "http://localhost:3923", "target to reverse proxy to")
+	healthcheck          = flag.Bool("healthcheck", false, "run a health check against Anubis")
+	debugXRealIPDefault  = flag.String("debug-x-real-ip-default", "", "If set, replace empty X-Real-Ip headers with this value, useful only for debugging Anubis and running it locally")
 )

 func keyFromHex(value string) (ed25519.PrivateKey, error) {
@@ -77,7 +62,7 @@ func keyFromHex(value string) (ed25519.PrivateKey, error) {
 }

 func doHealthCheck() error {
-	resp, err := http.Get("http://localhost" + *metricsBind + anubis.BasePrefix + "/metrics")
+	resp, err := http.Get("http://localhost" + *metricsBind + "/metrics")
 	if err != nil {
 		return fmt.Errorf("failed to fetch metrics: %w", err)
 	}
@@ -96,11 +81,7 @@ func setupListener(network string, address string) (net.Listener, string) {
 	case "unix":
 		formattedAddress = "unix:" + address
 	case "tcp":
-		if strings.HasPrefix(address, ":") { // assume it's just a port e.g. :4259
-			formattedAddress = "http://localhost" + address
-		} else {
-			formattedAddress = "http://" + address
-		}
+		formattedAddress = "http://localhost" + address
 	default:
 		formattedAddress = fmt.Sprintf(`(%s) %s`, network, address)
 	}
@@ -120,10 +101,7 @@ func setupListener(network string, address string) (net.Listener, string) {

 		err = os.Chmod(address, os.FileMode(mode))
 		if err != nil {
-			err := listener.Close()
-			if err != nil {
-				log.Printf("failed to close listener: %v", err)
-			}
+			listener.Close()
 			log.Fatal(fmt.Errorf("could not change socket mode: %w", err))
 		}
 	}
@@ -132,7 +110,7 @@ func setupListener(network string, address string) (net.Listener, string) {
 }

 func makeReverseProxy(target string) (http.Handler, error) {
-	targetUri, err := url.Parse(target)
+	u, err := url.Parse(target)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse target URL: %w", err)
 	}
@@ -140,10 +118,10 @@ func makeReverseProxy(target string) (http.Handler, error) {
 	transport := http.DefaultTransport.(*http.Transport).Clone()

 	// https://github.com/oauth2-proxy/oauth2-proxy/blob/4e2100a2879ef06aea1411790327019c1a09217c/pkg/upstream/http.go#L124
-	if targetUri.Scheme == "unix" {
+	if u.Scheme == "unix" {
 		// clean path up so we don't use the socket path in proxied requests
-		addr := targetUri.Path
-		targetUri.Path = ""
+		addr := u.Path
+		u.Path = ""
 		// tell transport how to dial unix sockets
 		transport.DialContext = func(ctx context.Context, _, _ string) (net.Conn, error) {
 			dialer := net.Dialer{}
@@ -153,51 +131,28 @@ func makeReverseProxy(target string) (http.Handler, error) {
 		transport.RegisterProtocol("unix", libanubis.UnixRoundTripper{Transport: transport})
 	}

-	rp := httputil.NewSingleHostReverseProxy(targetUri)
+	rp := httputil.NewSingleHostReverseProxy(u)
 	rp.Transport = transport

 	return rp, nil
 }

-func startDecayMapCleanup(ctx context.Context, s *libanubis.Server) {
-	ticker := time.NewTicker(1 * time.Hour)
-	defer ticker.Stop()
-
-	for {
-		select {
-		case <-ticker.C:
-			s.CleanupDecayMap()
-		case <-ctx.Done():
-			return
-		}
-	}
-}
-
 func main() {
 	flagenv.Parse()
 	flag.Parse()

 	internal.InitSlog(*slogLevel)

-	if *extractResources != "" {
-		if err := extractEmbedFS(data.BotPolicies, ".", *extractResources); err != nil {
+	if *healthcheck {
+		if err := doHealthCheck(); err != nil {
 			log.Fatal(err)
 		}
-		if err := extractEmbedFS(web.Static, "static", *extractResources); err != nil {
-			log.Fatal(err)
-		}
-		fmt.Printf("Extracted embedded static files to %s\n", *extractResources)
 		return
 	}

-	var rp http.Handler
-	// when using anubis via Systemd and environment variables, then it is not possible to set targe to an empty string but only to space
-	if strings.TrimSpace(*target) != "" {
-		var err error
-		rp, err = makeReverseProxy(*target)
-		if err != nil {
-			log.Fatalf("can't make reverse proxy: %v", err)
-		}
+	rp, err := makeReverseProxy(*target)
+	if err != nil {
+		log.Fatalf("can't make reverse proxy: %v", err)
 	}

 	policy, err := libanubis.LoadPoliciesOrDefault(*policyFname, *challengeDifficulty)
@@ -211,79 +166,37 @@ func main() {
 			continue
 		}

-		hash := rule.Hash()
+		hash, err := rule.Hash()
+		if err != nil {
+			log.Fatalf("can't calculate checksum of rule %s: %v", rule.Name, err)
+		}
+
 		fmt.Printf("* %s: %s\n", rule.Name, hash)
 	}
 	fmt.Println()

-	// replace the bot policy rules with a single rule that always benchmarks
-	if *debugBenchmarkJS {
-		policy.Bots = []botPolicy.Bot{{
-			Name:   "",
-			Rules:  botPolicy.NewHeaderExistsChecker("User-Agent"),
-			Action: config.RuleBenchmark,
-		}}
-	}
-	if *basePrefix != "" && !strings.HasPrefix(*basePrefix, "/") {
-		log.Fatalf("[misconfiguration] base-prefix must start with a slash, eg: /%s", *basePrefix)
-	} else if strings.HasSuffix(*basePrefix, "/") {
-		log.Fatalf("[misconfiguration] base-prefix must not end with a slash")
-	}
-
 	var priv ed25519.PrivateKey
-	if *ed25519PrivateKeyHex != "" && *ed25519PrivateKeyHexFile != "" {
-		log.Fatal("do not specify both ED25519_PRIVATE_KEY_HEX and ED25519_PRIVATE_KEY_HEX_FILE")
-	} else if *ed25519PrivateKeyHex != "" {
-		priv, err = keyFromHex(*ed25519PrivateKeyHex)
-		if err != nil {
-			log.Fatalf("failed to parse and validate ED25519_PRIVATE_KEY_HEX: %v", err)
-		}
-	} else if *ed25519PrivateKeyHexFile != "" {
-		hexFile, err := os.ReadFile(*ed25519PrivateKeyHexFile)
-		if err != nil {
-			log.Fatalf("failed to read ED25519_PRIVATE_KEY_HEX_FILE %s: %v", *ed25519PrivateKeyHexFile, err)
-		}
-
-		priv, err = keyFromHex(string(bytes.TrimSpace(hexFile)))
-		if err != nil {
-			log.Fatalf("failed to parse and validate content of ED25519_PRIVATE_KEY_HEX_FILE: %v", err)
-		}
-	} else {
+	if *ed25519PrivateKeyHex == "" {
 		_, priv, err = ed25519.GenerateKey(rand.Reader)
 		if err != nil {
 			log.Fatalf("failed to generate ed25519 key: %v", err)
 		}

 		slog.Warn("generating random key, Anubis will have strange behavior when multiple instances are behind the same load balancer target, for more information: see https://anubis.techaro.lol/docs/admin/installation#key-generation")
-	}
-
-	var redirectDomainsList []string
-	if *redirectDomains != "" {
-		domains := strings.Split(*redirectDomains, ",")
-		for _, domain := range domains {
-			_, err = url.Parse(domain)
-			if err != nil {
-				log.Fatalf("cannot parse redirect-domain %q: %s", domain, err.Error())
-			}
-			redirectDomainsList = append(redirectDomainsList, strings.TrimSpace(domain))
-		}
 	} else {
-		slog.Warn("REDIRECT_DOMAINS is not set, Anubis will only redirect to the same domain a request is coming from, see https://anubis.techaro.lol/docs/admin/configuration/redirect-domains")
+		priv, err = keyFromHex(*ed25519PrivateKeyHex)
+		if err != nil {
+			log.Fatalf("failed to parse and validate ED25519_PRIVATE_KEY_HEX: %v", err)
+		}
 	}

 	s, err := libanubis.New(libanubis.Options{
-		BasePrefix:        *basePrefix,
 		Next:              rp,
 		Policy:            policy,
 		ServeRobotsTXT:    *robotsTxt,
 		PrivateKey:        priv,
 		CookieDomain:      *cookieDomain,
 		CookiePartitioned: *cookiePartitioned,
-		OGPassthrough:     *ogPassthrough,
-		OGTimeToLive:      *ogTimeToLive,
-		RedirectDomains:   redirectDomainsList,
-		Target:            *target,
-		WebmasterEmail:    *webmasterEmail,
 	})
 	if err != nil {
 		log.Fatalf("can't construct libanubis.Server: %v", err)
@@ -298,28 +211,22 @@ func main() {
 		wg.Add(1)
 		go metricsServer(ctx, wg.Done)
 	}
-	go startDecayMapCleanup(ctx, s)

 	var h http.Handler
 	h = s
-	h = internal.RemoteXRealIP(*useRemoteAddress, *bindNetwork, h)
+	h = internal.DefaultXRealIP(*debugXRealIPDefault, h)
 	h = internal.XForwardedForToXRealIP(h)
-	h = internal.XForwardedForUpdate(h)

 	srv := http.Server{Handler: h}
-	listener, listenerUrl := setupListener(*bindNetwork, *bind)
+	listener, url := setupListener(*bindNetwork, *bind)
 	slog.Info(
 		"listening",
-		"url", listenerUrl,
+		"url", url,
 		"difficulty", *challengeDifficulty,
 		"serveRobotsTXT", *robotsTxt,
 		"target", *target,
 		"version", anubis.Version,
-		"use-remote-address", *useRemoteAddress,
-		"debug-benchmark-js", *debugBenchmarkJS,
-		"og-passthrough", *ogPassthrough,
-		"og-expiry-time", *ogTimeToLive,
-		"base-prefix", *basePrefix,
+		"debug-x-real-ip-default", *debugXRealIPDefault,
 	)

 	go func() {
@@ -331,7 +238,7 @@ func main() {
 		}
 	}()

-	if err := srv.Serve(listener); !errors.Is(err, http.ErrServerClosed) {
+	if err := srv.Serve(listener); err != http.ErrServerClosed {
 		log.Fatal(err)
 	}
 	wg.Wait()
@@ -341,19 +248,11 @@ func metricsServer(ctx context.Context, done func()) {
 	defer done()

 	mux := http.NewServeMux()
-	mux.Handle(anubis.BasePrefix+"/metrics", promhttp.Handler())
+	mux.Handle("/metrics", promhttp.Handler())

 	srv := http.Server{Handler: mux}
-	listener, metricsUrl := setupListener(*metricsBindNetwork, *metricsBind)
-	slog.Debug("listening for metrics", "url", metricsUrl)
-
-	if *healthcheck {
-		log.Println("running healthcheck")
-		if err := doHealthCheck(); err != nil {
-			log.Fatal(err)
-		}
-		return
-	}
+	listener, url := setupListener(*metricsBindNetwork, *metricsBind)
+	slog.Debug("listening for metrics", "url", url)

 	go func() {
 		<-ctx.Done()
@@ -364,33 +263,28 @@ func metricsServer(ctx context.Context, done func()) {
 		}
 	}()

-	if err := srv.Serve(listener); !errors.Is(err, http.ErrServerClosed) {
+	if err := srv.Serve(listener); err != http.ErrServerClosed {
 		log.Fatal(err)
 	}
 }

-func extractEmbedFS(fsys embed.FS, root string, destDir string) error {
-	return fs.WalkDir(fsys, root, func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
+func serveMainJSWithBestEncoding(w http.ResponseWriter, r *http.Request) {
+	priorityList := []string{"zstd", "br", "gzip"}
+	enc2ext := map[string]string{
+		"zstd": "zst",
+		"br":   "br",
+		"gzip": "gz",
+	}
+
+	for _, enc := range priorityList {
+		if strings.Contains(r.Header.Get("Accept-Encoding"), enc) {
+			w.Header().Set("Content-Type", "text/javascript")
+			w.Header().Set("Content-Encoding", enc)
+			http.ServeFileFS(w, r, web.Static, "static/js/main.mjs."+enc2ext[enc])
+			return
 		}
+	}

-		relPath, err := filepath.Rel(root, path)
-		if err != nil {
-			return err
-		}
-
-		destPath := filepath.Join(destDir, root, relPath)
-
-		if d.IsDir() {
-			return os.MkdirAll(destPath, 0o700)
-		}
-
-		data, err := fs.ReadFile(fsys, path)
-		if err != nil {
-			return err
-		}
-
-		return os.WriteFile(destPath, data, 0o644)
-	})
+	w.Header().Set("Content-Type", "text/javascript")
+	http.ServeFileFS(w, r, web.Static, "static/js/main.mjs")
 }
--- a/cmd/containerbuild/main.go
+++ b/cmd/containerbuild/main.go
@@ -19,6 +19,7 @@ var (
 	dockerLabels      = flag.String("docker-labels", os.Getenv("DOCKER_METADATA_OUTPUT_LABELS"), "Docker image labels")
 	dockerRepo        = flag.String("docker-repo", "registry.int.xeserv.us/techaro/anubis", "Docker image repository for Anubis")
 	dockerTags        = flag.String("docker-tags", os.Getenv("DOCKER_METADATA_OUTPUT_TAGS"), "newline separated docker tags including the registry name")
+	githubActor       = flag.String("github-actor", "", "GitHub actor")
 	githubEventName   = flag.String("github-event-name", "", "GitHub event name")
 	pullRequestID     = flag.Int("pull-request-id", -1, "GitHub pull request ID")
 	slogLevel         = flag.String("slog-level", "INFO", "logging level (see https://pkg.go.dev/log/slog#hdr-Levels)")
@@ -30,7 +31,7 @@ func main() {

 	internal.InitSlog(*slogLevel)

-	koDockerRepo := strings.TrimSuffix(*dockerRepo, "/"+filepath.Base(*dockerRepo))
+	koDockerRepo := strings.TrimRight(*dockerRepo, "/"+filepath.Base(*dockerRepo))

 	if *githubEventName == "pull_request" && *pullRequestID != -1 {
 		*dockerRepo = fmt.Sprintf("ttl.sh/techaro/pr-%d/anubis", *pullRequestID)
@@ -112,6 +113,11 @@ type image struct {
 	tag        string
 }

+func newlineSep2Comma(inp string) string {
+	lines := strings.Split(inp, "\n")
+	return strings.Join(lines, ",")
+}
+
 func parseImageList(imageList string) ([]image, error) {
 	images := strings.Split(imageList, "\n")
 	var result []image
@@ -123,15 +129,15 @@ func parseImageList(imageList string) ([]image, error) {
 		// reg.xeiaso.net/techaro/anubis:latest
 		// repository: reg.xeiaso.net/techaro/anubis
 		// tag:        latest
-		index := strings.LastIndex(img, ":")
+		parts := strings.SplitN(img, ":", 2)
 		result = append(result, image{
-			repository: img[:index],
-			tag:        img[index+1:],
+			repository: parts[0],
+			tag:        parts[1],
 		})
 	}

 	if len(result) == 0 {
-		return nil, fmt.Errorf("no images provided, bad flags")
+		return nil, fmt.Errorf("no images provided, bad flags??")
 	}

 	return result, nil
--- a/data/apps/gitea-rss-feeds.yaml
+++ b/data/apps/gitea-rss-feeds.yaml
@@ -1,7 +0,0 @@
-# By Aibrew: https://github.com/TecharoHQ/anubis/discussions/261#discussioncomment-12821065
- name: gitea-feed-atom
-  action: ALLOW
-  path_regex: ^/[.A-Za-z0-9_-]{1,256}?[./A-Za-z0-9_-]*\.atom$
- name: gitea-feed-rss
-  action: ALLOW
-  path_regex: ^/[.A-Za-z0-9_-]{1,256}?[./A-Za-z0-9_-]*\.rss$
--- a/data/botPolicies.json
+++ b/data/botPolicies.json
@@ -1,49 +1,398 @@
 {
  "bots": [
    {
-      "import": "(data)/bots/ai-robots-txt.yaml"
+      "name": "amazonbot",
+      "user_agent_regex": "Amazonbot",
+      "action": "DENY"
    },
    {
-      "import": "(data)/bots/cloudflare-workers.yaml"
+      "name": "googlebot",
+      "user_agent_regex": "\\+http\\://www\\.google\\.com/bot\\.html",
+      "action": "ALLOW",
+      "remote_addresses": [
+        "2001:4860:4801:10::/64",
+        "2001:4860:4801:11::/64",
+        "2001:4860:4801:12::/64",
+        "2001:4860:4801:13::/64",
+        "2001:4860:4801:14::/64",
+        "2001:4860:4801:15::/64",
+        "2001:4860:4801:16::/64",
+        "2001:4860:4801:17::/64",
+        "2001:4860:4801:18::/64",
+        "2001:4860:4801:19::/64",
+        "2001:4860:4801:1a::/64",
+        "2001:4860:4801:1b::/64",
+        "2001:4860:4801:1c::/64",
+        "2001:4860:4801:1d::/64",
+        "2001:4860:4801:1e::/64",
+        "2001:4860:4801:1f::/64",
+        "2001:4860:4801:20::/64",
+        "2001:4860:4801:21::/64",
+        "2001:4860:4801:22::/64",
+        "2001:4860:4801:23::/64",
+        "2001:4860:4801:24::/64",
+        "2001:4860:4801:25::/64",
+        "2001:4860:4801:26::/64",
+        "2001:4860:4801:27::/64",
+        "2001:4860:4801:28::/64",
+        "2001:4860:4801:29::/64",
+        "2001:4860:4801:2::/64",
+        "2001:4860:4801:2a::/64",
+        "2001:4860:4801:2b::/64",
+        "2001:4860:4801:2c::/64",
+        "2001:4860:4801:2d::/64",
+        "2001:4860:4801:2e::/64",
+        "2001:4860:4801:2f::/64",
+        "2001:4860:4801:31::/64",
+        "2001:4860:4801:32::/64",
+        "2001:4860:4801:33::/64",
+        "2001:4860:4801:34::/64",
+        "2001:4860:4801:35::/64",
+        "2001:4860:4801:36::/64",
+        "2001:4860:4801:37::/64",
+        "2001:4860:4801:38::/64",
+        "2001:4860:4801:39::/64",
+        "2001:4860:4801:3a::/64",
+        "2001:4860:4801:3b::/64",
+        "2001:4860:4801:3c::/64",
+        "2001:4860:4801:3d::/64",
+        "2001:4860:4801:3e::/64",
+        "2001:4860:4801:40::/64",
+        "2001:4860:4801:41::/64",
+        "2001:4860:4801:42::/64",
+        "2001:4860:4801:43::/64",
+        "2001:4860:4801:44::/64",
+        "2001:4860:4801:45::/64",
+        "2001:4860:4801:46::/64",
+        "2001:4860:4801:47::/64",
+        "2001:4860:4801:48::/64",
+        "2001:4860:4801:49::/64",
+        "2001:4860:4801:4a::/64",
+        "2001:4860:4801:4b::/64",
+        "2001:4860:4801:4c::/64",
+        "2001:4860:4801:50::/64",
+        "2001:4860:4801:51::/64",
+        "2001:4860:4801:52::/64",
+        "2001:4860:4801:53::/64",
+        "2001:4860:4801:54::/64",
+        "2001:4860:4801:55::/64",
+        "2001:4860:4801:56::/64",
+        "2001:4860:4801:60::/64",
+        "2001:4860:4801:61::/64",
+        "2001:4860:4801:62::/64",
+        "2001:4860:4801:63::/64",
+        "2001:4860:4801:64::/64",
+        "2001:4860:4801:65::/64",
+        "2001:4860:4801:66::/64",
+        "2001:4860:4801:67::/64",
+        "2001:4860:4801:68::/64",
+        "2001:4860:4801:69::/64",
+        "2001:4860:4801:6a::/64",
+        "2001:4860:4801:6b::/64",
+        "2001:4860:4801:6c::/64",
+        "2001:4860:4801:6d::/64",
+        "2001:4860:4801:6e::/64",
+        "2001:4860:4801:6f::/64",
+        "2001:4860:4801:70::/64",
+        "2001:4860:4801:71::/64",
+        "2001:4860:4801:72::/64",
+        "2001:4860:4801:73::/64",
+        "2001:4860:4801:74::/64",
+        "2001:4860:4801:75::/64",
+        "2001:4860:4801:76::/64",
+        "2001:4860:4801:77::/64",
+        "2001:4860:4801:78::/64",
+        "2001:4860:4801:79::/64",
+        "2001:4860:4801:80::/64",
+        "2001:4860:4801:81::/64",
+        "2001:4860:4801:82::/64",
+        "2001:4860:4801:83::/64",
+        "2001:4860:4801:84::/64",
+        "2001:4860:4801:85::/64",
+        "2001:4860:4801:86::/64",
+        "2001:4860:4801:87::/64",
+        "2001:4860:4801:88::/64",
+        "2001:4860:4801:90::/64",
+        "2001:4860:4801:91::/64",
+        "2001:4860:4801:92::/64",
+        "2001:4860:4801:93::/64",
+        "2001:4860:4801:94::/64",
+        "2001:4860:4801:95::/64",
+        "2001:4860:4801:96::/64",
+        "2001:4860:4801:a0::/64",
+        "2001:4860:4801:a1::/64",
+        "2001:4860:4801:a2::/64",
+        "2001:4860:4801:a3::/64",
+        "2001:4860:4801:a4::/64",
+        "2001:4860:4801:a5::/64",
+        "2001:4860:4801:c::/64",
+        "2001:4860:4801:f::/64",
+        "192.178.5.0/27",
+        "192.178.6.0/27",
+        "192.178.6.128/27",
+        "192.178.6.160/27",
+        "192.178.6.192/27",
+        "192.178.6.32/27",
+        "192.178.6.64/27",
+        "192.178.6.96/27",
+        "34.100.182.96/28",
+        "34.101.50.144/28",
+        "34.118.254.0/28",
+        "34.118.66.0/28",
+        "34.126.178.96/28",
+        "34.146.150.144/28",
+        "34.147.110.144/28",
+        "34.151.74.144/28",
+        "34.152.50.64/28",
+        "34.154.114.144/28",
+        "34.155.98.32/28",
+        "34.165.18.176/28",
+        "34.175.160.64/28",
+        "34.176.130.16/28",
+        "34.22.85.0/27",
+        "34.64.82.64/28",
+        "34.65.242.112/28",
+        "34.80.50.80/28",
+        "34.88.194.0/28",
+        "34.89.10.80/28",
+        "34.89.198.80/28",
+        "34.96.162.48/28",
+        "35.247.243.240/28",
+        "66.249.64.0/27",
+        "66.249.64.128/27",
+        "66.249.64.160/27",
+        "66.249.64.224/27",
+        "66.249.64.32/27",
+        "66.249.64.64/27",
+        "66.249.64.96/27",
+        "66.249.65.0/27",
+        "66.249.65.128/27",
+        "66.249.65.160/27",
+        "66.249.65.192/27",
+        "66.249.65.224/27",
+        "66.249.65.32/27",
+        "66.249.65.64/27",
+        "66.249.65.96/27",
+        "66.249.66.0/27",
+        "66.249.66.128/27",
+        "66.249.66.160/27",
+        "66.249.66.192/27",
+        "66.249.66.224/27",
+        "66.249.66.32/27",
+        "66.249.66.64/27",
+        "66.249.66.96/27",
+        "66.249.68.0/27",
+        "66.249.68.128/27",
+        "66.249.68.32/27",
+        "66.249.68.64/27",
+        "66.249.68.96/27",
+        "66.249.69.0/27",
+        "66.249.69.128/27",
+        "66.249.69.160/27",
+        "66.249.69.192/27",
+        "66.249.69.224/27",
+        "66.249.69.32/27",
+        "66.249.69.64/27",
+        "66.249.69.96/27",
+        "66.249.70.0/27",
+        "66.249.70.128/27",
+        "66.249.70.160/27",
+        "66.249.70.192/27",
+        "66.249.70.224/27",
+        "66.249.70.32/27",
+        "66.249.70.64/27",
+        "66.249.70.96/27",
+        "66.249.71.0/27",
+        "66.249.71.128/27",
+        "66.249.71.160/27",
+        "66.249.71.192/27",
+        "66.249.71.224/27",
+        "66.249.71.32/27",
+        "66.249.71.64/27",
+        "66.249.71.96/27",
+        "66.249.72.0/27",
+        "66.249.72.128/27",
+        "66.249.72.160/27",
+        "66.249.72.192/27",
+        "66.249.72.224/27",
+        "66.249.72.32/27",
+        "66.249.72.64/27",
+        "66.249.72.96/27",
+        "66.249.73.0/27",
+        "66.249.73.128/27",
+        "66.249.73.160/27",
+        "66.249.73.192/27",
+        "66.249.73.224/27",
+        "66.249.73.32/27",
+        "66.249.73.64/27",
+        "66.249.73.96/27",
+        "66.249.74.0/27",
+        "66.249.74.128/27",
+        "66.249.74.160/27",
+        "66.249.74.192/27",
+        "66.249.74.32/27",
+        "66.249.74.64/27",
+        "66.249.74.96/27",
+        "66.249.75.0/27",
+        "66.249.75.128/27",
+        "66.249.75.160/27",
+        "66.249.75.192/27",
+        "66.249.75.224/27",
+        "66.249.75.32/27",
+        "66.249.75.64/27",
+        "66.249.75.96/27",
+        "66.249.76.0/27",
+        "66.249.76.128/27",
+        "66.249.76.160/27",
+        "66.249.76.192/27",
+        "66.249.76.224/27",
+        "66.249.76.32/27",
+        "66.249.76.64/27",
+        "66.249.76.96/27",
+        "66.249.77.0/27",
+        "66.249.77.128/27",
+        "66.249.77.160/27",
+        "66.249.77.192/27",
+        "66.249.77.224/27",
+        "66.249.77.32/27",
+        "66.249.77.64/27",
+        "66.249.77.96/27",
+        "66.249.78.0/27",
+        "66.249.78.32/27",
+        "66.249.79.0/27",
+        "66.249.79.128/27",
+        "66.249.79.160/27",
+        "66.249.79.192/27",
+        "66.249.79.224/27",
+        "66.249.79.32/27",
+        "66.249.79.64/27",
+        "66.249.79.96/27"
+      ]
    },
    {
-      "import": "(data)/bots/headless-browsers.yaml"
+      "name": "bingbot",
+      "user_agent_regex": "\\+http\\://www\\.bing\\.com/bingbot\\.htm",
+      "action": "ALLOW",
+      "remote_addresses": [
+        "157.55.39.0/24",
+        "207.46.13.0/24",
+        "40.77.167.0/24",
+        "13.66.139.0/24",
+        "13.66.144.0/24",
+        "52.167.144.0/24",
+        "13.67.10.16/28",
+        "13.69.66.240/28",
+        "13.71.172.224/28",
+        "139.217.52.0/28",
+        "191.233.204.224/28",
+        "20.36.108.32/28",
+        "20.43.120.16/28",
+        "40.79.131.208/28",
+        "40.79.186.176/28",
+        "52.231.148.0/28",
+        "20.79.107.240/28",
+        "51.105.67.0/28",
+        "20.125.163.80/28",
+        "40.77.188.0/22",
+        "65.55.210.0/24",
+        "199.30.24.0/23",
+        "40.77.202.0/24",
+        "40.77.139.0/25",
+        "20.74.197.0/28",
+        "20.15.133.160/27",
+        "40.77.177.0/24",
+        "40.77.178.0/23"
+      ]
    },
    {
-      "import": "(data)/bots/us-ai-scraper.yaml"
+      "name": "qwantbot",
+      "user_agent_regex": "\\+https\\://help\\.qwant\\.com/bot/",
+      "action": "ALLOW",
+      "remote_addresses": [
+        "91.242.162.0/24"
+      ]
    },
    {
-      "import": "(data)/crawlers/googlebot.yaml"
+      "name": "kagibot",
+      "user_agent_regex": "\\+https\\://kagi\\.com/bot",
+      "action": "ALLOW",
+      "remote_addresses": [
+        "216.18.205.234/32",
+        "35.212.27.76/32",
+        "104.254.65.50/32",
+        "209.151.156.194/32"
+      ]
    },
    {
-      "import": "(data)/crawlers/bingbot.yaml"
+      "name": "marginalia",
+      "user_agent_regex": "search\\.marginalia\\.nu",
+      "action": "ALLOW",
+      "remote_addresses": [
+        "193.183.0.162/31",
+        "193.183.0.164/30",
+        "193.183.0.168/30",
+        "193.183.0.172/31",
+        "193.183.0.174/32"
+      ]
    },
    {
-      "import": "(data)/crawlers/duckduckbot.yaml"
+      "name": "mojeekbot",
+      "user_agent_regex": "http\\://www\\.mojeek\\.com/bot\\.html",
+      "action": "ALLOW",
+      "remote_addresses": [
+        "5.102.173.71/32"
+      ]
    },
    {
-      "import": "(data)/crawlers/qwantbot.yaml"
+      "name": "us-artificial-intelligence-scraper",
+      "user_agent_regex": "\\+https\\://github\\.com/US-Artificial-Intelligence/scraper",
+      "action": "DENY"
    },
    {
-      "import": "(data)/crawlers/internet-archive.yaml"
+      "name": "well-known",
+      "path_regex": "^/.well-known/.*$",
+      "action": "ALLOW"
    },
    {
-      "import": "(data)/crawlers/kagibot.yaml"
+      "name": "favicon",
+      "path_regex": "^/favicon.ico$",
+      "action": "ALLOW"
    },
    {
-      "import": "(data)/crawlers/marginalia.yaml"
+      "name": "robots-txt",
+      "path_regex": "^/robots.txt$",
+      "action": "ALLOW"
    },
    {
-      "import": "(data)/crawlers/mojeekbot.yaml"
+      "name": "lightpanda",
+      "user_agent_regex": "^Lightpanda/.*$",
+      "action": "DENY"
    },
    {
-      "import": "(data)/common/keep-internet-working.yaml"
+      "name": "headless-chrome",
+      "user_agent_regex": "HeadlessChrome",
+      "action": "DENY"
+    },
+    {
+      "name": "headless-chromium",
+      "user_agent_regex": "HeadlessChromium",
+      "action": "DENY"
+    },
+    {
+      "name": "generic-bot-catchall",
+      "user_agent_regex": "(?i:bot|crawler)",
+      "action": "CHALLENGE",
+      "challenge": {
+        "difficulty": 16,
+        "report_as": 4,
+        "algorithm": "slow"
+      }
    },
    {
      "name": "generic-browser",
-      "user_agent_regex": "Mozilla|Opera\n",
+      "user_agent_regex": "Mozilla",
      "action": "CHALLENGE"
    }
  ],
-  "dnsbl": false
-}
+  "dnsbl": true
+}
--- a/data/botPolicies.yaml
+++ b/data/botPolicies.yaml
@@ -1,50 +0,0 @@
-## Anubis has the ability to let you import snippets of configuration into the main
-## configuration file. This allows you to break up your config into smaller parts
-## that get logically assembled into one big file.
-##
-## Of note, a bot rule can either have inline bot configuration or import a
-## bot config snippet. You cannot do both in a single bot rule.
-##
-## Import paths can either be prefixed with (data) to import from the common/shared
-## rules in the data folder in the Anubis source tree or will point to absolute/relative
-## paths in your filesystem. If you don't have access to the Anubis source tree, check
-## /usr/share/docs/anubis/data or in the tarball you extracted Anubis from.
-
-bots:
-# Pathological bots to deny
- # This correlates to data/bots/ai-robots-txt.yaml in the source tree
-  import: (data)/bots/ai-robots-txt.yaml
- import: (data)/bots/cloudflare-workers.yaml 
- import: (data)/bots/headless-browsers.yaml
- import: (data)/bots/us-ai-scraper.yaml
-
-# Search engines to allow
- import: (data)/crawlers/googlebot.yaml
- import: (data)/crawlers/bingbot.yaml
- import: (data)/crawlers/duckduckbot.yaml
- import: (data)/crawlers/qwantbot.yaml
- import: (data)/crawlers/internet-archive.yaml
- import: (data)/crawlers/kagibot.yaml
- import: (data)/crawlers/marginalia.yaml
- import: (data)/crawlers/mojeekbot.yaml
-
-# Allow common "keeping the internet working" routes (well-known, favicon, robots.txt)
- import: (data)/common/keep-internet-working.yaml
-
-# # Punish any bot with "bot" in the user-agent string
-# # This is known to have a high false-positive rate, use at your own risk
-# - name: generic-bot-catchall
-#   user_agent_regex: (?i:bot|crawler)
-#   action: CHALLENGE
-#   challenge:
-#     difficulty: 16  # impossible
-#     report_as: 4    # lie to the operator
-#     algorithm: slow # intentionally waste CPU cycles and time
-
-# Generic catchall rule
- name: generic-browser
-  user_agent_regex: >
-    Mozilla|Opera
-  action: CHALLENGE
-
-dnsbl: false
--- a/data/bots/ai-robots-txt.yaml
+++ b/data/bots/ai-robots-txt.yaml
@@ -1,4 +0,0 @@
- name: "ai-robots-txt"
-  user_agent_regex: >
-    AI2Bot|Ai2Bot-Dolma|Amazonbot|anthropic-ai|Applebot|Applebot-Extended|Brightbot 1.0|Bytespider|CCBot|ChatGPT-User|Claude-Web|ClaudeBot|cohere-ai|cohere-training-data-crawler|Crawlspace|Diffbot|DuckAssistBot|FacebookBot|FriendlyCrawler|Google-Extended|GoogleOther|GoogleOther-Image|GoogleOther-Video|GPTBot|iaskspider/2.0|ICC-Crawler|ImagesiftBot|img2dataset|ISSCyberRiskCrawler|Kangaroo Bot|Meta-ExternalAgent|Meta-ExternalFetcher|OAI-SearchBot|omgili|omgilibot|PanguBot|Perplexity-User|PerplexityBot|PetalBot|Scrapy|SemrushBot-OCOB|SemrushBot-SWA|Sidetrade indexer bot|Timpibot|VelenPublicWebCrawler|Webzio-Extended|YouBot
-  action: DENY
--- a/data/bots/cloudflare-workers.yaml
+++ b/data/bots/cloudflare-workers.yaml
@@ -1,4 +0,0 @@
- name: cloudflare-workers
-  headers_regex:
-    CF-Worker: .*
-  action: DENY
--- a/data/bots/headless-browsers.yaml
+++ b/data/bots/headless-browsers.yaml
@@ -1,9 +0,0 @@
- name: lightpanda
-  user_agent_regex: ^LightPanda/.*$
-  action: DENY
- name: headless-chrome
-  user_agent_regex: HeadlessChrome
-  action: DENY
- name: headless-chromium
-  user_agent_regex: HeadlessChromium
-  action: DENY
--- a/data/bots/us-ai-scraper.yaml
+++ b/data/bots/us-ai-scraper.yaml
@@ -1,3 +0,0 @@
- name: us-artificial-intelligence-scraper
-  user_agent_regex: \+https\://github\.com/US-Artificial-Intelligence/scraper
-  action: DENY
--- a/data/common/allow-private-addresses.yaml
+++ b/data/common/allow-private-addresses.yaml
@@ -1,15 +0,0 @@
- name: ipv4-rfc-1918
-  action: ALLOW
-  remote_addresses:
-  - 10.0.0.0/8
-  - 172.16.0.0/12
-  - 192.168.0.0/16
-  - 100.64.0.0/10
- name: ipv6-ula
-  action: ALLOW
-  remote_addresses:
-  - fc00::/7
- name: ipv6-link-local
-  action: ALLOW
-  remote_addresses:
-  - fe80::/10
--- a/data/common/keep-internet-working.yaml
+++ b/data/common/keep-internet-working.yaml
@@ -1,10 +0,0 @@
-# Common "keeping the internet working" routes
- name: well-known
-  path_regex: ^/.well-known/.*$
-  action: ALLOW
- name: favicon
-  path_regex: ^/favicon.ico$
-  action: ALLOW
- name: robots-txt
-  path_regex: ^/robots.txt$
-  action: ALLOW
--- a/data/crawlers/bingbot.yaml
+++ b/data/crawlers/bingbot.yaml
@@ -1,34 +0,0 @@
- name: bingbot
-  user_agent_regex: \+http\://www\.bing\.com/bingbot\.htm
-  action: ALLOW
-  # https://www.bing.com/toolbox/bingbot.json
-  remote_addresses: [
-    "157.55.39.0/24",
-    "207.46.13.0/24",
-    "40.77.167.0/24",
-    "13.66.139.0/24",
-    "13.66.144.0/24",
-    "52.167.144.0/24",
-    "13.67.10.16/28",
-    "13.69.66.240/28",
-    "13.71.172.224/28",
-    "139.217.52.0/28",
-    "191.233.204.224/28",
-    "20.36.108.32/28",
-    "20.43.120.16/28",
-    "40.79.131.208/28",
-    "40.79.186.176/28",
-    "52.231.148.0/28",
-    "20.79.107.240/28",
-    "51.105.67.0/28",
-    "20.125.163.80/28",
-    "40.77.188.0/22",
-    "65.55.210.0/24",
-    "199.30.24.0/23",
-    "40.77.202.0/24",
-    "40.77.139.0/25",
-    "20.74.197.0/28",
-    "20.15.133.160/27",
-    "40.77.177.0/24",
-    "40.77.178.0/23"
-  ]
--- a/data/crawlers/duckduckbot.yaml
+++ b/data/crawlers/duckduckbot.yaml
@@ -1,275 +0,0 @@
- name: duckduckbot
-  user_agent_regex: DuckDuckBot/1\.1; \(\+http\://duckduckgo\.com/duckduckbot\.html\)
-  action: ALLOW
-  # https://duckduckgo.com/duckduckgo-help-pages/results/duckduckbot
-  remote_addresses: [
-    "57.152.72.128/32",
-    "51.8.253.152/32",
-    "40.80.242.63/32",
-    "20.12.141.99/32",
-    "20.49.136.28/32",
-    "51.116.131.221/32",
-    "51.107.40.209/32",
-    "20.40.133.240/32",
-    "20.50.168.91/32",
-    "51.120.48.122/32",
-    "20.193.45.113/32",
-    "40.76.173.151/32",
-    "40.76.163.7/32",
-    "20.185.79.47/32",
-    "52.142.26.175/32",
-    "20.185.79.15/32",
-    "52.142.24.149/32",
-    "40.76.162.208/32",
-    "40.76.163.23/32",
-    "40.76.162.191/32",
-    "40.76.162.247/32",
-    "40.88.21.235/32",
-    "20.191.45.212/32",
-    "52.146.59.12/32",
-    "52.146.59.156/32",
-    "52.146.59.154/32",
-    "52.146.58.236/32",
-    "20.62.224.44/32",
-    "51.104.180.53/32",
-    "51.104.180.47/32",
-    "51.104.180.26/32",
-    "51.104.146.225/32",
-    "51.104.146.235/32",
-    "20.73.202.147/32",
-    "20.73.132.240/32",
-    "20.71.12.143/32",
-    "20.56.197.58/32",
-    "20.56.197.63/32",
-    "20.43.150.93/32",
-    "20.43.150.85/32",
-    "20.44.222.1/32",
-    "40.89.243.175/32",
-    "13.89.106.77/32",
-    "52.143.242.6/32",
-    "52.143.241.111/32",
-    "52.154.60.82/32",
-    "20.197.209.11/32",
-    "20.197.209.27/32",
-    "20.226.133.105/32",
-    "191.234.216.4/32",
-    "191.234.216.178/32",
-    "20.53.92.211/32",
-    "20.53.91.2/32",
-    "20.207.99.197/32",
-    "20.207.97.190/32",
-    "40.81.250.205/32",
-    "40.64.106.11/32",
-    "40.64.105.247/32",
-    "20.72.242.93/32",
-    "20.99.255.235/32",
-    "20.113.3.121/32",
-    "52.224.16.221/32",
-    "52.224.21.53/32",
-    "52.224.20.204/32",
-    "52.224.21.19/32",
-    "52.224.20.249/32",
-    "52.224.20.203/32",
-    "52.224.20.190/32",
-    "52.224.16.229/32",
-    "52.224.21.20/32",
-    "52.146.63.80/32",
-    "52.224.20.227/32",
-    "52.224.20.193/32",
-    "52.190.37.160/32",
-    "52.224.21.23/32",
-    "52.224.20.223/32",
-    "52.224.20.181/32",
-    "52.224.21.49/32",
-    "52.224.21.55/32",
-    "52.224.21.61/32",
-    "52.224.19.152/32",
-    "52.224.20.186/32",
-    "52.224.21.27/32",
-    "52.224.21.51/32",
-    "52.224.20.174/32",
-    "52.224.21.4/32",
-    "51.104.164.109/32",
-    "51.104.167.71/32",
-    "51.104.160.177/32",
-    "51.104.162.149/32",
-    "51.104.167.95/32",
-    "51.104.167.54/32",
-    "51.104.166.111/32",
-    "51.104.167.88/32",
-    "51.104.161.32/32",
-    "51.104.163.250/32",
-    "51.104.164.189/32",
-    "51.104.167.19/32",
-    "51.104.160.167/32",
-    "51.104.167.110/32",
-    "20.191.44.119/32",
-    "51.104.167.104/32",
-    "20.191.44.234/32",
-    "51.104.164.215/32",
-    "51.104.167.52/32",
-    "20.191.44.22/32",
-    "51.104.167.87/32",
-    "51.104.167.96/32",
-    "20.191.44.16/32",
-    "51.104.167.61/32",
-    "51.104.164.147/32",
-    "20.50.48.159/32",
-    "40.114.182.172/32",
-    "20.50.50.130/32",
-    "20.50.50.163/32",
-    "20.50.50.46/32",
-    "40.114.182.153/32",
-    "20.50.50.118/32",
-    "20.50.49.55/32",
-    "20.50.49.25/32",
-    "40.114.183.251/32",
-    "20.50.50.123/32",
-    "20.50.49.237/32",
-    "20.50.48.192/32",
-    "20.50.50.134/32",
-    "51.138.90.233/32",
-    "40.114.183.196/32",
-    "20.50.50.146/32",
-    "40.114.183.88/32",
-    "20.50.50.145/32",
-    "20.50.50.121/32",
-    "20.50.49.40/32",
-    "51.138.90.206/32",
-    "40.114.182.45/32",
-    "51.138.90.161/32",
-    "20.50.49.0/32",
-    "40.119.232.215/32",
-    "104.43.55.167/32",
-    "40.119.232.251/32",
-    "40.119.232.50/32",
-    "40.119.232.146/32",
-    "40.119.232.218/32",
-    "104.43.54.127/32",
-    "104.43.55.117/32",
-    "104.43.55.116/32",
-    "104.43.55.166/32",
-    "52.154.169.50/32",
-    "52.154.171.70/32",
-    "52.154.170.229/32",
-    "52.154.170.113/32",
-    "52.154.171.44/32",
-    "52.154.172.2/32",
-    "52.143.244.81/32",
-    "52.154.171.87/32",
-    "52.154.171.250/32",
-    "52.154.170.28/32",
-    "52.154.170.122/32",
-    "52.143.243.117/32",
-    "52.143.247.235/32",
-    "52.154.171.235/32",
-    "52.154.171.196/32",
-    "52.154.171.0/32",
-    "52.154.170.243/32",
-    "52.154.170.26/32",
-    "52.154.169.200/32",
-    "52.154.170.96/32",
-    "52.154.170.88/32",
-    "52.154.171.150/32",
-    "52.154.171.205/32",
-    "52.154.170.117/32",
-    "52.154.170.209/32",
-    "191.235.202.48/32",
-    "191.233.3.202/32",
-    "191.235.201.214/32",
-    "191.233.3.197/32",
-    "191.235.202.38/32",
-    "20.53.78.144/32",
-    "20.193.24.10/32",
-    "20.53.78.236/32",
-    "20.53.78.138/32",
-    "20.53.78.123/32",
-    "20.53.78.106/32",
-    "20.193.27.215/32",
-    "20.193.25.197/32",
-    "20.193.12.126/32",
-    "20.193.24.251/32",
-    "20.204.242.101/32",
-    "20.207.72.113/32",
-    "20.204.242.19/32",
-    "20.219.45.67/32",
-    "20.207.72.11/32",
-    "20.219.45.190/32",
-    "20.204.243.55/32",
-    "20.204.241.148/32",
-    "20.207.72.110/32",
-    "20.204.240.172/32",
-    "20.207.72.21/32",
-    "20.204.246.81/32",
-    "20.207.107.181/32",
-    "20.204.246.254/32",
-    "20.219.43.246/32",
-    "52.149.25.43/32",
-    "52.149.61.51/32",
-    "52.149.58.139/32",
-    "52.149.60.38/32",
-    "52.148.165.38/32",
-    "52.143.95.162/32",
-    "52.149.56.151/32",
-    "52.149.30.45/32",
-    "52.149.58.173/32",
-    "52.143.95.204/32",
-    "52.149.28.83/32",
-    "52.149.58.69/32",
-    "52.148.161.87/32",
-    "52.149.58.27/32",
-    "52.149.28.18/32",
-    "20.79.226.26/32",
-    "20.79.239.66/32",
-    "20.79.238.198/32",
-    "20.113.14.159/32",
-    "20.75.144.152/32",
-    "20.43.172.120/32",
-    "20.53.134.160/32",
-    "20.201.15.208/32",
-    "20.93.28.24/32",
-    "20.61.34.40/32",
-    "52.242.224.168/32",
-    "20.80.129.80/32",
-    "20.195.108.47/32",
-    "4.195.133.120/32",
-    "4.228.76.163/32",
-    "4.182.131.108/32",
-    "4.209.224.56/32",
-    "108.141.83.74/32",
-    "4.213.46.14/32",
-    "172.169.17.165/32",
-    "51.8.71.117/32",
-    "20.3.1.178/32",
-    "52.149.56.151/32",
-    "52.149.30.45/32",
-    "52.149.58.173/32",
-    "52.143.95.204/32",
-    "52.149.28.83/32",
-    "52.149.58.69/32",
-    "52.148.161.87/32",
-    "52.149.58.27/32",
-    "52.149.28.18/32",
-    "20.79.226.26/32",
-    "20.79.239.66/32",
-    "20.79.238.198/32",
-    "20.113.14.159/32",
-    "20.75.144.152/32",
-    "20.43.172.120/32",
-    "20.53.134.160/32",
-    "20.201.15.208/32",
-    "20.93.28.24/32",
-    "20.61.34.40/32",
-    "52.242.224.168/32",
-    "20.80.129.80/32",
-    "20.195.108.47/32",
-    "4.195.133.120/32",
-    "4.228.76.163/32",
-    "4.182.131.108/32",
-    "4.209.224.56/32",
-    "108.141.83.74/32",
-    "4.213.46.14/32",
-    "172.169.17.165/32",
-    "51.8.71.117/32",
-    "20.3.1.178/32"
-  ]
--- a/data/crawlers/googlebot.yaml
+++ b/data/crawlers/googlebot.yaml
@@ -1,263 +0,0 @@
- name: googlebot
-  user_agent_regex: \+http\://www\.google\.com/bot\.html
-  action: ALLOW
-  # https://developers.google.com/static/search/apis/ipranges/googlebot.json
-  remote_addresses: [
-    "2001:4860:4801:10::/64",
-    "2001:4860:4801:11::/64",
-    "2001:4860:4801:12::/64",
-    "2001:4860:4801:13::/64",
-    "2001:4860:4801:14::/64",
-    "2001:4860:4801:15::/64",
-    "2001:4860:4801:16::/64",
-    "2001:4860:4801:17::/64",
-    "2001:4860:4801:18::/64",
-    "2001:4860:4801:19::/64",
-    "2001:4860:4801:1a::/64",
-    "2001:4860:4801:1b::/64",
-    "2001:4860:4801:1c::/64",
-    "2001:4860:4801:1d::/64",
-    "2001:4860:4801:1e::/64",
-    "2001:4860:4801:1f::/64",
-    "2001:4860:4801:20::/64",
-    "2001:4860:4801:21::/64",
-    "2001:4860:4801:22::/64",
-    "2001:4860:4801:23::/64",
-    "2001:4860:4801:24::/64",
-    "2001:4860:4801:25::/64",
-    "2001:4860:4801:26::/64",
-    "2001:4860:4801:27::/64",
-    "2001:4860:4801:28::/64",
-    "2001:4860:4801:29::/64",
-    "2001:4860:4801:2::/64",
-    "2001:4860:4801:2a::/64",
-    "2001:4860:4801:2b::/64",
-    "2001:4860:4801:2c::/64",
-    "2001:4860:4801:2d::/64",
-    "2001:4860:4801:2e::/64",
-    "2001:4860:4801:2f::/64",
-    "2001:4860:4801:31::/64",
-    "2001:4860:4801:32::/64",
-    "2001:4860:4801:33::/64",
-    "2001:4860:4801:34::/64",
-    "2001:4860:4801:35::/64",
-    "2001:4860:4801:36::/64",
-    "2001:4860:4801:37::/64",
-    "2001:4860:4801:38::/64",
-    "2001:4860:4801:39::/64",
-    "2001:4860:4801:3a::/64",
-    "2001:4860:4801:3b::/64",
-    "2001:4860:4801:3c::/64",
-    "2001:4860:4801:3d::/64",
-    "2001:4860:4801:3e::/64",
-    "2001:4860:4801:40::/64",
-    "2001:4860:4801:41::/64",
-    "2001:4860:4801:42::/64",
-    "2001:4860:4801:43::/64",
-    "2001:4860:4801:44::/64",
-    "2001:4860:4801:45::/64",
-    "2001:4860:4801:46::/64",
-    "2001:4860:4801:47::/64",
-    "2001:4860:4801:48::/64",
-    "2001:4860:4801:49::/64",
-    "2001:4860:4801:4a::/64",
-    "2001:4860:4801:4b::/64",
-    "2001:4860:4801:4c::/64",
-    "2001:4860:4801:50::/64",
-    "2001:4860:4801:51::/64",
-    "2001:4860:4801:52::/64",
-    "2001:4860:4801:53::/64",
-    "2001:4860:4801:54::/64",
-    "2001:4860:4801:55::/64",
-    "2001:4860:4801:56::/64",
-    "2001:4860:4801:60::/64",
-    "2001:4860:4801:61::/64",
-    "2001:4860:4801:62::/64",
-    "2001:4860:4801:63::/64",
-    "2001:4860:4801:64::/64",
-    "2001:4860:4801:65::/64",
-    "2001:4860:4801:66::/64",
-    "2001:4860:4801:67::/64",
-    "2001:4860:4801:68::/64",
-    "2001:4860:4801:69::/64",
-    "2001:4860:4801:6a::/64",
-    "2001:4860:4801:6b::/64",
-    "2001:4860:4801:6c::/64",
-    "2001:4860:4801:6d::/64",
-    "2001:4860:4801:6e::/64",
-    "2001:4860:4801:6f::/64",
-    "2001:4860:4801:70::/64",
-    "2001:4860:4801:71::/64",
-    "2001:4860:4801:72::/64",
-    "2001:4860:4801:73::/64",
-    "2001:4860:4801:74::/64",
-    "2001:4860:4801:75::/64",
-    "2001:4860:4801:76::/64",
-    "2001:4860:4801:77::/64",
-    "2001:4860:4801:78::/64",
-    "2001:4860:4801:79::/64",
-    "2001:4860:4801:80::/64",
-    "2001:4860:4801:81::/64",
-    "2001:4860:4801:82::/64",
-    "2001:4860:4801:83::/64",
-    "2001:4860:4801:84::/64",
-    "2001:4860:4801:85::/64",
-    "2001:4860:4801:86::/64",
-    "2001:4860:4801:87::/64",
-    "2001:4860:4801:88::/64",
-    "2001:4860:4801:90::/64",
-    "2001:4860:4801:91::/64",
-    "2001:4860:4801:92::/64",
-    "2001:4860:4801:93::/64",
-    "2001:4860:4801:94::/64",
-    "2001:4860:4801:95::/64",
-    "2001:4860:4801:96::/64",
-    "2001:4860:4801:a0::/64",
-    "2001:4860:4801:a1::/64",
-    "2001:4860:4801:a2::/64",
-    "2001:4860:4801:a3::/64",
-    "2001:4860:4801:a4::/64",
-    "2001:4860:4801:a5::/64",
-    "2001:4860:4801:c::/64",
-    "2001:4860:4801:f::/64",
-    "192.178.5.0/27",
-    "192.178.6.0/27",
-    "192.178.6.128/27",
-    "192.178.6.160/27",
-    "192.178.6.192/27",
-    "192.178.6.32/27",
-    "192.178.6.64/27",
-    "192.178.6.96/27",
-    "34.100.182.96/28",
-    "34.101.50.144/28",
-    "34.118.254.0/28",
-    "34.118.66.0/28",
-    "34.126.178.96/28",
-    "34.146.150.144/28",
-    "34.147.110.144/28",
-    "34.151.74.144/28",
-    "34.152.50.64/28",
-    "34.154.114.144/28",
-    "34.155.98.32/28",
-    "34.165.18.176/28",
-    "34.175.160.64/28",
-    "34.176.130.16/28",
-    "34.22.85.0/27",
-    "34.64.82.64/28",
-    "34.65.242.112/28",
-    "34.80.50.80/28",
-    "34.88.194.0/28",
-    "34.89.10.80/28",
-    "34.89.198.80/28",
-    "34.96.162.48/28",
-    "35.247.243.240/28",
-    "66.249.64.0/27",
-    "66.249.64.128/27",
-    "66.249.64.160/27",
-    "66.249.64.224/27",
-    "66.249.64.32/27",
-    "66.249.64.64/27",
-    "66.249.64.96/27",
-    "66.249.65.0/27",
-    "66.249.65.128/27",
-    "66.249.65.160/27",
-    "66.249.65.192/27",
-    "66.249.65.224/27",
-    "66.249.65.32/27",
-    "66.249.65.64/27",
-    "66.249.65.96/27",
-    "66.249.66.0/27",
-    "66.249.66.128/27",
-    "66.249.66.160/27",
-    "66.249.66.192/27",
-    "66.249.66.224/27",
-    "66.249.66.32/27",
-    "66.249.66.64/27",
-    "66.249.66.96/27",
-    "66.249.68.0/27",
-    "66.249.68.128/27",
-    "66.249.68.32/27",
-    "66.249.68.64/27",
-    "66.249.68.96/27",
-    "66.249.69.0/27",
-    "66.249.69.128/27",
-    "66.249.69.160/27",
-    "66.249.69.192/27",
-    "66.249.69.224/27",
-    "66.249.69.32/27",
-    "66.249.69.64/27",
-    "66.249.69.96/27",
-    "66.249.70.0/27",
-    "66.249.70.128/27",
-    "66.249.70.160/27",
-    "66.249.70.192/27",
-    "66.249.70.224/27",
-    "66.249.70.32/27",
-    "66.249.70.64/27",
-    "66.249.70.96/27",
-    "66.249.71.0/27",
-    "66.249.71.128/27",
-    "66.249.71.160/27",
-    "66.249.71.192/27",
-    "66.249.71.224/27",
-    "66.249.71.32/27",
-    "66.249.71.64/27",
-    "66.249.71.96/27",
-    "66.249.72.0/27",
-    "66.249.72.128/27",
-    "66.249.72.160/27",
-    "66.249.72.192/27",
-    "66.249.72.224/27",
-    "66.249.72.32/27",
-    "66.249.72.64/27",
-    "66.249.72.96/27",
-    "66.249.73.0/27",
-    "66.249.73.128/27",
-    "66.249.73.160/27",
-    "66.249.73.192/27",
-    "66.249.73.224/27",
-    "66.249.73.32/27",
-    "66.249.73.64/27",
-    "66.249.73.96/27",
-    "66.249.74.0/27",
-    "66.249.74.128/27",
-    "66.249.74.160/27",
-    "66.249.74.192/27",
-    "66.249.74.32/27",
-    "66.249.74.64/27",
-    "66.249.74.96/27",
-    "66.249.75.0/27",
-    "66.249.75.128/27",
-    "66.249.75.160/27",
-    "66.249.75.192/27",
-    "66.249.75.224/27",
-    "66.249.75.32/27",
-    "66.249.75.64/27",
-    "66.249.75.96/27",
-    "66.249.76.0/27",
-    "66.249.76.128/27",
-    "66.249.76.160/27",
-    "66.249.76.192/27",
-    "66.249.76.224/27",
-    "66.249.76.32/27",
-    "66.249.76.64/27",
-    "66.249.76.96/27",
-    "66.249.77.0/27",
-    "66.249.77.128/27",
-    "66.249.77.160/27",
-    "66.249.77.192/27",
-    "66.249.77.224/27",
-    "66.249.77.32/27",
-    "66.249.77.64/27",
-    "66.249.77.96/27",
-    "66.249.78.0/27",
-    "66.249.78.32/27",
-    "66.249.79.0/27",
-    "66.249.79.128/27",
-    "66.249.79.160/27",
-    "66.249.79.192/27",
-    "66.249.79.224/27",
-    "66.249.79.32/27",
-    "66.249.79.64/27",
-    "66.249.79.96/27"
-  ]
--- a/data/crawlers/internet-archive.yaml
+++ b/data/crawlers/internet-archive.yaml
@@ -1,8 +0,0 @@
- name: internet-archive
-  action: ALLOW
-  # https://ipinfo.io/AS7941
-  remote_addresses: [
-    "207.241.224.0/20",
-    "208.70.24.0/21",
-    "2620:0:9c0::/48"
-  ]
--- a/data/crawlers/kagibot.yaml
+++ b/data/crawlers/kagibot.yaml
@@ -1,10 +0,0 @@
- name: kagibot
-  user_agent_regex: \+https\://kagi\.com/bot
-  action: ALLOW
-  # https://kagi.com/bot
-  remote_addresses: [
-    "216.18.205.234/32",
-    "35.212.27.76/32",
-    "104.254.65.50/32",
-    "209.151.156.194/32"
-  ]
--- a/data/crawlers/marginalia.yaml
+++ b/data/crawlers/marginalia.yaml
@@ -1,11 +0,0 @@
- name: marginalia
-  user_agent_regex: search\.marginalia\.nu
-  action: ALLOW
-  # Received directly over email
-  remote_addresses: [
-    "193.183.0.162/31",
-    "193.183.0.164/30",
-    "193.183.0.168/30",
-    "193.183.0.172/31",
-    "193.183.0.174/32"
-  ]
--- a/data/crawlers/mojeekbot.yaml
+++ b/data/crawlers/mojeekbot.yaml
@@ -1,5 +0,0 @@
- name: mojeekbot
-  user_agent_regex: \+https\://www\.mojeek\.com/bot\.html
-  action: ALLOW
-  # https://www.mojeek.com/bot.html
-  remote_addresses: [ "5.102.173.71/32" ]
--- a/data/crawlers/qwantbot.yaml
+++ b/data/crawlers/qwantbot.yaml
@@ -1,5 +0,0 @@
- name: qwantbot
-  user_agent_regex: \+https\://help\.qwant\.com/bot/
-  action: ALLOW
-  # https://help.qwant.com/wp-content/uploads/sites/2/2025/01/qwantbot.json
-  remote_addresses: [ "91.242.162.0/24" ]
--- a/data/embed.go
+++ b/data/embed.go
@@ -3,6 +3,6 @@ package data
 import "embed"

 var (
-	//go:embed botPolicies.yaml botPolicies.json apps bots common crawlers
+	//go:embed botPolicies.json
 	BotPolicies embed.FS
 )
--- a/decaymap/decaymap.go
+++ b/decaymap/decaymap.go
@@ -85,23 +85,3 @@ func (m *Impl[K, V]) Set(key K, value V, ttl time.Duration) {
 		expiry: time.Now().Add(ttl),
 	}
 }
-
-// Cleanup removes all expired entries from the DecayMap.
-func (m *Impl[K, V]) Cleanup() {
-	m.lock.Lock()
-	defer m.lock.Unlock()
-
-	now := time.Now()
-	for key, entry := range m.data {
-		if now.After(entry.expiry) {
-			delete(m.data, key)
-		}
-	}
-}
-
-// Len returns the number of entries in the DecayMap.
-func (m *Impl[K, V]) Len() int {
-	m.lock.RLock()
-	defer m.lock.RUnlock()
-	return len(m.data)
-}
--- a/decaymap/decaymap_test.go
+++ b/decaymap/decaymap_test.go
@@ -29,32 +29,3 @@ func TestImpl(t *testing.T) {
 		t.Error("got value even though it was supposed to be expired")
 	}
 }
-
-func TestCleanup(t *testing.T) {
-	dm := New[string, string]()
-
-	dm.Set("test1", "hi1", 1*time.Second)
-	dm.Set("test2", "hi2", 2*time.Second)
-	dm.Set("test3", "hi3", 3*time.Second)
-
-	dm.expire("test1") // Force expire test1
-	dm.expire("test2") // Force expire test2
-
-	dm.Cleanup()
-
-	finalLen := dm.Len() // Get the length after cleanup
-
-	if finalLen != 1 { // "test3" should be the only one left
-		t.Errorf("Cleanup failed to remove expired entries. Expected length 1, got %d", finalLen)
-	}
-
-	if _, ok := dm.Get("test1"); ok { // Verify Get still behaves correctly after Cleanup
-		t.Error("test1 should not be found after cleanup")
-	}
-	if _, ok := dm.Get("test2"); ok {
-		t.Error("test2 should not be found after cleanup")
-	}
-	if val, ok := dm.Get("test3"); !ok || val != "hi3" {
-		t.Error("test3 should still be found after cleanup")
-	}
-}
--- a/docs/blog/2019-05-28-first-blog-post.md
+++ b/docs/blog/2019-05-28-first-blog-post.md
@@ -0,0 +1,12 @@
+---
+slug: first-blog-post
+title: First Blog Post
+authors: [slorber, yangshun]
+tags: [hola, docusaurus]
+---
+
+Lorem ipsum dolor sit amet...
+
+<!-- truncate -->
+
+...consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
--- a/docs/blog/2019-05-29-long-blog-post.md
+++ b/docs/blog/2019-05-29-long-blog-post.md
@@ -0,0 +1,44 @@
+---
+slug: long-blog-post
+title: Long Blog Post
+authors: yangshun
+tags: [hello, docusaurus]
+---
+
+This is the summary of a very long blog post,
+
+Use a `<!--` `truncate` `-->` comment to limit blog post size in the list view.
+
+<!-- truncate -->
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
+
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque elementum dignissim ultricies. Fusce rhoncus ipsum tempor eros aliquam consequat. Lorem ipsum dolor sit amet
--- a/docs/blog/2021-08-01-mdx-blog-post.mdx
+++ b/docs/blog/2021-08-01-mdx-blog-post.mdx
@@ -0,0 +1,24 @@
+---
+slug: mdx-blog-post
+title: MDX Blog Post
+authors: [slorber]
+tags: [docusaurus]
+---
+
+Blog posts support [Docusaurus Markdown features](https://docusaurus.io/docs/markdown-features), such as [MDX](https://mdxjs.com/).
+
+:::tip
+
+Use the power of React to create interactive blog posts.
+
+:::
+
+{/* truncate */}
+
+For example, use JSX to create an interactive button:
+
+```js
+<button onClick={() => alert('button clicked!')}>Click me!</button>
+```
+
+<button onClick={() => alert('button clicked!')}>Click me!</button>
--- a/docs/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg
+++ b/docs/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg
--- a/docs/blog/2021-08-26-welcome/index.md
+++ b/docs/blog/2021-08-26-welcome/index.md
@@ -0,0 +1,29 @@
+---
+slug: welcome
+title: Welcome
+authors: [slorber, yangshun]
+tags: [facebook, hello, docusaurus]
+---
+
+[Docusaurus blogging features](https://docusaurus.io/docs/blog) are powered by the [blog plugin](https://docusaurus.io/docs/api/plugins/@docusaurus/plugin-content-blog).
+
+Here are a few tips you might find useful.
+
+<!-- truncate -->
+
+Simply add Markdown files (or folders) to the `blog` directory.
+
+Regular blog authors can be added to `authors.yml`.
+
+The blog post date can be extracted from filenames, such as:
+
+- `2019-05-30-welcome.md`
+- `2019-05-30-welcome/index.md`
+
+A blog post folder can be convenient to co-locate blog post images:
+
+![Docusaurus Plushie](./docusaurus-plushie-banner.jpeg)
+
+The blog supports tags as well!
+
+**And if you don't want a blog**: just delete this directory, and use `blog: false` in your Docusaurus config.
--- a/docs/blog/authors.yml
+++ b/docs/blog/authors.yml
@@ -0,0 +1,23 @@
+yangshun:
+  name: Yangshun Tay
+  title: Front End Engineer @ Facebook
+  url: https://github.com/yangshun
+  image_url: https://github.com/yangshun.png
+  page: true
+  socials:
+    x: yangshunz
+    github: yangshun
+
+slorber:
+  name: Sébastien Lorber
+  title: Docusaurus maintainer
+  url: https://sebastienlorber.com
+  image_url: https://github.com/slorber.png
+  page:
+    # customize the url of the author page at /blog/authors/<permalink>
+    permalink: '/all-sebastien-lorber-articles'
+  socials:
+    x: sebastienlorber
+    linkedin: sebastienlorber
+    github: slorber
+    newsletter: https://thisweekinreact.com
--- a/docs/blog/tags.yml
+++ b/docs/blog/tags.yml
@@ -0,0 +1,19 @@
+facebook:
+  label: Facebook
+  permalink: /facebook
+  description: Facebook tag description
+
+hello:
+  label: Hello
+  permalink: /hello
+  description: Hello tag description
+
+docusaurus:
+  label: Docusaurus
+  permalink: /docusaurus
+  description: Docusaurus tag description
+
+hola:
+  label: Hola
+  permalink: /hola
+  description: Hola tag description
--- a/docs/docs/CHANGELOG.md
+++ b/docs/docs/CHANGELOG.md
@@ -11,77 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

- Add documentation for default allow behavior (implicit rule)
- Enable [importing configuration snippets](./admin/configuration/import.mdx) ([#321](https://github.com/TecharoHQ/anubis/pull/321))
- Refactor check logic to be more generic and work on a Checker type
- Add more AI user agents based on the [ai.robots.txt](https://github.com/ai-robots-txt/ai.robots.txt) project
- Embedded challenge data in initial HTML response to improve performance
- Added support to use Nginx' `auth_request` directive with Anubis
- Added support to allow to restrict the allowed redirect domains
- Whitelisted [DuckDuckBot](https://duckduckgo.com/duckduckgo-help-pages/results/duckduckbot/) in botPolicies
- Improvements to build scripts to make them less independent of the build host
- Improved the OpenGraph error logging
- Added `Opera` to the `generic-browser` bot policy rule
- Added FreeBSD rc.d script so can be run as a FreeBSD daemon
- Allow requests from the Internet Archive
- Added example nginx configuration to documentation
- Added example Apache configuration to the documentation [#277](https://github.com/TecharoHQ/anubis/issues/277)
- Move per-environment configuration details into their own pages
- Added support for running anubis behind a prefix (e.g. `/myapp`)
- Added headers support to bot policy rules
- Moved configuration file from JSON to YAML by default
- Added documentation on how to use Anubis with Traefik in Docker
- Improved error handling in some edge cases
- Disable `generic-bot-catchall` rule because of its high false positive rate in real-world scenarios
- Moved all CSS inline to the Xess package, changed colors to be CSS variables
- Set or append to `X-Forwarded-For` header unless the remote connects over a loopback address [#328](https://github.com/TecharoHQ/anubis/issues/328)
- Fixed mojeekbot user agent regex
- Added support for running anubis behind a base path (e.g. `/myapp`)
- Reduce Anubis' paranoia with user cookies ([#365](https://github.com/TecharoHQ/anubis/pull/365))
+## v1.15.2

-## v1.16.0
+Zenos yae Galvus: Echo 2

-Fordola rem Lupis
-
-> I want to make them pay! All of them! Everyone who ever mocked or looked down on me -- I want the power to make them pay!
-
-The following features are the "big ticket" items:
-
- Added support for native Debian, Red Hat, and tarball packaging strategies including installation and use directions
- A prebaked tarball has been added, allowing distros to build Anubis like they could in v1.15.x
- The placeholder Anubis mascot has been replaced with a design by [CELPHASE](https://bsky.app/profile/celphase.bsky.social)
- Verification page now shows hash rate and a progress bar for completion probability
- Added support for [OpenGraph tags](https://ogp.me/) when rendering the challenge page. This allows for social previews to be generated when sharing the challenge page on social media platforms ([#195](https://github.com/TecharoHQ/anubis/pull/195))
- Added support for passing the ed25519 signing key in a file with `-ed25519-private-key-hex-file` or `ED25519_PRIVATE_KEY_HEX_FILE`
-
-The other small fixes have been made:
-
- Added a periodic cleanup routine for the decaymap that removes expired entries, ensuring stale data is properly pruned
- Added a no-store Cache-Control header to the challenge page
- Hide the directory listings for Anubis' internal static content
- Changed `--debug-x-real-ip-default` to `--use-remote-address`, getting the IP address from the request's socket address instead
- DroneBL lookups have been disabled by default
- Static asset builds are now done on demand instead of the results being committed to source control
- The Dockerfile has been removed as it is no longer in use
- Developer documentation has been added to the docs site
- Show more errors when some predictable challenge page errors happen ([#150](https://github.com/TecharoHQ/anubis/issues/150))
- Added the `--debug-benchmark-js` flag for testing proof-of-work performance during development
- Use `TrimSuffix` instead of `TrimRight` on containerbuild
- Fix the startup logs to correctly show the address and port the server is listening on
- Add [LibreJS](https://www.gnu.org/software/librejs/) banner to Anubis JavaScript to allow LibreJS users to run the challenge
- Added a wait with button continue + 30 second auto continue after 30s if you click "Why am I seeing this?"
- Fixed a typo in the challenge page title
- Disabled running integration tests on Windows hosts due to it's reliance on posix features (see [#133](https://github.com/TecharoHQ/anubis/pull/133#issuecomment-2764732309))
- Fixed minor typos
- Added a Makefile to enable comfortable workflows for downstream packagers
- Added `zizmor` for GitHub Actions static analysis
- Fixed most `zizmor` findings
- Enabled Dependabot
- Added an air config for autoreload support in development ([#195](https://github.com/TecharoHQ/anubis/pull/195))
- Added an `--extract-resources` flag to extract static resources to a local folder
- Add noindex flag to all Anubis pages ([#227](https://github.com/TecharoHQ/anubis/issues/227))
- Added `WEBMASTER_EMAIL` variable, if it is present then display that email address on error pages ([#235](https://github.com/TecharoHQ/anubis/pull/235), [#115](https://github.com/TecharoHQ/anubis/issues/115))
- Hash pinned all GitHub Actions
+The mascot has been updated with art by [CELPHASE](https://bsky.app/profile/celphase.bsky.social).

 ## v1.15.1

@@ -164,7 +98,7 @@ Livia sas Junius
  [#21](https://github.com/TecharoHQ/anubis/pull/21)
 - Don't overflow the image when browser windows are small (eg. on phones)
  [#27](https://github.com/TecharoHQ/anubis/pull/27)
- Lower the default difficulty to 5 from 4
+- Lower the default difficulty to 4 from 5
 - Don't duplicate work across multiple threads [#36](https://github.com/TecharoHQ/anubis/pull/36)
 - Documentation has been moved to https://anubis.techaro.lol/ with sources in docs/
 - Removed several visible AI artifacts (e.g., 6 fingers) [#37](https://github.com/TecharoHQ/anubis/pull/37)
@@ -207,4 +141,4 @@ Livia sas Junius
  ([fd6903a](https://github.com/TecharoHQ/anubis/commit/fd6903aeed315b8fddee32890d7458a9271e4798)).
 - Footer links on the check page now point to Techaro's brand
  ([4ebccb1](https://github.com/TecharoHQ/anubis/commit/4ebccb197ec20d024328d7f92cad39bbbe4d6359))
- Anubis was imported from [Xe/x](https://github.com/Xe/x)
+- Anubis was imported from [Xe/x](https://github.com/Xe/x).
--- a/docs/docs/admin/configuration/_category_.json
+++ b/docs/docs/admin/configuration/_category_.json
@@ -1,8 +0,0 @@
-{
-  "label": "Configuration",
-  "position": 10,
-  "link": {
-    "type": "generated-index",
-    "description": "Detailed information about configuring parts of Anubis."
-  }
-}
--- a/docs/docs/admin/configuration/import.mdx
+++ b/docs/docs/admin/configuration/import.mdx
@@ -1,147 +0,0 @@
-# Importing configuration rules
-
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
-Anubis has the ability to let you import snippets of configuration into the main configuration file. This allows you to break up your config into smaller parts that get logically assembled into one big file.
-
-EG:
-
-<Tabs>
-<TabItem value="json" label="JSON">
-
-```json
-{
-  "bots": [
-    {
-      "import": "(data)/bots/ai-robots-txt.yaml"
-    },
-    {
-      "import": "(data)/bots/cloudflare-workers.yaml"
-    }
-  ]
-}
-```
-
-</TabItem>
-<TabItem value="yaml" label="YAML" default>
-
-```yaml
-bots:
-  # Pathological bots to deny
-  - # This correlates to data/bots/ai-robots-txt.yaml in the source tree
-    import: (data)/bots/ai-robots-txt.yaml
-  - import: (data)/bots/cloudflare-workers.yaml
-```
-
-</TabItem>
-</Tabs>
-
-Of note, a bot rule can either have inline bot configuration or import a bot config snippet. You cannot do both in a single bot rule.
-
-<Tabs>
-<TabItem value="json" label="JSON">
-
-```json
-{
-  "bots": [
-    {
-      "import": "(data)/bots/ai-robots-txt.yaml",
-      "name": "generic-browser",
-      "user_agent_regex": "Mozilla|Opera\n",
-      "action": "CHALLENGE"
-    }
-  ]
-}
-```
-
-</TabItem>
-<TabItem value="yaml" label="YAML" default>
-
-```yaml
-bots:
-  - import: (data)/bots/ai-robots-txt.yaml
-    name: generic-browser
-    user_agent_regex: >
-      Mozilla|Opera
-    action: CHALLENGE
-```
-
-</TabItem>
-</Tabs>
-
-This will return an error like this:
-
-```text
-config is not valid:
-config.BotOrImport: rule definition is invalid, you must set either bot rules or an import statement, not both
-```
-
-Paths can either be prefixed with `(data)` to import from the [the data folder in the Anubis source tree](https://github.com/TecharoHQ/anubis/tree/main/data) or anywhere on the filesystem. If you don't have access to the Anubis source tree, check /usr/share/docs/anubis/data or in the tarball you extracted Anubis from.
-
-## Writing snippets
-
-Snippets can be written in either JSON or YAML, with a preference for YAML. When writing a snippet, write the bot rules you want directly at the top level of the file in a list.
-
-Here is an example snippet that allows [IPv6 Unique Local Addresses](https://en.wikipedia.org/wiki/Unique_local_address) through Anubis:
-
-<Tabs>
-<TabItem value="json" label="JSON">
-
-```json
-[
-  {
-    "name": "ipv6-ula",
-    "action": "ALLOW",
-    "remote_addresses": ["fc00::/7"]
-  }
-]
-```
-
-</TabItem>
-<TabItem value="yaml" label="YAML" default>
-
-```yaml
- name: ipv6-ula
-  action: ALLOW
-  remote_addresses:
-    - fc00::/7
-```
-
-</TabItem>
-</Tabs>
-
-## Extracting Anubis' embedded filesystem
-
-You can always extract the list of rules embedded into the Anubis binary with this command:
-
-```text
-anubis --extract-resources=static
-```
-
-This will dump the contents of Anubis' embedded data to a new folder named `static`:
-
-```text
-static
-├── apps
-│   └── gitea-rss-feeds.yaml
-├── botPolicies.json
-├── botPolicies.yaml
-├── bots
-│   ├── ai-robots-txt.yaml
-│   ├── cloudflare-workers.yaml
-│   ├── headless-browsers.yaml
-│   └── us-ai-scraper.yaml
-├── common
-│   ├── allow-private-addresses.yaml
-│   └── keep-internet-working.yaml
-└── crawlers
-    ├── bingbot.yaml
-    ├── duckduckbot.yaml
-    ├── googlebot.yaml
-    ├── internet-archive.yaml
-    ├── kagibot.yaml
-    ├── marginalia.yaml
-    ├── mojeekbot.yaml
-    └── qwantbot.yaml
-```
--- a/docs/docs/admin/configuration/open-graph.mdx
+++ b/docs/docs/admin/configuration/open-graph.mdx
@@ -1,47 +0,0 @@
---
-id: open-graph
-title: Open Graph Configuration
---
-
-# Open Graph Configuration
-
-This page provides detailed information on how to configure [OpenGraph tag](https://ogp.me/) passthrough in Anubis. This enables social previews of resources protected by Anubis without having to exempt each scraper individually.
-
-## Configuration Options
-
-| Name             | Description                                               | Type     | Default | Example                 |
-|------------------|-----------------------------------------------------------|----------|---------|-------------------------|
-| `OG_PASSTHROUGH` | Enables or disables the Open Graph tag passthrough system | Boolean  | `false` | `OG_PASSTHROUGH=true`   |
-| `OG_EXPIRY_TIME` | Configurable cache expiration time for Open Graph tags    | Duration | `24h`   | `OG_EXPIRY_TIME=1h`     |
-
-## Usage
-
-To configure Open Graph tags, you can set the following environment variables, environment file or as flags in your Anubis configuration:
-
-```sh
-export OG_PASSTHROUGH=true
-export OG_EXPIRY_TIME=1h
-```
-
-## Implementation Details
-
-When `OG_PASSTHROUGH` is enabled, Anubis will:
-
-1. Check a local cache for the requested URL's Open Graph tags.
-2. If a cached entry exists and is still valid, return the cached tags.
-3. If the cached entry is stale or not found, fetch the URL, parse the Open Graph tags, update the cache, and return the new tags.
-
-The cache expiration time is controlled by `OG_EXPIRY_TIME`.
-
-## Example
-
-Here is an example of how to configure Open Graph tags in your Anubis setup:
-
-```sh
-export OG_PASSTHROUGH=true
-export OG_EXPIRY_TIME=1h
-```
-
-With these settings, Anubis will cache Open Graph tags for 1 hour and pass them through to the challenge page.
-
-For more information, refer to the [installation guide](../installation).
--- a/docs/docs/admin/configuration/redirect-domains.mdx
+++ b/docs/docs/admin/configuration/redirect-domains.mdx
@@ -1,94 +0,0 @@
---
-title: Redirect Domain Configuration
---
-
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
-Anubis has an HTTP redirect in the middle of its check validation logic. This redirect allows Anubis to set a cookie on validated requests so that users don't need to pass challenges on every page load.
-
-This flow looks something like this:
-
-```mermaid
-sequenceDiagram
-  participant User
-  participant Challenge
-  participant Validation
-  participant Backend
-
-  User->>+Challenge: GET /
-  Challenge->>+User: Solve this challenge
-  User->>+Validation: Here's the solution, send me to /
-  Validation->>+User: Here's a cookie, go to /
-  User->>+Backend: GET /
-```
-
-However, in some cases a sufficiently dedicated attacker could trick a user into clicking on a validation link with a solution pre-filled out. For example:
-
-```mermaid
-sequenceDiagram
-  participant Hacker
-  participant User
-  participant Validation
-  participant Evil Site
-
-  Hacker->>+User: Click on yoursite.com with this solution
-  User->>+Validation: Here's a solution, send me to evilsite.com
-  Validation->>+User: Here's a cookie, go to evilsite.com
-  User->>+Evil Site: GET evilsite.com
-```
-
-If this happens, Anubis will throw an error like this:
-
-```text
-Redirect domain not allowed
-```
-
-## Configuring allowed redirect domains
-
-By default, Anubis will limit redirects to be on the same HTTP Host that Anubis is running on (EG: requests to yoursite.com cannot redirect outside of yoursite.com). If you need to set more than one domain, fill the `REDIRECT_DOMAINS` environment variable with a comma-separated list of domain names that Anubis should allow redirects to.
-
-:::note
-
-These domains are _an exact string match_, they do not support wildcard matches.
-
-:::
-
-<Tabs>
-  <TabItem value="env-file" label="Environment file" default>
-
-```shell
-# anubis.env
-
-REDIRECT_DOMAINS="yoursite.com,secretplans.yoursite.com"
-# ...
-```
-
-  </TabItem>
-  <TabItem value="docker-compose" label="Docker Compose">
-
-```yaml
-services:
-  anubis-nginx:
-    image: ghcr.io/techarohq/anubis:latest
-    environment:
-      REDIRECT_DOMAINS: "yoursite.com,secretplans.yoursite.com"
-      # ...
-```
-
-  </TabItem>
-  <TabItem value="k8s" label="Kubernetes">
-
-Inside your Deployment, StatefulSet, or Pod:
-
-```yaml
- name: anubis
-  image: ghcr.io/techarohq/anubis:latest
-  env:
-    - name: REDIRECT_DOMAINS
-      value: "yoursite.com,secretplans.yoursite.com"
-    # ...
-```
-
-  </TabItem>
-</Tabs>
--- a/docs/docs/admin/configuration/subrequest-auth.mdx
+++ b/docs/docs/admin/configuration/subrequest-auth.mdx
@@ -1,139 +0,0 @@
---
-title: Subrequest Authentication
---
-
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
-Anubis can act in one of two modes:
-
-1. Reverse proxy (the default): Anubis sits in the middle of all traffic and then will reverse proxy it to its destination. This is the moral equivalent of a middleware in your favorite web framework.
-2. Subrequest authentication mode: Anubis listens for requests and if they don't pass muster then they are forwarded to Anubis for challenge processing. This is the equivalent of Anubis being a sidecar service.
-
-## Nginx
-
-Anubis can perform [subrequest authentication](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-subrequest-authentication/) with the `auth_request` module in Nginx. In order to set this up, keep the following things in mind:
-
-The `TARGET` environment variable in Anubis must be set to a space, eg:
-
-<Tabs>
-  <TabItem value="env-file" label="Environment file" default>
-
-```shell
-# anubis.env
-
-TARGET=" "
-# ...
-```
-
-  </TabItem>
-  <TabItem value="docker-compose" label="Docker Compose">
-
-```yaml
-services:
-  anubis-nginx:
-    image: ghcr.io/techarohq/anubis:latest
-    environment:
-      TARGET: " "
-      # ...
-```
-
-  </TabItem>
-  <TabItem value="k8s" label="Kubernetes">
-
-Inside your Deployment, StatefulSet, or Pod:
-
-```yaml
- name: anubis
-  image: ghcr.io/techarohq/anubis:latest
-  env:
-    - name: TARGET
-      value: " "
-    # ...
-```
-
-  </TabItem>
-</Tabs>
-
-In order to configure this, you need to add the following location blocks to each server pointing to the service you want to protect:
-
-```nginx
-location /.within.website/ {
-    # Assumption: Anubis is running in the same network namespace as
-    # nginx on localhost TCP port 8923
-    proxy_pass http://127.0.0.1:8923;
-    auth_request off;
-}
-
-location @redirectToAnubis {
-    return 307 /.within.website/?redir=$scheme://$host$request_uri;
-    auth_request off;
-}
-```
-
-This sets up `/.within.website` to point to Anubis. Any requests that Anubis rejects or throws a challenge to will be sent here. This also sets up a named location `@redirectToAnubis` that will redirect any requests to Anubis for advanced processing.
-
-Finally, add this to your root location block:
-
-```nginx
-location / {
-    # diff-add
-    auth_request /.within.website/x/cmd/anubis/api/check;
-    # diff-add
-    error_page 401 = @redirectToAnubis;
-}
-```
-
-This will check all requests that don't match other locations with Anubis to ensure the client is genuine.
-
-This will make every request get checked by Anubis before it hits your backend. If you have other locations that don't need Anubis to do validation, add the `auth_request off` directive to their blocks:
-
-```nginx
-location /secret {
-    # diff-add
-    auth_request off;
-
-    # ...
-}
-```
-
-Here is a complete example of an Nginx server listening over TLS and pointing to Anubis:
-
-<details>
-  <summary>Complete example</summary>
-
-```nginx
-# /etc/nginx/conf.d/nginx.local.cetacean.club.conf
-
-server {
-  listen 443 ssl;
-  listen [::]:443 ssl;
-  server_name         nginx.local.cetacean.club;
-  ssl_certificate     /etc/techaro/pki/nginx.local.cetacean.club/tls.crt;
-  ssl_certificate_key /etc/techaro/pki/nginx.local.cetacean.club/tls.key;
-  ssl_protocols       TLSv1.2 TLSv1.3;
-  ssl_ciphers         HIGH:!aNULL:!MD5;
-
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-
-  location /.within.website/ {
-    proxy_pass http://localhost:8923;
-    auth_request off;
-  }
-
-  location @redirectToAnubis {
-    return 307 /.within.website/?redir=$scheme://$host$request_uri;
-    auth_request off;
-  }
-
-  location / {
-    auth_request /.within.website/x/cmd/anubis/api/check;
-    error_page 401 = @redirectToAnubis;
-    root /usr/share/nginx/html;
-    index index.html index.htm;
-  }
-}
-```
-
-</details>
--- a/docs/docs/admin/default-allow-behavior.mdx
+++ b/docs/docs/admin/default-allow-behavior.mdx
@@ -1,92 +0,0 @@
---
-title: Default allow behavior
---
-
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
-# Default allow behavior
-
-Anubis is designed to be as unintrusive as possible to your existing infrastructure.
-
-By default, it allows all traffic unless a request matches a rule that explicitly denies or challenges it.
-
-Only requests matching a DENY or CHALLENGE rule are blocked or challenged. All other requests are allowed. This is called "the implicit rule".
-
-## Example: Minimal policy
-
-If your policy only blocks a specific bot, all other requests will be allowed:
-
-<Tabs>
-<TabItem value="json" label="JSON" default>
-
-```json
-{
-  "bots": [
-    {
-      "name": "block-amazonbot",
-      "user_agent_regex": "Amazonbot",
-      "action": "DENY"
-    }
-  ]
-}
-```
-
-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-```yaml
- name: block-amazonbot
-  user_agent_regex: Amazonbot
-  action: DENY
-```
-
-</TabItem>
-</Tabs>
-
-## How to deny by default
-
-If you want to deny all traffic except what you explicitly allow, add a catch-all deny rule at the end of your policy list. Make sure to add ALLOW rules for any traffic you want to permit before this rule.
-
-<Tabs>
-<TabItem value="json" label="JSON" default>
-
-```json
-{
-  "bots": [
-    {
-      "name": "allow-goodbot",
-      "user_agent_regex": "GoodBot",
-      "action": "ALLOW"
-    },
-    {
-      "name": "catch-all-deny",
-      "path_regex": ".*",
-      "action": "DENY"
-    }
-  ]
-}
-```
-
-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-```yaml
- name: allow-goodbot
-  user_agent_regex: GoodBot
-  action: ALLOW
- name: catch-all-deny
-  path_regex: .*
-  action: DENY
-```
-
-</TabItem>
-</Tabs>
-
-## Final remarks
-
- Rules are evaluated in order; the first match wins.
- The implicit allow rule is always last and cannot be removed.
- Use your logs to monitor what traffic is being allowed by default.
-
-See [Policy Definitions](./policies) for more details on writing rules.
--- a/docs/docs/admin/environments/_category_.json
+++ b/docs/docs/admin/environments/_category_.json
@@ -1,8 +0,0 @@
-{
-  "label": "Environments",
-  "position": 20,
-  "link": {
-    "type": "generated-index",
-    "description": "Detailed information about individual environments (such as HTTP servers, platforms, etc.) Anubis is known to work with."
-  }
-}
--- a/docs/docs/admin/environments/apache.mdx
+++ b/docs/docs/admin/environments/apache.mdx
@@ -1,151 +0,0 @@
-# Apache
-
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
-Anubis is intended to be a filter proxy. The way to integrate this is to break your configuration up into two parts: TLS termination and then HTTP routing. Consider this diagram:
-
-```mermaid
---
-title: Apache as tls terminator and HTTP router
---
-
-flowchart LR
-    T(User Traffic)
-    subgraph Apache 2
-        TCP(TCP 80/443)
-        US(TCP 3001)
-    end
-
-    An(Anubis)
-    B(Backend)
-
-    T --> |TLS termination| TCP
-    TCP --> |Traffic filtering| An
-    An --> |Happy traffic| US
-    US --> |whatever you're doing| B
-```
-
-Effectively you have one trip through Apache to do TLS termination, a detour through Anubis for traffic scrubbing, and then going to the backend directly. This final socket is what will do HTTP routing.
-
-:::note
-
-These examples assume that you are using a setup where your nginx configuration is made up of a bunch of files in `/etc/httpd/conf.d/*.conf`. This is not true for all deployments of Apache. If you are not in such an environment, append these snippets to your `/etc/httpd/conf/httpd.conf` file.
-
-:::
-
-## Dependencies
-
-Install the following dependencies for proxying HTTP:
-
-<Tabs>
-  <TabItem value="rpm" label="Red Hat / RPM" default>
-
-```text
-dnf -y install mod_proxy_html
-```
-
-  </TabItem>
-  <TabItem value="deb" label="Debian / Ubuntu / apt">
-
-```text
-apt-get install -y libapache2-mod-proxy-html libxml2-dev
-```
-
-  </TabItem>
-</Tabs>
-
-## Configuration
-
-Assuming you are protecting `anubistest.techaro.lol`, you need the following server configuration blocks:
-
-1. A block on port 80 that forwards HTTP to HTTPS
-2. A block on port 443 that terminates TLS and forwards to Anubis
-3. A block on port 3001 that actually serves your websites
-
-```text
-# Plain HTTP redirect to HTTPS
-<VirtualHost *:80>
-       ServerAdmin your@email.here
-       ServerName anubistest.techaro.lol
-       DocumentRoot /var/www/anubistest.techaro.lol
-       ErrorLog /var/log/httpd/anubistest.techaro.lol_error.log
-       CustomLog /var/log/httpd/anubistest.techaro.lol_access.log combined
-       RewriteEngine on
-       RewriteCond %{SERVER_NAME} =anubistest.techaro.lol
-       RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
-</VirtualHost>
-
-# HTTPS listener that forwards to Anubis
-<VirtualHost *:443>
-       ServerAdmin your@email.here
-       ServerName anubistest.techaro.lol
-       DocumentRoot /var/www/anubistest.techaro.lol
-       ErrorLog /var/log/httpd/anubistest.techaro.lol_error.log
-       CustomLog /var/log/httpd/anubistest.techaro.lol_access.log combined
-
-       SSLCertificateFile /etc/letsencrypt/live/anubistest.techaro.lol/fullchain.pem
-       SSLCertificateKeyFile /etc/letsencrypt/live/anubistest.techaro.lol/privkey.pem
-       Include /etc/letsencrypt/options-ssl-apache.conf
-
-       # These headers need to be set or else Anubis will
-       # throw an "admin misconfiguration" error.
-       RequestHeader set "X-Real-Ip" expr=%{REMOTE_ADDR}
-       RequestHeader set X-Forwarded-Proto "https"
-
-       ProxyPreserveHost On
-
-       ProxyRequests Off
-       ProxyVia Off
-
-       # Replace 9000 with the port Anubis listens on
-       ProxyPass / http://[::1]:9000/
-       ProxyPassReverse / http://[::1]:9000/
-</VirtualHost>
-</IfModule>
-
-# Actual website config
-<VirtualHost *:3001>
-       ServerAdmin your@email.here
-       ServerName anubistest.techaro.lol
-       DocumentRoot /var/www/anubistest.techaro.lol
-       ErrorLog /var/log/httpd/anubistest.techaro.lol_error.log
-       CustomLog /var/log/httpd/anubistest.techaro.lol_access.log combined
-</VirtualHost>
-```
-
-Make sure to add a separate configuration file for the listener on port 3001:
-
-```text
-# /etc/httpd/conf.d/listener-3001.conf
-
-Listen 3001
-```
-
-This can be repeated for multiple sites. Anubis does not care about the HTTP `Host` header and will happily cope with multiple websites via the same instance.
-
-Then reload your Apache config and load your website. You should see Anubis protecting your apps!
-
-```text
-sudo systemctl reload httpd.service
-```
-
-## Troubleshooting
-
-Here are some answers to questions that came in in testing:
-
-### I'm running on a Red Hat distribution and Apache is saying "service unavailable" for every page load
-
-If you see a "Service unavailable" error on every page load and run a Red Hat derived distribution, you are missing a `selinux` setting. The exact command will be in a journalctl log message like this:
-
-```text
-*****  Plugin catchall_boolean (89.3 confidence) suggests   ******************
-
-If you want to allow HTTPD scripts and modules to connect to the network using TCP.
-Then you must tell SELinux about this by enabling the 'httpd_can_network_connect' boolean.
-
-Do
-setsebool -P httpd_can_network_connect 1
-```
-
-This will fix the error immediately.
--- a/docs/docs/admin/environments/docker-compose.mdx
+++ b/docs/docs/admin/environments/docker-compose.mdx
@@ -1,26 +0,0 @@
-# Docker compose
-
-Docker compose is typically used in concert with other load balancers such as [Apache](./apache.mdx) or [Nginx](./nginx.mdx). Below is a minimal example showing you how to set up an instance of Anubis listening on host port 8080 that points to a static website containing data in `./www`:
-
-```yaml
-services:
-  anubis-nginx:
-    image: ghcr.io/techarohq/anubis:latest
-    environment:
-      BIND: ":8080"
-      DIFFICULTY: "4"
-      METRICS_BIND: ":9090"
-      SERVE_ROBOTS_TXT: "true"
-      TARGET: "http://nginx"
-      POLICY_FNAME: "/data/cfg/botPolicy.yaml"
-      OG_PASSTHROUGH: "true"
-      OG_EXPIRY_TIME: "24h"
-    ports:
-      - 8080:8080
-    volumes:
-      - "./botPolicy.yaml:/data/cfg/botPolicy.yaml:ro"
-  nginx:
-    image: nginx
-    volumes:
-      - "./www:/usr/share/nginx/html"
-```
--- a/docs/docs/admin/environments/kubernetes.mdx
+++ b/docs/docs/admin/environments/kubernetes.mdx
@@ -1,128 +0,0 @@
-# Kubernetes
-
-When setting up Anubis in Kubernetes, you want to make sure that you thread requests through Anubis kinda like this:
-
-```mermaid
---
-title: Anubis embedded into workload pods
---
-
-flowchart LR
-    T(User Traffic)
-
-    IngressController(IngressController)
-
-    subgraph Service
-        AnPort(Anubis Port)
-        BPort(Backend Port)
-    end
-
-    subgraph Pod
-        An(Anubis)
-        B(Backend)
-    end
-
-    T -->  IngressController
-    IngressController --> AnPort
-    AnPort --> An
-    An --> B
-```
-
-Anubis is lightweight enough that you should be able to have many instances of it running without many problems. If this is a concern for you, please check out [ingress-anubis](https://github.com/jaredallard/ingress-anubis?ref=anubis.techaro.lol).
-
-This example makes the following assumptions:
-
- Your target service is listening on TCP port `5000`.
- Anubis will be listening on port `8080`.
-
-Adjust these values as facts and circumstances demand.
-
-Create a secret with the signing key Anubis should use for its responses:
-
-```
-kubectl create secret generic anubis-key \
-  --namespace default \
-  --from-literal=ED25519_PRIVATE_KEY_HEX=$(openssl rand -hex 32)
-```
-
-Attach Anubis to your Deployment:
-
-```yaml
-containers:
-  # ...
-  - name: anubis
-    image: ghcr.io/techarohq/anubis:latest
-    imagePullPolicy: Always
-    env:
-      - name: "BIND"
-        value: ":8080"
-      - name: "DIFFICULTY"
-        value: "4"
-      - name: ED25519_PRIVATE_KEY_HEX
-        valueFrom:
-          secretKeyRef:
-            name: anubis-key
-            key: ED25519_PRIVATE_KEY_HEX
-      - name: "METRICS_BIND"
-        value: ":9090"
-      - name: "SERVE_ROBOTS_TXT"
-        value: "true"
-      - name: "TARGET"
-        value: "http://localhost:5000"
-      - name: "OG_PASSTHROUGH"
-        value: "true"
-      - name: "OG_EXPIRY_TIME"
-        value: "24h"
-    resources:
-      limits:
-        cpu: 750m
-        memory: 256Mi
-      requests:
-        cpu: 250m
-        memory: 256Mi
-    securityContext:
-      runAsUser: 1000
-      runAsGroup: 1000
-      runAsNonRoot: true
-      allowPrivilegeEscalation: false
-      capabilities:
-        drop:
-          - ALL
-      seccompProfile:
-        type: RuntimeDefault
-```
-
-Then add a Service entry for Anubis:
-
-```yaml
-# ...
-spec:
-  ports:
-    # diff-add
-    - protocol: TCP
-      # diff-add
-      port: 8080
-      # diff-add
-      targetPort: 8080
-      # diff-add
-      name: anubis
-```
-
-Then point your Ingress to the Anubis port:
-
-```yaml
-  rules:
-  - host: git.xeserv.us
-    http:
-      paths:
-      - pathType: Prefix
-        path: "/"
-        backend:
-          service:
-            name: git
-            port:
-              # diff-remove
-              name: http
-              # diff-add
-              name: anubis
-```
--- a/docs/docs/admin/environments/nginx.mdx
+++ b/docs/docs/admin/environments/nginx.mdx
@@ -1,166 +0,0 @@
-# Nginx
-
-Anubis is intended to be a filter proxy. The way to integrate this with nginx is to break your configuration up into two parts: TLS termination and then HTTP routing. Consider this diagram:
-
-```mermaid
---
-title: Nginx as tls terminator and HTTP router
---
-
-flowchart LR
-    T(User Traffic)
-    subgraph Nginx
-        TCP(TCP 80/443)
-        US(Unix Socket or
-another TCP port)
-    end
-
-    An(Anubis)
-    B(Backend)
-
-    T --> |TLS termination| TCP
-    TCP --> |Traffic filtering| An
-    An --> |Happy traffic| US
-    US --> |whatever you're doing| B
-```
-
-Instead of your traffic going right from TLS termination into the backend, it takes a detour through Anubis. Anubis filters out the "bad" traffic and then passes the "good" traffic to another socket that Nginx has open. This final socket is what you will use to do HTTP routing.
-
-Effectively, you have two roles for nginx: TLS termination (converting HTTPS to HTTP) and HTTP routing (distributing requests to the individual vhosts). This can stack with something like Apache in case you have a legacy deployment. Make sure you have the right [TLS certificates configured](https://code.kuederle.com/letsencrypt/) at the TLS termination level.
-
-:::note
-
-These examples assume that you are using a setup where your nginx configuration is made up of a bunch of files in `/etc/nginx/conf.d/*.conf`. This is not true for all deployments of nginx. If you are not in such an environment, append these snippets to your `/etc/nginx/nginx.conf` file.
-
-:::
-
-Assuming that we are protecting `anubistest.techaro.lol`, here's what the server configuration file would look like:
-
-```nginx
-# /etc/nginx/conf.d/server-anubistest-techaro-lol.conf
-
-# HTTP - Redirect all HTTP traffic to HTTPS
-server {
-  listen 80;
-  listen [::]:80;
-
-  server_name anubistest.techaro.lol;
-
-  location / {
-    return 301 https://$host$request_uri;
-  }
-}
-
-# TLS termination server, this will listen over TLS (https) and then
-# proxy all traffic to the target via Anubis.
-server {
-  # Listen on TCP port 443 with TLS (https) and HTTP/2
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-
-  location / {
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-    proxy_pass http://anubis;
-  }
-
-  server_name anubistest.techaro.lol;
-
-  ssl_certificate     /path/to/your/certs/anubistest.techaro.lol.crt;
-  ssl_certificate_key /path/to/your/certs/anubistest.techaro.lol.key;
-}
-
-# Backend server, this is where your webapp should actually live.
-server {
-  listen unix:/run/nginx/nginx.sock;
-
-  server_name anubistest.techaro.lol;
-  root "/srv/http/anubistest.techaro.lol";
-  index index.html;
-
-  # Your normal configuration can go here
-  # location .php { fastcgi...} etc.
-}
-```
-
-:::tip
-
-You can copy the `location /` block into a separate file named something like `conf-anubis.inc` and then include it inline to other `server` blocks:
-
-```nginx
-# /etc/nginx/conf.d/conf-anubis.inc
-
-# Forward to anubis
-location / {
-  proxy_set_header Host $host;
-  proxy_set_header X-Real-IP $remote_addr;
-  proxy_pass http://anubis;
-}
-```
-
-Then in a server block:
-
-<details>
-<summary>Full nginx config</summary>
-
-```nginx
-# /etc/nginx/conf.d/server-mimi-techaro-lol.conf
-
-server {
-  # Listen on 443 with SSL
-  listen 443 ssl http2;
-  listen [::]:443 ssl http2;
-
-  # Slipstream via Anubis
-  include "conf-anubis.inc";
-
-  server_name mimi.techaro.lol;
-
-  ssl_certificate     /path/to/your/certs/mimi.techaro.lol.crt;
-  ssl_certificate_key /path/to/your/certs/mimi.techaro.lol.key;
-}
-
-server {
-  listen unix:/run/nginx/nginx.sock;
-
-  server_name mimi.techaro.lol;
-  root "/srv/http/mimi.techaro.lol";
-  index index.html;
-
-  # Your normal configuration can go here
-  # location .php { fastcgi...} etc.
-}
-```
-
-</details>
-
-:::
-
-Create an upstream for Anubis.
-
-```nginx
-# /etc/nginx/conf.d/upstream-anubis.conf
-
-upstream anubis {
-  # Make sure this matches the values you set for `BIND` and `BIND_NETWORK`.
-  # If this does not match, your services will not be protected by Anubis.
-
-  # Try anubis first over a UNIX socket
-  server unix:/run/anubis/nginx.sock;
-  #server http://127.0.0.1:8923;
-
-  # Optional: fall back to serving the websites directly. This allows your
-  # websites to be resilient against Anubis failing, at the risk of exposing
-  # them to the raw internet without protection. This is a tradeoff and can
-  # be worth it in some edge cases.
-  #server unix:/run/nginx.sock backup;
-}
-```
-
-This can be repeated for multiple sites. Anubis does not care about the HTTP `Host` header and will happily cope with multiple websites via the same instance.
-
-Then reload your nginx config and load your website. You should see Anubis protecting your apps!
-
-```text
-sudo systemctl reload nginx.service
-```
--- a/docs/docs/admin/environments/traefik.mdx
+++ b/docs/docs/admin/environments/traefik.mdx
@@ -1,215 +0,0 @@
---
-id: traefik
-title: Integrate Anubis with Traefik in a Docker Compose Environment
---
-
-
-:::note
-
- This only talks about integration through Compose,
- but it also applies to docker cli options.
-
-:::
-
-Currently, Anubis doesn't have any Traefik middleware,
-so you need to manually route it between Traefik and your target service.
-This routing is done per labels in Traefik.
-
-In this example, we will use 4 Containers:
-
- `traefik` - the Traefik instance
- `anubis` - the Anubis instance
- `target` - our service to protect (`traefik/whoami` in this case)
- `target2` - a second service that isn't supposed to be protected (`traefik/whoami` in this case)
-
-There are 3 steps we need to follow:
-
-1. Create a new exclusive Traefik endpoint for Anubis
-2. Pass all unspecified requests to Anubis
-3. Let Anubis pass all verified requests back to Traefik on its exclusive endpoint
-
-## Diagram of Flow
-
-This is a small diagram depicting the flow.
-Keep in mind that `8080` or `80` can be anything depending on your containers.
-
-```mermaid
-flowchart LR
-user[User]
-traefik[Traefik]
-anubis[Anubis]
-target[Target]
-
-user-->|:443 - Requesting Service|traefik
-traefik-->|:8080 - Passing to Anubis|anubis
-anubis-->|:3923 - Passing back to Traefik|traefik
-traefik-->|:80 - Passing to the target|target
-```
-
-## Create an Exclusive Anubis Endpoint in Traefik
-
-There are 2 ways of registering a new endpoint in Traefik.
-Which one to use depends on how you configured your Traefik so far.
-
-**CLI Options:**
-
-```yml
--entrypoints.anubis.address=:3923
-```
-
-**traefik.yml:**
-
-```yml
-entryPoints:
-  anubis:
-    address: ":3923"
-```
-
-It is important that the specified port isn't actually reachable from the outside,
-but only exposed in the Docker network.
-Exposing the Anubis port on Traefik directly will allow direct unprotected access to all containers behind it.
-
-## Passing all unspecified Web Requests to Anubis
-
-There are cases where you want Traefik to still route some requests without protection, just like before.
-To achieve this, we can register Anubis as the default handler for non-protected requests.
-
-We also don't want users to get SSL Errors during the checking phase,
-thus we also need to let Traefik provide SSL Certs for our endpoint.
-This example expects an TLS cert resolver called `le`.
-
-We also expect there to be an endpoint called `websecure` for HTTPS in this example.
-
-This is an example of the required labels to configure Traefik on the Anubis container:
-
-```yml
-labels:
-  - traefik.enable=true # Enabling Traefik
-  - traefik.docker.network=traefik # Telling Traefik which network to use
-  - traefik.http.routers.anubis.priority=1 # Setting Anubis to the lowest priority, so it only takes the slack
-  - traefik.http.routers.anubis.rule=PathRegexp(`.*`) # Wildcard match every path
-  - traefik.http.routers.anubis.entrypoints=websecure # Listen on HTTPS
-  - traefik.http.services.anubis.loadbalancer.server.port=8080 # Telling Traefik to which port it should route requests
-  - traefik.http.routers.anubis.service=anubis # Telling Traefik to use the above specified port
-  - traefik.http.routers.anubis.tls.certresolver=le # Telling Traefik to resolve a Cert for Anubis
-```
-
-## Passing all Verified Requests Back Correctly to Traefik
-
-To pass verified requests back to Traefik,
-we only need to configure Anubis using its environment variables:
-
-```yml
-environment:
-  - BIND=:8080
-  - TARGET=http://traefik:3923
-```
-
-## Full Example Config
-
-Now that we know how to pass all requests back and forth, here is the example.
-This example contains 2 services: one that is protected and the other one that is not.
-
-**compose.yml**
-
-```yml
-services:
-  traefik:
-    image: traefik:v3.3
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./letsencrypt:/letsencrypt
-      - ./traefik.yml:/traefik.yml:ro
-    networks:
-      - traefik
-    labels:
-      # Enable Traefik
-      - traefik.enable=true
-      - traefik.docker.network=traefik
-      # Redirect any HTTP to HTTPS
-      - traefik.http.middlewares.redirect-to-https.redirectscheme.scheme=https
-      - traefik.http.routers.web.rule=PathPrefix(`/`)
-      - traefik.http.routers.web.entrypoints=web
-      - traefik.http.routers.web.middlewares=redirect-to-https
-      - traefik.http.routers.web.tls=false
-
-  anubis:
-    image: ghcr.io/techarohq/anubis:main
-    environment:
-      # Telling Anubis, where to listen for Traefik
-      - BIND=:8080
-      # Telling Anubis to point to Traefik via the Docker network
-      - TARGET=http://traefik:3923
-    networks:
-      - traefik
-    labels:
-      - traefik.enable=true # Enabling Traefik
-      - traefik.docker.network=traefik # Telling Traefik which network to use
-      - traefik.http.routers.anubis.priority=1 # Setting Anubis to the lowest priority, so it only takes the slack
-      - traefik.http.routers.anubis.rule=PathRegexp(`.*`) # wildcard match anything
-      - traefik.http.routers.anubis.entrypoints=websecure # Listen on HTTPS
-      - traefik.http.services.anubis.loadbalancer.server.port=8080 # Telling Traefik to which port it should route requests
-      - traefik.http.routers.anubis.service=anubis # Telling Traefik to use the above specified port
-      - traefik.http.routers.anubis.tls.certresolver=le # Telling Traefik to resolve a Cert for Anubis
-
-  # Protected by Anubis
-  target:
-    image: traefik/whoami:latest
-    networks:
-      - traefik
-    labels:
-      - traefik.enable=true # Enabling Traefik
-      - traefik.docker.network=traefik # Telling Traefik which network to use
-      - traefik.http.routers.target.rule=Host(`example.com`) # Only Matching Requests for example.com
-      - traefik.http.routers.target.entrypoints=anubis # Listening on the exclusive Anubis Network
-      - traefik.http.services.target.loadbalancer.server.port=80 # Telling Traefik where to receive requests
-      - traefik.http.routers.target.service=target # Telling Traefik to use the above specified port
-
-  # Not Protected by Anubis
-  target2:
-    image: traefik/whoami:latest
-    networks:
-      - traefik
-    labels:
-      - traefik.enable=true # Eneabling Traefik
-      - traefik.docker.network=traefik # Telling Traefik which network to use
-      - traefik.http.routers.target2.rule=Host(`another.com`) # Only Matching Requests for example.com
-      - traefik.http.routers.target2.entrypoints=websecure # Listening on the exclusive Anubis Network
-      - traefik.http.services.target2.loadbalancer.server.port=80 # Telling Traefik where to receive requests
-      - traefik.http.routers.target2.service=target2 # Telling Traefik to use the above specified port
-      - traefik.http.routers.target2.tls.certresolver=le # Telling Traefik to resolve a Cert for this Target
-
-networks:
-  traefik:
-    name: traefik
-```
-
-**traefik.yml**
-
-```yml
-api:
-  insecure: false # shouldn't be enabled in prod
-
-entryPoints:
-  # Web
-  web:
-    address: ":80"
-  websecure:
-    address: ":443"
-  # Anubis
-  anubis:
-    address: ":3923"
-
-certificatesResolvers:
-  le:
-    acme:
-      tlsChallenge: {}
-      email: "admin@example.com"
-      storage: "/letsencrypt/acme.json"
-
-providers:
-  docker: {}
-```
--- a/docs/docs/admin/installation.mdx
+++ b/docs/docs/admin/installation.mdx
@@ -4,9 +4,6 @@ title: Setting up Anubis

 import RandomKey from "@site/src/components/RandomKey";

-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
 Anubis is meant to sit between your reverse proxy (such as Nginx or Caddy) and your target service. One instance of Anubis must be used per service you are protecting.

 <center>
@@ -27,8 +24,6 @@ TLS terminator)

 </center>

-## Docker image conventions
-
 Anubis is shipped in the Docker repo [`ghcr.io/techarohq/anubis`](https://github.com/TecharoHQ/anubis/pkgs/container/anubis). The following tags exist for your convenience:

 | Tag                 | Meaning                                                                                                                            |
@@ -36,78 +31,30 @@ Anubis is shipped in the Docker repo [`ghcr.io/techarohq/anubis`](https://github
 | `latest`            | The latest [tagged release](https://github.com/TecharoHQ/anubis/releases), if you are in doubt, start here.                        |
 | `v<version number>` | The Anubis image for [any given tagged release](https://github.com/TecharoHQ/anubis/tags)                                          |
 | `main`              | The current build on the `main` branch. Only use this if you need the latest and greatest features as they are merged into `main`. |
+| `pr-<number>`       | The build associated with PR `#<number>`. Only use this for debugging issues fixed by a PR.                                        |
+
+Other methods to install Anubis may exist, but the Docker image is currently the only supported method.

 The Docker image runs Anubis as user ID 1000 and group ID 1000. If you are mounting external volumes into Anubis' container, please be sure they are owned by or writable to this user/group.

 Anubis has very minimal system requirements. I suspect that 128Mi of ram may be sufficient for a large number of concurrent clients. Anubis may be a poor fit for apps that use WebSockets and maintain open connections, but I don't have enough real-world experience to know one way or another.

-## Native packages
-
-For more detailed information on installing Anubis with native packages, please read [the native install directions](./native-install.mdx).
-
-## Environment variables
-
 Anubis uses these environment variables for configuration:

-| Environment Variable           | Default value           | Explanation                                                                                                                                                                                                                                                                                                          |
-| :----------------------------- | :---------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `BASE_PREFIX`                  | unset                   | If set, adds a global prefix to all Anubis endpoints. For example, setting this to `/myapp` would make Anubis accessible at `/myapp/` instead of `/`. This is useful when running Anubis behind a reverse proxy that routes based on path prefixes.                                                                  |
-| `BIND`                         | `:8923`                 | The network address that Anubis listens on. For `unix`, set this to a path: `/run/anubis/instance.sock`                                                                                                                                                                                                              |
-| `BIND_NETWORK`                 | `tcp`                   | The address family that Anubis listens on. Accepts `tcp`, `unix` and anything Go's [`net.Listen`](https://pkg.go.dev/net#Listen) supports.                                                                                                                                                                           |
-| `COOKIE_DOMAIN`                | unset                   | The domain the Anubis challenge pass cookie should be set to. This should be set to the domain you bought from your registrar (EG: `techaro.lol` if your webapp is running on `anubis.techaro.lol`). See [here](https://stackoverflow.com/a/1063760) for more information.                                           |
-| `COOKIE_PARTITIONED`           | `false`                 | If set to `true`, enables the [partitioned (CHIPS) flag](https://developers.google.com/privacy-sandbox/cookies/chips), meaning that Anubis inside an iframe has a different set of cookies than the domain hosting the iframe.                                                                                       |
-| `DIFFICULTY`                   | `4`                     | The difficulty of the challenge, or the number of leading zeroes that must be in successful responses.                                                                                                                                                                                                               |
-| `ED25519_PRIVATE_KEY_HEX`      | unset                   | The hex-encoded ed25519 private key used to sign Anubis responses. If this is not set, Anubis will generate one for you. This should be exactly 64 characters long. See below for details.                                                                                                                           |
-| `ED25519_PRIVATE_KEY_HEX_FILE` | unset                   | Path to a file containing the hex-encoded ed25519 private key. Only one of this or its sister option may be set.                                                                                                                                                                                                     |
-| `METRICS_BIND`                 | `:9090`                 | The network address that Anubis serves Prometheus metrics on. See `BIND` for more information.                                                                                                                                                                                                                       |
-| `METRICS_BIND_NETWORK`         | `tcp`                   | The address family that the Anubis metrics server listens on. See `BIND_NETWORK` for more information.                                                                                                                                                                                                               |
-| `OG_EXPIRY_TIME`               | `24h`                   | The expiration time for the Open Graph tag cache.                                                                                                                                                                                                                                                                    |
-| `OG_PASSTHROUGH`               | `false`                 | If set to `true`, Anubis will enable Open Graph tag passthrough.                                                                                                                                                                                                                                                     |
-| `POLICY_FNAME`                 | unset                   | The file containing [bot policy configuration](./policies.mdx). See the bot policy documentation for more details. If unset, the default bot policy configuration is used.                                                                                                                                           |
-| `REDIRECT_DOMAINS`             | unset                   | If set, restrict the domains that Anubis can redirect to when passing a challenge.<br/><br/>If this is unset, Anubis may redirect to any domain which could cause security issues in the unlikely case that an attacker passes a challenge for your browser and then tricks you into clicking a link to your domain. |
-| `SERVE_ROBOTS_TXT`             | `false`                 | If set `true`, Anubis will serve a default `robots.txt` file that disallows all known AI scrapers by name and then additionally disallows every scraper. This is useful if facts and circumstances make it difficult to change the underlying service to serve such a `robots.txt` file.                             |
-| `SOCKET_MODE`                  | `0770`                  | _Only used when at least one of the `*_BIND_NETWORK` variables are set to `unix`._ The socket mode (permissions) for Unix domain sockets.                                                                                                                                                                            |
-| `TARGET`                       | `http://localhost:3923` | The URL of the service that Anubis should forward valid requests to. Supports Unix domain sockets, set this to a URI like so: `unix:///path/to/socket.sock`.                                                                                                                                                         |
-| `USE_REMOTE_ADDRESS`           | unset                   | If set to `true`, Anubis will take the client's IP from the network socket. For production deployments, it is expected that a reverse proxy is used in front of Anubis, which pass the IP using headers, instead.                                                                                                    |
-| `WEBMASTER_EMAIL`              | unset                   | If set, shows a contact email address when rendering error pages. This email address will be how users can get in contact with administrators.                                                                                                                                                                       |
-
-For more detailed information on configuring Open Graph tags, please refer to the [Open Graph Configuration](./configuration/open-graph.mdx) page.
-
-### Using Base Prefix
-
-The `BASE_PREFIX` environment variable allows you to run Anubis behind a path prefix. This is useful when:
-
- You want to host multiple services on the same domain
- You're using a reverse proxy that routes based on path prefixes
- You need to integrate Anubis with an existing application structure
-
-For example, if you set `BASE_PREFIX=/myapp`, Anubis will:
-
- Serve its challenge page at `/myapp/` instead of `/`
- Serve its API endpoints at `/myapp/.within.website/x/cmd/anubis/api/` instead of `/.within.website/x/cmd/anubis/api/`
- Serve its static assets at `/myapp/.within.website/x/cmd/anubis/` instead of `/.within.website/x/cmd/anubis/`
-
-When using this feature with a reverse proxy:
-
-1. Configure your reverse proxy to route requests for the specified path prefix to Anubis
-2. Set the `BASE_PREFIX` environment variable to match the path prefix in your reverse proxy configuration
-3. Ensure that your reverse proxy preserves the path when forwarding requests to Anubis
-
-Example with Nginx:
-
-```nginx
-location /myapp/ {
-    proxy_pass http://anubis:8923/myapp;
-    proxy_set_header Host $host;
-    proxy_set_header X-Real-IP $remote_addr;
-}
-```
-
-With corresponding Anubis configuration:
-
-```
-BASE_PREFIX=/myapp
-```
+| Environment Variable      | Default value           | Explanation                                                                                                                                                                                                                                                                              |
+| :------------------------ | :---------------------- | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `BIND`                    | `:8923`                 | The network address that Anubis listens on. For `unix`, set this to a path: `/run/anubis/instance.sock`                                                                                                                                                                                  |
+| `BIND_NETWORK`            | `tcp`                   | The address family that Anubis listens on. Accepts `tcp`, `unix` and anything Go's [`net.Listen`](https://pkg.go.dev/net#Listen) supports.                                                                                                                                               |
+| `COOKIE_DOMAIN`           | unset                   | The domain the Anubis challenge pass cookie should be set to. This should be set to the domain you bought from your registrar (EG: `techaro.lol` if your webapp is running on `anubis.techaro.lol`). See [here](https://stackoverflow.com/a/1063760) for more information.               |
+| `COOKIE_PARTITIONED`      | `false`                 | If set to `true`, enables the [partitioned (CHIPS) flag](https://developers.google.com/privacy-sandbox/cookies/chips), meaning that Anubis inside an iframe has a different set of cookies than the domain hosting the iframe.                                                           |
+| `DIFFICULTY`              | `5`                     | The difficulty of the challenge, or the number of leading zeroes that must be in successful responses.                                                                                                                                                                                   |
+| `ED25519_PRIVATE_KEY_HEX` |                         | The hex-encoded ed25519 private key used to sign Anubis responses. If this is not set, Anubis will generate one for you. This should be exactly 64 characters long. See below for details.                                                                                               |
+| `METRICS_BIND`            | `:9090`                 | The network address that Anubis serves Prometheus metrics on. See `BIND` for more information.                                                                                                                                                                                           |
+| `METRICS_BIND_NETWORK`    | `tcp`                   | The address family that the Anubis metrics server listens on. See `BIND_NETWORK` for more information.                                                                                                                                                                                   |
+| `SOCKET_MODE`             | `0770`                  | _Only used when at least one of the `*_BIND_NETWORK` variables are set to `unix`._ The socket mode (permissions) for Unix domain sockets.                                                                                                                                                |
+| `POLICY_FNAME`            | unset                   | The file containing [bot policy configuration](./policies.md). See the bot policy documentation for more details. If unset, the default bot policy configuration is used.                                                                                                                |
+| `SERVE_ROBOTS_TXT`        | `false`                 | If set `true`, Anubis will serve a default `robots.txt` file that disallows all known AI scrapers by name and then additionally disallows every scraper. This is useful if facts and circumstances make it difficult to change the underlying service to serve such a `robots.txt` file. |
+| `TARGET`                  | `http://localhost:3923` | The URL of the service that Anubis should forward valid requests to. Supports Unix domain sockets, set this to a URI like so: `unix:///path/to/socket.sock`.                                                                                                                             |

 ### Key generation

@@ -121,18 +68,107 @@ Alternatively here is a key generated by your browser:

 <RandomKey />

-## Next steps
+## Docker compose

-To get Anubis filtering your traffic, you need to make sure it's added to your HTTP load balancer or platform configuration. See the [environments category](/docs/category/environments) for detailed information on individual environments.
+Add Anubis to your compose file pointed at your service:

- [Apache](./environments/apache.mdx)
- [Docker compose](./environments/docker-compose.mdx)
- [Kubernetes](./environments/kubernetes.mdx)
- [Nginx](./environments/nginx.mdx)
- [Traefik](./environments/traefik.mdx)
+```yaml
+services:
+  anubis-nginx:
+    image: ghcr.io/techarohq/anubis:latest
+    environment:
+      BIND: ":8080"
+      DIFFICULTY: "5"
+      METRICS_BIND: ":9090"
+      SERVE_ROBOTS_TXT: "true"
+      TARGET: "http://nginx"
+      POLICY_FNAME: "/data/cfg/botPolicy.json"
+    ports:
+      - 8080:8080
+    volumes:
+      - "./botPolicy.json:/data/cfg/botPolicy.json:ro"
+  nginx:
+    image: nginx
+    volumes:
+      - "./www:/usr/share/nginx/html"
+```

-:::note
+## Kubernetes

-Anubis loads its assets from `/.within.website/x/xess/` and `/.within.website/x/cmd/anubis`. If you do not reverse proxy these in your server config, Anubis won't work.
+This example makes the following assumptions:

-:::
+- Your target service is listening on TCP port `5000`.
+- Anubis will be listening on port `8080`.
+
+Attach Anubis to your Deployment:
+
+```yaml
+containers:
+  # ...
+  - name: anubis
+    image: ghcr.io/techarohq/anubis:latest
+    imagePullPolicy: Always
+    env:
+      - name: "BIND"
+        value: ":8080"
+      - name: "DIFFICULTY"
+        value: "5"
+      - name: "METRICS_BIND"
+        value: ":9090"
+      - name: "SERVE_ROBOTS_TXT"
+        value: "true"
+      - name: "TARGET"
+        value: "http://localhost:5000"
+    resources:
+      limits:
+        cpu: 500m
+        memory: 128Mi
+      requests:
+        cpu: 250m
+        memory: 128Mi
+    securityContext:
+      runAsUser: 1000
+      runAsGroup: 1000
+      runAsNonRoot: true
+      allowPrivilegeEscalation: false
+      capabilities:
+        drop:
+          - ALL
+      seccompProfile:
+        type: RuntimeDefault
+```
+
+Then add a Service entry for Anubis:
+
+```yaml
+# ...
+spec:
+  ports:
+    # diff-add
+    - protocol: TCP
+      # diff-add
+      port: 8080
+      # diff-add
+      targetPort: 8080
+      # diff-add
+      name: anubis
+```
+
+Then point your Ingress to the Anubis port:
+
+```yaml
+  rules:
+  - host: git.xeserv.us
+    http:
+      paths:
+      - pathType: Prefix
+        path: "/"
+        backend:
+          service:
+            name: git
+            port:
+              # diff-remove
+              name: http
+              # diff-add
+              name: anubis
+```
--- a/docs/docs/admin/native-install.mdx
+++ b/docs/docs/admin/native-install.mdx
@@ -1,138 +0,0 @@
---
-title: Installing Anubis with a native package
---
-
-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
-Download the package for your system from [the most recent release on GitHub](https://github.com/TecharoHQ/anubis/releases).
-
-Install the Anubis package using your package manager of choice:
-
-<Tabs>
-  <TabItem value="deb" label="Debian-based (apt)" default>
-  
-Install Anubis with `apt`:
-
-```text
-sudo apt install ./anubis-$VERSION-$ARCH.deb
-```
-
-  </TabItem>
-  <TabItem value="tarball" label="Tarball">
-  
-Extract the tarball to a folder:
-
-```text
-tar zxf ./anubis-$VERSION-$OS-$ARCH.tar.gz
-cd anubis-$VERSION-$OS-$ARCH
-```
-
-Install the binary to your system:
-
-```text
-sudo install -D ./bin/anubis /usr/local/bin
-```
-
-Edit the systemd unit to point to `/usr/local/bin/anubis` instead of `/usr/bin/anubis`:
-
-```text
-perl -pi -e 's$/usr/bin/anubis$/usr/local/bin/anubis$g' ./run/anubis@.service
-```
-
-Install the systemd unit to your system:
-
-```text
-sudo install -D ./run/anubis@.service /etc/systemd/system
-```
-
-Install the default configuration file to your system:
-
-```text
-sudo install -D ./run/default.env /etc/anubis
-```
-
-  </TabItem>
-  <TabItem value="rpm" label="Red Hat-based (rpm)">
-  
-Install Anubis with `dnf`:
-
-```text
-sudo dnf -y install ./anubis-$VERSION.$ARCH.rpm
-```
-
-OR
-
-Install Anubis with `yum`:
-
-```text
-sudo yum -y install ./anubis-$VERSION.$ARCH.rpm
-```
-
-OR
-
-Install Anubis with `rpm`:
-
-```
-sudo rpm -ivh ./anubis-$VERSION.$ARCH.rpm
-```
-
-  </TabItem>
-</Tabs>
-
-Once it's installed, make a copy of the default configuration file `/etc/anubis/default.env` based on which service you want to protect. For example, to protect a `gitea` server:
-
-```text
-sudo cp /etc/anubis/default.env /etc/anubis/gitea.env
-```
-
-Copy the default bot policies file to `/etc/anubis/gitea.botPolicies.yaml`:
-
-<Tabs>
-<TabItem value="debrpm" label="Debian or Red Hat" default>
-
-```text
-sudo cp /usr/share/doc/anubis/botPolicies.yaml /etc/anubis/gitea.botPolicies.yaml
-```
-
-</TabItem>
-<TabItem value="tarball" label="Tarball">
-
-```text
-sudo cp ./doc/botPolicies.yaml /etc/anubis/gitea.botPolicies.yaml
-```
-
-</TabItem>
-
-</Tabs>
-
-Then open `gitea.env` in your favorite text editor and customize [the environment variables](./installation.mdx#environment-variables) as needed. Here's an example configuration for a Gitea server:
-
-```sh
-BIND=[::1]:8239
-BIND_NETWORK=tcp
-DIFFICULTY=4
-METRICS_BIND=[::1]:8240
-METRICS_BIND_NETWORK=tcp
-POLICY_FNAME=/etc/anubis/gitea.botPolicies.yaml
-TARGET=http://localhost:3000
-```
-
-Then start Anubis with `systemctl enable --now`:
-
-```text
-sudo systemctl enable --now anubis@gitea.service
-```
-
-Test to make sure it's running with `curl`:
-
-```text
-curl http://localhost:8240/metrics
-```
-
-Then set up your reverse proxy (Nginx, Caddy, etc.) to point to the Anubis port. Anubis will then reverse proxy all requests that meet the policies in `/etc/anubis/gitea.botPolicies.json` to the target service.
-
-For more details on particular reverse proxies, see here:
-
- [Apache](./environments/apache.mdx)
- [Nginx](./environments/nginx.mdx)
--- a/docs/docs/admin/policies.mdx
+++ b/docs/docs/admin/policies.mdx
@@ -2,25 +2,15 @@
 title: Policy Definitions
 ---

-import Tabs from "@theme/Tabs";
-import TabItem from "@theme/TabItem";
-
 Out of the box, Anubis is pretty heavy-handed. It will aggressively challenge everything that might be a browser (usually indicated by having `Mozilla` in its user agent). However, some bots are smart enough to get past the challenge. Some things that look like bots may actually be fine (IE: RSS readers). Some resources need to be visible no matter what. Some resources and remotes are fine to begin with.

 Bot policies let you customize the rules that Anubis uses to allow, deny, or challenge incoming requests. Currently you can set policies by the following matches:

 - Request path
 - User agent string
- HTTP request header values
- [Importing other configuration snippets](./configuration/import.mdx)
-
-As of version v1.17.0 or later, configuration can be written in either JSON or YAML.

 Here's an example rule that denies [Amazonbot](https://developer.amazon.com/en/amazonbot):

-<Tabs>
-<TabItem value="json" label="JSON" default>
-
 ```json
 {
  "name": "amazonbot",
@@ -29,37 +19,15 @@ Here's an example rule that denies [Amazonbot](https://developer.amazon.com/en/a
 }
 ```

-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-```yaml
- name: amazonbot
-  user_agent_regex: Amazonbot
-  action: DENY
-```
-
-</TabItem>
-</Tabs>
-
 When this rule is evaluated, Anubis will check the `User-Agent` string of the request. If it contains `Amazonbot`, Anubis will send an error page to the user saying that access is denied, but in such a way that makes scrapers think they have correctly loaded the webpage.

 Right now the only kinds of policies you can write are bot policies. Other forms of policies will be added in the future.

 Here is a minimal policy file that will protect against most scraper bots:

-<Tabs>
-<TabItem value="json" label="JSON" default>
-
 ```json
 {
  "bots": [
-    {
-      "name": "cloudflare-workers",
-      "headers_regex": {
-        "CF-Worker": ".*"
-      },
-      "action": "DENY"
-    },
    {
      "name": "well-known",
      "path_regex": "^/.well-known/.*$",
@@ -84,35 +52,9 @@ Here is a minimal policy file that will protect against most scraper bots:
 }
 ```

-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-```yaml
-bots:
-  - name: cloudflare-workers
-    headers_regex:
-      CF-Worker: .*
-    action: DENY
-  - name: well-known
-    path_regex: ^/.well-known/.*$
-    action: ALLOW
-  - name: favicon
-    path_regex: ^/favicon.ico$
-    action: ALLOW
-  - name: robots-txt
-    path_regex: ^/robots.txt$
-    action: ALLOW
-  - name: generic-browser
-    user_agent_regex: Mozilla
-    action: CHALLENGE
-```
-
-</TabItem>
-</Tabs>
-
 This allows requests to [`/.well-known`](https://en.wikipedia.org/wiki/Well-known_URI), `/favicon.ico`, `/robots.txt`, and challenges any request that has the word `Mozilla` in its User-Agent string. The [default policy file](https://github.com/TecharoHQ/anubis/blob/main/data/botPolicies.json) is a bit more cohesive, but this should be more than enough for most users.

-If no rules match the request, it is allowed through. For more details on this default behavior and its implications, see [Default allow behavior](./default-allow-behavior.mdx).
+If no rules match the request, it is allowed through.

 ## Writing your own rules

@@ -130,11 +72,6 @@ Name your rules in lower case using kebab-case. Rule names will be exposed in Pr

 Rules can also have their own challenge settings. These are customized using the `"challenge"` key. For example, here is a rule that makes challenges artificially hard for connections with the substring "bot" in their user agent:

-<Tabs>
-<TabItem value="json" label="JSON" default>
-
-This rule has been known to have a high false positive rate in testing. Please use this with care.
-
 ```json
 {
  "name": "generic-bot-catchall",
@@ -148,25 +85,6 @@ This rule has been known to have a high false positive rate in testing. Please u
 }
 ```

-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-This rule has been known to have a high false positive rate in testing. Please use this with care.
-
-```yaml
-# Punish any bot with "bot" in the user-agent string
- name: generic-bot-catchall
-  user_agent_regex: (?i:bot|crawler)
-  action: CHALLENGE
-  challenge:
-    difficulty: 16 # impossible
-    report_as: 4 # lie to the operator
-    algorithm: slow # intentionally waste CPU cycles and time
-```
-
-</TabItem>
-</Tabs>
-
 Challenges can be configured with these settings:

 | Key          | Example  | Description                                                                                                                                                                                    |
@@ -181,9 +99,6 @@ The `remote_addresses` field of a Bot rule allows you to set the IP range that t

 For example, you can allow a search engine to connect if and only if its IP address matches the ones they published:

-<Tabs>
-<TabItem value="json" label="JSON" default>
-
 ```json
 {
  "name": "qwantbot",
@@ -193,25 +108,8 @@ For example, you can allow a search engine to connect if and only if its IP addr
 }
 ```

-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-```yaml
- name: qwantbot
-  user_agent_regex: \+https\://help\.qwant\.com/bot/
-  action: ALLOW
-  # https://help.qwant.com/wp-content/uploads/sites/2/2025/01/qwantbot.json
-  remote_addresses: ["91.242.162.0/24"]
-```
-
-</TabItem>
-</Tabs>
-
 This also works at an IP range level without any other checks:

-<Tabs>
-<TabItem value="json" label="JSON" default>
-
 ```json
 {
  "name": "internal-network",
@@ -220,19 +118,6 @@ This also works at an IP range level without any other checks:
 }
 ```

-</TabItem>
-<TabItem value="yaml" label="YAML">
-
-```yaml
-name: internal-network
-action: ALLOW
-remote_addresses:
-  - 100.64.0.0/10
-```
-
-</TabItem>
-</Tabs>
-
 ## Risk calculation for downstream services

 In case your service needs it for risk calculation reasons, Anubis exposes information about the rules that any requests match using a few headers:
@@ -241,6 +126,6 @@ In case your service needs it for risk calculation reasons, Anubis exposes infor
 | :---------------- | :--------------------------------------------------- | :--------------- |
 | `X-Anubis-Rule`   | The name of the rule that was matched                | `bot/lightpanda` |
 | `X-Anubis-Action` | The action that Anubis took in response to that rule | `CHALLENGE`      |
-| `X-Anubis-Status` | The status and how strict Anubis was in its checks   | `PASS`           |
+| `X-Anubis-Status` | The status and how strict Anubis was in its checks   | `PASS-FULL`      |

 Policy rules are matched using [Go's standard library regular expressions package](https://pkg.go.dev/regexp). You can mess around with the syntax at [regex101.com](https://regex101.com), make sure to select the Golang option.
--- a/docs/docs/developer/_category_.json
+++ b/docs/docs/developer/_category_.json
@@ -1,8 +0,0 @@
-{
-  "label": "Developer guides",
-  "position": 50,
-  "link": {
-    "type": "generated-index",
-    "description": "Guides and suggestions to make Anubis development go smoothly for everyone."
-  }
-}
--- a/docs/docs/developer/building-anubis.md
+++ b/docs/docs/developer/building-anubis.md
@@ -1,84 +0,0 @@
---
-title: Building Anubis without Docker
---
-
-:::note
-
-These instructions may work, but for right now they are informative for downstream packagers more than they are ready-made instructions for administrators wanting to run Anubis on their servers. Pre-made binary package support is being tracked in [#156](https://github.com/TecharoHQ/anubis/issues/156).
-
-:::
-
-## Entirely from source
-
-If you are doing a build entirely from source, here's what you need to do:
-
-:::info
-
-If you maintain a package for Anubis v1.15.x or older, you will need to update your package build. You may want to use one of the half-baked tarballs if your distro/environment of choice makes it difficult to use npm.
-
-:::
-
-### Tools needed
-
-In order to build a production-ready binary of Anubis, you need the following packages in your environment:
-
- [Go](https://go.dev) at least version 1.24 - the programming language that Anubis is written in
- [esbuild](https://esbuild.github.io/) - the JavaScript bundler Anubis uses for its production JS assets
- [Node.JS & NPM](https://nodejs.org/en) - manages some build dependencies
- `gzip` - compresses production JS (part of coreutils)
- `zstd` - compresses production JS
- `brotli` - compresses production JS
-
-To upgrade your version of Go without system package manager support, install `golang.org/dl/go1.24.2` (this can be done from any version of Go):
-
-```text
-go install golang.org/dl/go1.24.2@latest
-go1.24.2 download
-```
-
-### Install dependencies
-
-```text
-make deps
-```
-
-This will download Go and NPM dependencies.
-
-### Building static assets
-
-```text
-make assets
-```
-
-This will build all static assets (CSS, JavaScript) for distribution.
-
-### Building Anubis to the `./var` folder
-
-```text
-make build
-```
-
-From this point it is up to you to make sure that `./var/anubis` ends up in the right place. You may want to consult the `./run` folder for useful files such as a systemd unit and `anubis.env.default` file.
-
-## "Pre-baked" tarball
-
-The `anubis-src-with-vendor` tarball has many pre-build steps already done, including:
-
- Go module dependencies are present in `./vendor`
- Static assets (JS, CSS, etc.) are already built in CI
-
-This means you do not have to manage Go, NPM, or other ecosystem dependencies.
-
-When using this tarball, all you need to do is build `./cmd/anubis`:
-
-```text
-make prebaked-build
-```
-
-Anubis will be built to `./var/anubis`.
-
-## Development dependencies
-
-Optionally, you can install the following dependencies for development:
-
- [Staticcheck](https://staticcheck.dev/docs/getting-started/) (optional, not required due to [`go tool staticcheck`](https://www.alexedwards.net/blog/how-to-manage-tool-dependencies-in-go-1.24-plus), but required if you are using any version of Go older than 1.24)
--- a/docs/docs/developer/code-quality.md
+++ b/docs/docs/developer/code-quality.md
@@ -1,31 +0,0 @@
---
-title: Code quality guidelines
---
-
-When submitting code to Anubis, please take the time to consider the fact that this project is security software. If things go bad, bots can pummel sites into oblivion. This is not ideal for uptime.
-
-As such, code reviews will be a bit more strict than you have seen in other projects. This is not people trying to be mean, this is a side effect of taking the problem seriously.
-
-When making code changes, try to do the following:
-
- If you're submitting a bugfix, add a test case for it
- If you're changing the JavaScript, make sure the integration tests pass (`npm run test:integration`)
-
-## Commit messages
-
-Anubis follows the Go project's conventions for commit messages. In general, an ideal commit message should read like this:
-
-```text
-path/to/folder: brief description of the change
-
-If the change is subtle, has implementation consequences, or is otherwise
-not entirely self-describing: take the time to spell out why. If things
-are very subtle, please also amend the documentation accordingly
-```
-
-The subject of a commit message should be the second half of the sentence "This commit changes the Anubis project to:". Here's a few examples:
-
- `disable DroneBL by default`
- `port the challenge to WebAssembly`
-
-The extended commit message is also your place to give rationale for a new feature. When maintainers are reviewing your code, they will use this to figure out if the burden from feature maintainership is worth the merge.
--- a/docs/docs/developer/local-dev.md
+++ b/docs/docs/developer/local-dev.md
@@ -1,86 +0,0 @@
---
-title: Local development
---
-
-:::note
-
-TL;DR: `npm ci && npm run dev`
-
-:::
-
-Anubis requires the following tools to be installed to do local development:
-
- [Go](https://go.dev) - the programming language that Anubis is written in
- [esbuild](https://esbuild.github.io/) - the JavaScript bundler Anubis uses for its production JS assets
- [Node.JS & NPM](https://nodejs.org/en) - manages some build dependencies
- `gzip` - compresses production JS (part of coreutils)
- `zstd` - compresses production JS
- `brotli` - compresses production JS
-
-If you have [Homebrew](https://brew.sh) installed, you can install all the dependencies with one command:
-
-```text
-brew bundle
-```
-
-If you don't, you may need to figure out equivalents to the packages in Homebrew.
-
-## Running Anubis locally
-
-```text
-npm run dev
-```
-
-Or to do it manually:
-
- Run `npm run assets` every time you change the CSS/JavaScript
- `go run ./cmd/anubis` with any CLI flags you want
-
-## Building JS/CSS assets
-
-```text
-npm run assets
-```
-
-If you change the build process, make sure to update `build.sh` accordingly.
-
-## Production-ready builds
-
-```text
-npm run container
-```
-
-This builds a prod-ready container image with [ko](https://ko.build). If you want to change where the container image is pushed, you need to use environment variables:
-
-```text
-DOCKER_REPO=registry.host/org/repo DOCKER_METADATA_OUTPUT_TAGS=registry.host/org/repo:latest npm run container
-```
-
-## Building packages
-
-For more information, see [Building native packages is complicated](https://xeiaso.net/blog/2025/anubis-packaging/) and [#156: Debian, RPM, and binary tarball packages](https://github.com/TecharoHQ/anubis/issues/156).
-
-Install `yeet`:
-
-:::note
-
-`yeet` will soon be moved to a dedicated TecharoHQ repository. This is currently done in a hacky way in order to get this ready for user feedback.
-
-:::
-
-```text
-go install within.website/x/cmd/yeet@v1.13.4
-```
-
-Install the dependencies for Anubis:
-
-```text
-npm ci
-go mod download
-```
-
-Build the packages into `./var`:
-
-```text
-yeet
-```
--- a/docs/docs/developer/signed-commits.md
+++ b/docs/docs/developer/signed-commits.md
@@ -1,7 +0,0 @@
---
-title: Signed commits
---
-
-Anubis requires developers to sign their commits. This is done so that we can have a better chain of custody from contribution to owner. For more information about commit signing, [read here](https://www.freecodecamp.org/news/what-is-commit-signing-in-git/).
-
-We do not require GPG. SSH signed commits are fine. For an overview on how to set up commit signing with your SSH key, [read here](https://dev.to/ccoveille/git-the-complete-guide-to-sign-your-commits-with-an-ssh-key-35bg).
--- a/docs/docs/funding.md
+++ b/docs/docs/funding.md
@@ -7,4 +7,4 @@ Anubis is provided to the public for free in order to help advance the common go

 If you want to run an unbranded or white-label version of Anubis, please [contact Xe](https://xeiaso.net/contact) to arrange a contract. This is not meant to be "contact us" pricing, I am still evaluating the market for this solution and figuring out what makes sense.

-You can donate to the project [on Patreon](https://patreon.com/cadey) or via [GitHub Sponsors](https://github.com/sponsors/Xe).
+You can donate to the project [on Patreon](https://patreon.com/cadey).
--- a/docs/docs/index.mdx
+++ b/docs/docs/index.mdx
@@ -15,55 +15,14 @@ title: Anubis
 ![language count](https://img.shields.io/github/languages/count/TecharoHQ/anubis)
 ![repo size](https://img.shields.io/github/repo-size/TecharoHQ/anubis)

-## Sponsors
-
-Anubis is brought to you by sponsors and donors like:
-
-[![Distrust](/img/sponsors/distrust-logo.webp)](https://distrust.co)
-
-## Overview
-
-Anubis [weighs the soul of your connection](https://en.wikipedia.org/wiki/Weighing_of_souls) using a proof-of-work challenge in order to protect upstream resources from scraper bots.
+Anubis [weighs the soul of your connection](https://en.wikipedia.org/wiki/Weighing_of_souls) using a sha256 proof-of-work challenge in order to protect upstream resources from scraper bots.

 This program is designed to help protect the small internet from the endless storm of requests that flood in from AI companies. Anubis is as lightweight as possible to ensure that everyone can afford to protect the communities closest to them.

-Anubis is a bit of a nuclear response. This will result in your website being blocked from smaller scrapers and may inhibit "good bots" like the Internet Archive. You can configure [bot policy definitions](https://anubis.techaro.lol/docs/admin/policies) to explicitly allowlist them and we are working on a curated set of "known good" bots to allow for a compromise between discoverability and uptime.
-
-In most cases, you should not need this and can probably get by using Cloudflare to protect a given origin. However, for circumstances where you can't or won't use Cloudflare, Anubis is there for you.
+Anubis is a bit of a nuclear response. This will result in your website being blocked from smaller scrapers and may inhibit "good bots" like the Internet Archive. You can configure [bot policy definitions](./admin/policies.md) to explicitly allowlist them and we are working on a curated set of "known good" bots to allow for a compromise between discoverability and uptime.

 ## Support

 If you run into any issues running Anubis, please [open an issue](https://github.com/TecharoHQ/anubis/issues/new?template=Blank+issue) and include all the information I would need to diagnose your issue.

-For live chat, please join the [Patreon](https://patreon.com/cadey) or join [GitHub Sponsors](https://github.com/sponsors/Xe) and ask in the Patron discord in the channel `#anubis`.
-
-## Star History
-
-<a href="https://www.star-history.com/#TecharoHQ/anubis&Date">
-  <picture>
-    <source
-      media="(prefers-color-scheme: dark)"
-      srcSet="https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date&theme=dark"
-    />
-    <source
-      media="(prefers-color-scheme: light)"
-      srcSet="https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date"
-    />
-    <img
-      alt="Star History Chart"
-      src="https://api.star-history.com/svg?repos=TecharoHQ/anubis&type=Date"
-    />
-  </picture>
-</a>
-
-## Packaging Status
-
-[![Packaging status](https://repology.org/badge/vertical-allrepos/anubis-anti-crawler.svg?columns=3)](https://repology.org/project/anubis-anti-crawler/versions)
-
-## Contributors
-
-<a href="https://github.com/TecharoHQ/anubis/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=TecharoHQ/anubis" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
+For live chat, please join the [Patreon](https://patreon.com/cadey) and ask in the Patron discord in the channel `#anubis`.
--- a/docs/docs/user/known-instances.md
+++ b/docs/docs/user/known-instances.md
@@ -1,37 +0,0 @@
---
-title: List of known websites using Anubis
---
-
-This page contains a non-exhaustive list with all websites using Anubis.
-
- <details>
-  <summary>The Linux Foundation</summary>
-  - https://git.kernel.org/
-  - https://lore.kernel.org/
-  </details>
- https://gitlab.gnome.org/
- https://scioly.org/
- https://bugs.winehq.org/
- https://svnweb.freebsd.org/
- https://trac.ffmpeg.org/
- https://git.sr.ht/
- https://xeiaso.net/
- https://source.puri.sm/
- https://git.enlightenment.org/
- https://superlove.sayitditto.net/
- https://linktaco.com/
- https://jaredallard.dev/
- https://dev.sanctum.geek.nz/
- https://canine.tools/
- https://git.lupancham.net/
- https://dev.haiku-os.org
- http://code.hackerspace.pl/
- https://wiki.archlinux.org/
- https://git.devuan.org/
- https://hydra.nixos.org/
-
- <details>
-  <summary>The United Nations</summary>
-
-  - https://policytoolbox.iiep.unesco.org/
-  </details>
--- a/docs/docusaurus.config.ts
+++ b/docs/docusaurus.config.ts
@@ -45,7 +45,7 @@ const config: Config = {
          // Please change this to your repo.
          // Remove this to remove the "edit this page" links.
          editUrl:
-            'https://github.com/TecharoHQ/anubis/tree/main/docs/',
+            'https://github.com/facebook/docusaurus/tree/main/packages/create-docusaurus/templates/shared/',
        },
        // blog: {
        //   showReadingTime: true,
@@ -70,9 +70,6 @@ const config: Config = {
  ],

  themeConfig: {
-    colorMode: {
-      respectPrefersColorScheme: true,
-    },
    // Replace with your project's social card
    image: 'img/docusaurus-social-card.jpg',
    navbar: {
@@ -128,6 +125,10 @@ const config: Config = {
        {
          title: 'More',
          items: [
+            {
+              label: 'Blog',
+              to: '/blog',
+            },
            {
              label: 'GitHub',
              href: 'https://github.com/TecharoHQ/anubis',
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -8512,9 +8512,9 @@
      }
    },
    "node_modules/estree-util-value-to-estree": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-3.3.3.tgz",
-      "integrity": "sha512-Db+m1WSD4+mUO7UgMeKkAwdbfNWwIxLt48XF2oFU9emPfXkIu+k5/nlOj313v7wqtAPo0f9REhUvznFrPkG8CQ==",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/estree-util-value-to-estree/-/estree-util-value-to-estree-3.3.2.tgz",
+      "integrity": "sha512-hYH1aSvQI63Cvq3T3loaem6LW4u72F187zW4FHpTrReJSm6W66vYTFNO1vH/chmcOulp1HlAj1pxn8Ag0oXI5Q==",
      "license": "MIT",
      "dependencies": {
        "@types/estree": "^1.0.0"
@@ -10093,9 +10093,9 @@
      }
    },
    "node_modules/http-proxy-middleware": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
-      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.7.tgz",
+      "integrity": "sha512-fgVY8AV7qU7z/MmXJ/rxwbrtQH4jBQ9m7kp3llF0liB7glmFeVZFBepQb32T3y8n8k2+AEYuMPCpinYW+/CuRA==",
      "license": "MIT",
      "dependencies": {
        "@types/http-proxy": "^1.17.8",
@@ -10184,9 +10184,9 @@
      }
    },
    "node_modules/image-size": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.1.tgz",
-      "integrity": "sha512-rH+46sQJ2dlwfjfhCyNx5thzrv+dtmBIhPHk0zgRUukHzZ/kRueTJXoYYsclBaKcSMBWuGbOFXtioLpzTb5euw==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
+      "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
      "license": "MIT",
      "dependencies": {
        "queue": "6.0.2"
--- a/docs/src/css/custom.css
+++ b/docs/src/css/custom.css
@@ -6,13 +6,13 @@

 /* You can override the default Infima variables here. */
 :root {
-  --ifm-color-primary: #ff5630;
-  --ifm-color-primary-dark: #ad422a;
-  --ifm-color-primary-darker: #8f3521;
-  --ifm-color-primary-darkest: #592115;
-  --ifm-color-primary-light: #ff7152;
-  --ifm-color-primary-lighter: #ff9178;
-  --ifm-color-primary-lightest: #ffb09e;
+  --ifm-color-primary: #2e8555;
+  --ifm-color-primary-dark: #29784c;
+  --ifm-color-primary-darker: #277148;
+  --ifm-color-primary-darkest: #205d3b;
+  --ifm-color-primary-light: #33925d;
+  --ifm-color-primary-lighter: #359962;
+  --ifm-color-primary-lightest: #3cad6e;
  --ifm-code-font-size: 95%;
  --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.1);
  --code-block-diff-add-line-color: #ccffd8;
@@ -21,17 +21,16 @@

 /* For readability concerns, you should choose a lighter palette in dark mode. */
 [data-theme="dark"] {
-  --ifm-color-primary: #e64a19;
-  --ifm-color-primary-dark: #b73a12;
-  --ifm-color-primary-darker: #8c2c0e;
-  --ifm-color-primary-darkest: #5a1e0a;
-  --ifm-color-primary-light: #eb6d45;
-  --ifm-color-primary-lighter: #f09178;
-  --ifm-color-primary-lightest: #f5b5a6;
-  --ifm-code-font-size: 95%;
-  --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.25);
-  --code-block-diff-add-line-color: #2d5a2c;
-  --code-block-diff-remove-line-color: #5a2d2c;
+  --ifm-color-primary: #25c2a0;
+  --ifm-color-primary-dark: #21af90;
+  --ifm-color-primary-darker: #1fa588;
+  --ifm-color-primary-darkest: #1a8870;
+  --ifm-color-primary-light: #29d5b0;
+  --ifm-color-primary-lighter: #32d8b4;
+  --ifm-color-primary-lightest: #4fddbf;
+  --docusaurus-highlighted-code-line-bg: rgba(0, 0, 0, 0.3);
+  --code-block-diff-add-line-color: #216932;
+  --code-block-diff-remove-line-color: #8b423b;
 }

 .code-block-diff-add-line {
--- a/docs/static/img/sponsors/distrust-logo.webp
+++ b/docs/static/img/sponsors/distrust-logo.webp
--- a/go.mod
+++ b/go.mod
@@ -1,22 +1,22 @@
 module github.com/TecharoHQ/anubis

-go 1.24
+go 1.24.1

 require (
-	github.com/a-h/templ v0.3.857
+	github.com/a-h/templ v0.3.833
 	github.com/facebookgo/flagenv v0.0.0-20160425205200-fcd59fca7456
 	github.com/golang-jwt/jwt/v5 v5.2.2
-	github.com/playwright-community/playwright-go v0.5101.0
-	github.com/prometheus/client_golang v1.22.0
+	github.com/playwright-community/playwright-go v0.5001.0
+	github.com/prometheus/client_golang v1.21.1
 	github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a
 	github.com/yl2chen/cidranger v1.0.2
-	golang.org/x/net v0.39.0
 )

 require (
-	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
+	github.com/PuerkitoBio/goquery v1.10.1 // indirect
 	github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect
 	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -30,6 +30,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.4 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -38,20 +39,15 @@ require (
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/common v0.62.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 // indirect
 	golang.org/x/mod v0.24.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
 	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.32.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
 	golang.org/x/tools v0.31.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
-	honnef.co/go/tools v0.6.1 // indirect
-	k8s.io/apimachinery v0.32.3 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	google.golang.org/protobuf v1.36.4 // indirect
 )

 tool (
 	github.com/a-h/templ/cmd/templ
 	golang.org/x/tools/cmd/stringer
-	honnef.co/go/tools/cmd/staticcheck
 )
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,13 @@
-github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs=
-github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/PuerkitoBio/goquery v1.10.1 h1:Y8JGYUkXWTGRB6Ars3+j3kN0xg1YqqlwvdTV8WTFQcU=
+github.com/PuerkitoBio/goquery v1.10.1/go.mod h1:IYiHrOMps66ag56LEH7QYDDupKXyo5A8qrjIx3ZtujY=
 github.com/a-h/parse v0.0.0-20250122154542-74294addb73e h1:HjVbSQHy+dnlS6C3XajZ69NYAb5jbGNfHanvm1+iYlo=
 github.com/a-h/parse v0.0.0-20250122154542-74294addb73e/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ=
-github.com/a-h/templ v0.3.857 h1:6EqcJuGZW4OL+2iZ3MD+NnIcG7nGkaQeF2Zq5kf9ZGg=
-github.com/a-h/templ v0.3.857/go.mod h1:qhrhAkRFubE7khxLZHsBFHfX+gWwVNKbzKeF9GlPV4M=
+github.com/a-h/templ v0.3.833 h1:L/KOk/0VvVTBegtE0fp2RJQiBm7/52Zxv5fqlEHiQUU=
+github.com/a-h/templ v0.3.833/go.mod h1:cAu4AiZhtJfBjMY0HASlyzvkrtjnHWPeEsyGK2YYmfk=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
@@ -38,10 +40,10 @@ github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP
 github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
 github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
-github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
+github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 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/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -55,13 +57,13 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0A=
 github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
-github.com/playwright-community/playwright-go v0.5101.0 h1:gVCMZThDO76LJ/aCI27lpB8hEAWhZszeS0YB+oTxJp0=
-github.com/playwright-community/playwright-go v0.5101.0/go.mod h1:kBNWs/w2aJ2ZUp1wEOOFLXgOqvppFngM5OS+qyhl+ZM=
+github.com/playwright-community/playwright-go v0.5001.0 h1:EY3oB+rU9cUp6CLHguWE8VMZTwAg+83Yyb7dQqEmGLg=
+github.com/playwright-community/playwright-go v0.5001.0/go.mod h1:kBNWs/w2aJ2ZUp1wEOOFLXgOqvppFngM5OS+qyhl+ZM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
-github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
@@ -80,11 +82,15 @@ github.com/yl2chen/cidranger v1.0.2/go.mod h1:9U1yz7WPYDwf0vpNWFaeRh0bjwz5RVgRy/
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678 h1:1P7xPZEwZMoBoz0Yze5Nx2/4pxj6nw9ZqHWXqP0iRgQ=
-golang.org/x/exp/typeparams v0.0.0-20231108232855-2478ac86f678/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -92,11 +98,19 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
 golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -108,39 +122,43 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
-golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
 golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
 golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
+google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.6.1 h1:R094WgE8K4JirYjBaOpz/AvTyUu/3wbmAoskKN/pxTI=
-honnef.co/go/tools v0.6.1/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=
-k8s.io/apimachinery v0.32.3 h1:JmDuDarhDmA/Li7j3aPrwhpNBA94Nvk5zLeOge9HH1U=
-k8s.io/apimachinery v0.32.3/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
-sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
-sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
-sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
--- a/internal/headers.go
+++ b/internal/headers.go
@@ -1,33 +1,16 @@
 package internal

 import (
-	"errors"
-	"fmt"
 	"log/slog"
-	"net"
 	"net/http"
-	"net/netip"
-	"strings"

 	"github.com/TecharoHQ/anubis"
 	"github.com/sebest/xff"
 )

-// TODO: move into config
-type XFFComputePreferences struct {
-	StripPrivate  bool
-	StripLoopback bool
-	StripCGNAT    bool
-	StripLLU      bool
-	Flatten       bool
-}
-
-var CGNat = netip.MustParsePrefix("100.64.0.0/10")
-
 // UnchangingCache sets the Cache-Control header to cache a response for 1 year if
 // and only if the application is compiled in "release" mode by Docker.
 func UnchangingCache(next http.Handler) http.Handler {
-	//goland:noinspection GoBoolExpressions
 	if anubis.Version == "devel" {
 		return next
 	}
@@ -38,29 +21,16 @@ func UnchangingCache(next http.Handler) http.Handler {
 	})
 }

-// RemoteXRealIP sets the X-Real-Ip header to the request's real IP if
-// the setting is enabled by the user.
-func RemoteXRealIP(useRemoteAddress bool, bindNetwork string, next http.Handler) http.Handler {
-	if !useRemoteAddress {
-		slog.Debug("skipping middleware, useRemoteAddress is empty")
+// DefaultXRealIP sets the X-Real-Ip header to the given value if and only if
+// it is not an empty string.
+func DefaultXRealIP(defaultIP string, next http.Handler) http.Handler {
+	if defaultIP == "" {
+		slog.Debug("skipping middleware, defaultIP is empty")
 		return next
 	}

-	if bindNetwork == "unix" {
-		// For local sockets there is no real remote address but the localhost
-		// address should be sensible.
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			r.Header.Set("X-Real-Ip", "127.0.0.1")
-			next.ServeHTTP(w, r)
-		})
-	}
-
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		host, _, err := net.SplitHostPort(r.RemoteAddr)
-		if err != nil {
-			panic(err) // this should never happen
-		}
-		r.Header.Set("X-Real-Ip", host)
+		r.Header.Set("X-Real-Ip", defaultIP)
 		next.ServeHTTP(w, r)
 	})
 }
@@ -78,128 +48,3 @@ func XForwardedForToXRealIP(next http.Handler) http.Handler {
 		next.ServeHTTP(w, r)
 	})
 }
-
-// XForwardedForUpdate sets or updates the X-Forwarded-For header, adding
-// the known remote address to an existing chain if present
-func XForwardedForUpdate(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		defer next.ServeHTTP(w, r)
-
-		pref := XFFComputePreferences{
-			StripPrivate:  true,
-			StripLoopback: true,
-			StripCGNAT:    true,
-			Flatten:       true,
-			StripLLU:      true,
-		}
-
-		remoteAddr := r.RemoteAddr
-		origXFFHeader := r.Header.Get("X-Forwarded-For")
-
-		if remoteAddr == "@" {
-			// remote is a unix socket
-			// do not touch chain
-			return
-		}
-
-		xffHeaderString, err := computeXFFHeader(remoteAddr, origXFFHeader, pref)
-		if err != nil {
-			slog.Debug("computing X-Forwarded-For header failed", "err", err)
-			return
-		}
-
-		if len(xffHeaderString) == 0 {
-			r.Header.Del("X-Forwarded-For")
-		} else {
-			r.Header.Set("X-Forwarded-For", xffHeaderString)
-		}
-	})
-}
-
-var (
-	ErrCantSplitHostParse = errors.New("internal: unable to net.SplitHostParse")
-	ErrCantParseRemoteIP  = errors.New("internal: unable to parse remote IP")
-)
-
-func computeXFFHeader(remoteAddr string, origXFFHeader string, pref XFFComputePreferences) (string, error) {
-	remoteIP, _, err := net.SplitHostPort(remoteAddr)
-	if err != nil {
-		return "", fmt.Errorf("%w: %w", ErrCantSplitHostParse, err)
-	}
-	parsedRemoteIP, err := netip.ParseAddr(remoteIP)
-	if err != nil {
-		return "", fmt.Errorf("%w: %w", ErrCantParseRemoteIP, err)
-	}
-
-	origForwardedList := make([]string, 0, 4)
-	if origXFFHeader != "" {
-		origForwardedList = strings.Split(origXFFHeader, ",")
-	}
-	origForwardedList = append(origForwardedList, parsedRemoteIP.String())
-	forwardedList := make([]string, 0, len(origForwardedList))
-	// this behavior is equivalent to
-	// ingress-nginx "compute-full-forwarded-for"
-	// https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#compute-full-forwarded-for
-	//
-	// this would be the correct place to strip and/or flatten this list
-	//
-	// strip - iterate backwards and eliminate configured trusted IPs
-	// flatten - only return the last element to avoid spoofing confusion
-	//
-	// many applications handle this in different ways, but
-	// generally they'd be expected to do these two things on
-	// their own end to find the first non-spoofed IP
-	for i := len(origForwardedList) - 1; i >= 0; i-- {
-		segmentIP, err := netip.ParseAddr(origForwardedList[i])
-		if err != nil {
-			// can't assess this element, so the remainder of the chain
-			// can't be trusted. not a fatal error, since anyone can
-			// spoof an XFF header
-			slog.Debug("failed to parse XFF segment", "err", err)
-			break
-		}
-		if pref.StripPrivate && segmentIP.IsPrivate() {
-			continue
-		}
-		if pref.StripLoopback && segmentIP.IsLoopback() {
-			continue
-		}
-		if pref.StripLLU && segmentIP.IsLinkLocalUnicast() {
-			continue
-		}
-		if pref.StripCGNAT && CGNat.Contains(segmentIP) {
-			continue
-		}
-		forwardedList = append([]string{segmentIP.String()}, forwardedList...)
-	}
-	var xffHeaderString string
-	if len(forwardedList) == 0 {
-		xffHeaderString = ""
-		return xffHeaderString, nil
-	}
-	if pref.Flatten {
-		xffHeaderString = forwardedList[len(forwardedList)-1]
-	} else {
-		xffHeaderString = strings.Join(forwardedList, ",")
-	}
-	return xffHeaderString, nil
-}
-
-// NoStoreCache sets the Cache-Control header to no-store for the response.
-func NoStoreCache(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Cache-Control", "no-store")
-		next.ServeHTTP(w, r)
-	})
-}
-
-// NoBrowsing prevents directory browsing by returning a 404 for any request that ends with a "/".
-func NoBrowsing(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if strings.HasSuffix(r.URL.Path, "/") {
-			http.NotFound(w, r)
-			return
-		}
-		next.ServeHTTP(w, r)
-	})
-}
--- a/internal/ogtags/cache.go
+++ b/internal/ogtags/cache.go
@@ -1,51 +0,0 @@
-package ogtags
-
-import (
-	"errors"
-	"log/slog"
-	"net/url"
-	"syscall"
-)
-
-// GetOGTags is the main function that retrieves Open Graph tags for a URL
-func (c *OGTagCache) GetOGTags(url *url.URL) (map[string]string, error) {
-	if url == nil {
-		return nil, errors.New("nil URL provided, cannot fetch OG tags")
-	}
-	urlStr := c.getTarget(url)
-	// Check cache first
-	if cachedTags := c.checkCache(urlStr); cachedTags != nil {
-		return cachedTags, nil
-	}
-
-	// Fetch HTML content
-	doc, err := c.fetchHTMLDocument(urlStr)
-	if errors.Is(err, syscall.ECONNREFUSED) {
-		slog.Debug("Connection refused, returning empty tags")
-		return nil, nil
-	} else if errors.Is(err, ErrOgHandled) {
-		// Error was handled in fetchHTMLDocument, return empty tags
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	// Extract OG tags
-	ogTags := c.extractOGTags(doc)
-
-	// Store in cache
-	c.cache.Set(urlStr, ogTags, c.ogTimeToLive)
-
-	return ogTags, nil
-}
-
-// checkCache checks if we have the tags cached and returns them if so
-func (c *OGTagCache) checkCache(urlStr string) map[string]string {
-	if cachedTags, ok := c.cache.Get(urlStr); ok {
-		slog.Debug("cache hit", "tags", cachedTags)
-		return cachedTags
-	}
-	slog.Debug("cache miss", "url", urlStr)
-	return nil
-}
--- a/internal/ogtags/cache_test.go
+++ b/internal/ogtags/cache_test.go
@@ -1,122 +0,0 @@
-package ogtags
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-	"time"
-)
-
-func TestCheckCache(t *testing.T) {
-	cache := NewOGTagCache("http://example.com", true, time.Minute)
-
-	// Set up test data
-	urlStr := "http://example.com/page"
-	expectedTags := map[string]string{
-		"og:title":       "Test Title",
-		"og:description": "Test Description",
-	}
-
-	// Test cache miss
-	tags := cache.checkCache(urlStr)
-	if tags != nil {
-		t.Errorf("expected nil tags on cache miss, got %v", tags)
-	}
-
-	// Manually add to cache
-	cache.cache.Set(urlStr, expectedTags, time.Minute)
-
-	// Test cache hit
-	tags = cache.checkCache(urlStr)
-	if tags == nil {
-		t.Fatal("expected non-nil tags on cache hit, got nil")
-	}
-
-	for key, expectedValue := range expectedTags {
-		if value, ok := tags[key]; !ok || value != expectedValue {
-			t.Errorf("expected %s: %s, got: %s", key, expectedValue, value)
-		}
-	}
-}
-
-func TestGetOGTags(t *testing.T) {
-	var loadCount int // Counter to track how many times the test route is loaded
-
-	// Create a test server to serve a sample HTML page with OG tags
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		loadCount++
-		if loadCount > 1 {
-			t.Fatalf("Test route loaded more than once, cache failed")
-		}
-		w.Header().Set("Content-Type", "text/html")
-		w.Write([]byte(`
-			<!DOCTYPE html>
-			<html>
-			<head>
-				<meta property="og:title" content="Test Title" />
-				<meta property="og:description" content="Test Description" />
-				<meta property="og:image" content="http://example.com/image.jpg" />
-			</head>
-			<body>
-				<p>Hello, world!</p>
-			</body>
-			</html>
-		`))
-	}))
-	defer ts.Close()
-
-	// Create an instance of OGTagCache with a short TTL for testing
-	cache := NewOGTagCache(ts.URL, true, 1*time.Minute)
-
-	// Parse the test server URL
-	parsedURL, err := url.Parse(ts.URL)
-	if err != nil {
-		t.Fatalf("failed to parse test server URL: %v", err)
-	}
-
-	// Test fetching OG tags from the test server
-	ogTags, err := cache.GetOGTags(parsedURL)
-	if err != nil {
-		t.Fatalf("failed to get OG tags: %v", err)
-	}
-
-	// Verify the fetched OG tags
-	expectedTags := map[string]string{
-		"og:title":       "Test Title",
-		"og:description": "Test Description",
-		"og:image":       "http://example.com/image.jpg",
-	}
-
-	for key, expectedValue := range expectedTags {
-		if value, ok := ogTags[key]; !ok || value != expectedValue {
-			t.Errorf("expected %s: %s, got: %s", key, expectedValue, value)
-		}
-	}
-
-	// Test fetching OG tags from the cache
-	ogTags, err = cache.GetOGTags(parsedURL)
-	if err != nil {
-		t.Fatalf("failed to get OG tags from cache: %v", err)
-	}
-
-	// Test fetching OG tags from the cache (3rd time)
-	newOgTags, err := cache.GetOGTags(parsedURL)
-	if err != nil {
-		t.Fatalf("failed to get OG tags from cache: %v", err)
-	}
-
-	// Verify the cached OG tags
-	for key, expectedValue := range expectedTags {
-		if value, ok := ogTags[key]; !ok || value != expectedValue {
-			t.Errorf("expected %s: %s, got: %s", key, expectedValue, value)
-		}
-
-		initialValue := ogTags[key]
-		cachedValue, ok := newOgTags[key]
-		if !ok || initialValue != cachedValue {
-			t.Errorf("Cache does not line up: expected %s: %s, got: %s", key, initialValue, cachedValue)
-		}
-
-	}
-}
--- a/internal/ogtags/fetch.go
+++ b/internal/ogtags/fetch.go
@@ -1,77 +0,0 @@
-package ogtags
-
-import (
-	"errors"
-	"fmt"
-	"golang.org/x/net/html"
-	"io"
-	"log/slog"
-	"mime"
-	"net"
-	"net/http"
-)
-
-var (
-	ErrOgHandled = errors.New("og: handled error") // used to indicate that the error was handled and should not be logged
-	emptyMap     = map[string]string{}             // used to indicate an empty result in the cache. Can't use nil as it would be a cache miss.
-)
-
-func (c *OGTagCache) fetchHTMLDocument(urlStr string) (*html.Node, error) {
-	resp, err := c.client.Get(urlStr)
-	if err != nil {
-		var netErr net.Error
-		if errors.As(err, &netErr) && netErr.Timeout() {
-			slog.Debug("og: request timed out", "url", urlStr)
-			c.cache.Set(urlStr, emptyMap, c.ogTimeToLive/2) // Cache empty result for half the TTL to not spam the server
-		}
-		return nil, fmt.Errorf("http get failed: %w", err)
-	}
-	// this defer will call MaxBytesReader's Close, which closes the original body.
-	defer func(Body io.ReadCloser) {
-		err := Body.Close()
-		if err != nil {
-			slog.Debug("og: error closing response body", "url", urlStr, "error", err)
-		}
-	}(resp.Body)
-
-	if resp.StatusCode != http.StatusOK {
-		slog.Debug("og: received non-OK status code", "url", urlStr, "status", resp.StatusCode)
-		c.cache.Set(urlStr, emptyMap, c.ogTimeToLive) // Cache empty result for non-successful status codes
-		return nil, fmt.Errorf("%w: page not found", ErrOgHandled)
-	}
-
-	// Check content type
-	ct := resp.Header.Get("Content-Type")
-	if ct == "" {
-		// assume non html body
-		return nil, fmt.Errorf("missing Content-Type header")
-	} else {
-		mediaType, _, err := mime.ParseMediaType(ct)
-		if err != nil {
-			// Malformed Content-Type header
-			slog.Debug("og: malformed Content-Type header", "url", urlStr, "contentType", ct)
-			return nil, fmt.Errorf("%w malformed Content-Type header: %w", ErrOgHandled, err)
-		}
-
-		if mediaType != "text/html" && mediaType != "application/xhtml+xml" {
-			slog.Debug("og: unsupported Content-Type", "url", urlStr, "contentType", mediaType)
-			return nil, fmt.Errorf("%w unsupported Content-Type: %s", ErrOgHandled, mediaType)
-		}
-	}
-
-	resp.Body = http.MaxBytesReader(nil, resp.Body, c.maxContentLength)
-
-	doc, err := html.Parse(resp.Body)
-	if err != nil {
-		// Check if the error is specifically because the limit was exceeded
-		var maxBytesErr *http.MaxBytesError
-		if errors.As(err, &maxBytesErr) {
-			slog.Debug("og: content exceeded max length", "url", urlStr, "limit", c.maxContentLength)
-			return nil, fmt.Errorf("content too large: exceeded %d bytes", c.maxContentLength)
-		}
-		// parsing error (e.g., malformed HTML)
-		return nil, fmt.Errorf("failed to parse HTML: %w", err)
-	}
-
-	return doc, nil
-}
--- a/internal/ogtags/fetch_test.go
+++ b/internal/ogtags/fetch_test.go
@@ -1,119 +0,0 @@
-package ogtags
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestFetchHTMLDocument(t *testing.T) {
-	tests := []struct {
-		name          string
-		htmlContent   string
-		contentType   string
-		statusCode    int
-		contentLength int64
-		expectError   bool
-	}{
-		{
-			name: "Valid HTML",
-			htmlContent: `<!DOCTYPE html>
-				<html>
-				<head><title>Test</title></head>
-				<body><p>Test content</p></body>
-				</html>`,
-			contentType: "text/html",
-			statusCode:  http.StatusOK,
-			expectError: false,
-		},
-		{
-			name:        "Empty HTML",
-			htmlContent: "",
-			contentType: "text/html",
-			statusCode:  http.StatusOK,
-			expectError: false,
-		},
-		{
-			name:        "Not found error",
-			htmlContent: "",
-			contentType: "text/html",
-			statusCode:  http.StatusNotFound,
-			expectError: true,
-		},
-		{
-			name:        "Unsupported Content-Type",
-			htmlContent: "*Insert rick roll here*",
-			contentType: "video/mp4",
-			statusCode:  http.StatusOK,
-			expectError: true,
-		},
-		{
-			name:          "Too large content",
-			contentType:   "text/html",
-			statusCode:    http.StatusOK,
-			expectError:   true,
-			contentLength: 5 * 1024 * 1024, // 5MB (over 2MB limit)
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				if tt.contentType != "" {
-					w.Header().Set("Content-Type", tt.contentType)
-				}
-				if tt.contentLength > 0 {
-					// Simulate content length but avoid sending too much actual data
-					w.Header().Set("Content-Length", fmt.Sprintf("%d", tt.contentLength))
-					io.CopyN(w, strings.NewReader("X"), tt.contentLength)
-				} else {
-					w.WriteHeader(tt.statusCode)
-					w.Write([]byte(tt.htmlContent))
-				}
-			}))
-			defer ts.Close()
-
-			cache := NewOGTagCache("", true, time.Minute)
-			doc, err := cache.fetchHTMLDocument(ts.URL)
-
-			if tt.expectError {
-				if err == nil {
-					t.Error("expected error, got nil")
-				}
-				if doc != nil {
-					t.Error("expected nil document on error, got non-nil")
-				}
-			} else {
-				if err != nil {
-					t.Errorf("unexpected error: %v", err)
-				}
-				if doc == nil {
-					t.Error("expected non-nil document, got nil")
-				}
-			}
-		})
-	}
-}
-
-func TestFetchHTMLDocumentInvalidURL(t *testing.T) {
-	if os.Getenv("DONT_USE_NETWORK") != "" {
-		t.Skip("test requires theoretical network egress")
-	}
-
-	cache := NewOGTagCache("", true, time.Minute)
-
-	doc, err := cache.fetchHTMLDocument("http://invalid.url.that.doesnt.exist.example")
-
-	if err == nil {
-		t.Error("expected error for invalid URL, got nil")
-	}
-
-	if doc != nil {
-		t.Error("expected nil document for invalid URL, got non-nil")
-	}
-}
--- a/internal/ogtags/integration_test.go
+++ b/internal/ogtags/integration_test.go
@@ -1,155 +0,0 @@
-package ogtags
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-	"time"
-)
-
-func TestIntegrationGetOGTags(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/html")
-
-		switch r.URL.Path {
-		case "/simple":
-			w.Write([]byte(`
-				<!DOCTYPE html>
-				<html>
-				<head>
-					<meta property="og:title" content="Simple Page" />
-					<meta property="og:type" content="website" />
-				</head>
-				<body><p>Simple page content</p></body>
-				</html>
-			`))
-		case "/complete":
-			w.Write([]byte(`
-				<!DOCTYPE html>
-				<html>
-				<head>
-					<meta property="og:title" content="Complete Page" />
-					<meta property="og:description" content="A page with many OG tags" />
-					<meta property="og:image" content="http://example.com/image.jpg" />
-					<meta property="og:url" content="http://example.com/complete" />
-					<meta property="og:type" content="article" />
-				</head>
-				<body><p>Complete page content</p></body>
-				</html>
-			`))
-		case "/no-og":
-			w.Write([]byte(`
-				<!DOCTYPE html>
-				<html>
-				<head>
-					<title>No OG Tags</title>
-				</head>
-				<body><p>No OG tags here</p></body>
-				</html>
-			`))
-		default:
-			w.WriteHeader(http.StatusNotFound)
-		}
-	}))
-	defer ts.Close()
-
-	// Test with different configurations
-	testCases := []struct {
-		name         string
-		path         string
-		query        string
-		expectedTags map[string]string
-		expectError  bool
-	}{
-		{
-			name:  "Simple page",
-			path:  "/simple",
-			query: "",
-			expectedTags: map[string]string{
-				"og:title": "Simple Page",
-				"og:type":  "website",
-			},
-			expectError: false,
-		},
-		{
-			name:  "Complete page",
-			path:  "/complete",
-			query: "ref=test",
-			expectedTags: map[string]string{
-				"og:title":       "Complete Page",
-				"og:description": "A page with many OG tags",
-				"og:image":       "http://example.com/image.jpg",
-				"og:url":         "http://example.com/complete",
-				"og:type":        "article",
-			},
-			expectError: false,
-		},
-		{
-			name:         "Page with no OG tags",
-			path:         "/no-og",
-			query:        "",
-			expectedTags: map[string]string{},
-			expectError:  false,
-		},
-		{
-			name:         "Non-existent page",
-			path:         "/not-found",
-			query:        "",
-			expectedTags: nil,
-			expectError:  false,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Create cache instance
-			cache := NewOGTagCache(ts.URL, true, 1*time.Minute)
-
-			// Create URL for test
-			testURL, _ := url.Parse(ts.URL)
-			testURL.Path = tc.path
-			testURL.RawQuery = tc.query
-
-			// Get OG tags
-			ogTags, err := cache.GetOGTags(testURL)
-
-			// Check error expectation
-			if tc.expectError {
-				if err == nil {
-					t.Error("expected error, got nil")
-				}
-				return
-			}
-
-			if err != nil {
-				t.Fatalf("unexpected error: %v", err)
-			}
-
-			// Verify all expected tags are present
-			for key, expectedValue := range tc.expectedTags {
-				if value, ok := ogTags[key]; !ok || value != expectedValue {
-					t.Errorf("expected %s: %s, got: %s", key, expectedValue, value)
-				}
-			}
-
-			// Verify no extra tags are present
-			if len(ogTags) != len(tc.expectedTags) {
-				t.Errorf("expected %d tags, got %d", len(tc.expectedTags), len(ogTags))
-			}
-
-			// Test cache retrieval
-			cachedOGTags, err := cache.GetOGTags(testURL)
-			if err != nil {
-				t.Fatalf("failed to get OG tags from cache: %v", err)
-			}
-
-			// Verify cached tags match
-			for key, expectedValue := range tc.expectedTags {
-				if value, ok := cachedOGTags[key]; !ok || value != expectedValue {
-					t.Errorf("cached value - expected %s: %s, got: %s", key, expectedValue, value)
-				}
-			}
-		})
-	}
-}
--- a/internal/ogtags/ogtags.go
+++ b/internal/ogtags/ogtags.go
@@ -1,51 +0,0 @@
-package ogtags
-
-import (
-	"net/http"
-	"net/url"
-	"time"
-
-	"github.com/TecharoHQ/anubis/decaymap"
-)
-
-type OGTagCache struct {
-	cache            *decaymap.Impl[string, map[string]string]
-	target           string
-	ogPassthrough    bool
-	ogTimeToLive     time.Duration
-	approvedTags     []string
-	approvedPrefixes []string
-	client           *http.Client
-	maxContentLength int64
-}
-
-func NewOGTagCache(target string, ogPassthrough bool, ogTimeToLive time.Duration) *OGTagCache {
-	// Predefined approved tags and prefixes
-	// In the future, these could come from configuration
-	defaultApprovedTags := []string{"description", "keywords", "author"}
-	defaultApprovedPrefixes := []string{"og:", "twitter:", "fediverse:"}
-	client := &http.Client{
-		Timeout: 5 * time.Second, /*make this configurable?*/
-	}
-
-	const maxContentLength = 16 << 20 // 16 MiB in bytes
-
-	return &OGTagCache{
-		cache:            decaymap.New[string, map[string]string](),
-		target:           target,
-		ogPassthrough:    ogPassthrough,
-		ogTimeToLive:     ogTimeToLive,
-		approvedTags:     defaultApprovedTags,
-		approvedPrefixes: defaultApprovedPrefixes,
-		client:           client,
-		maxContentLength: maxContentLength,
-	}
-}
-
-func (c *OGTagCache) getTarget(u *url.URL) string {
-	return c.target + u.Path
-}
-
-func (c *OGTagCache) Cleanup() {
-	c.cache.Cleanup()
-}
--- a/internal/ogtags/ogtags_test.go
+++ b/internal/ogtags/ogtags_test.go
@@ -1,100 +0,0 @@
-package ogtags
-
-import (
-	"net/url"
-	"testing"
-	"time"
-)
-
-func TestNewOGTagCache(t *testing.T) {
-	tests := []struct {
-		name          string
-		target        string
-		ogPassthrough bool
-		ogTimeToLive  time.Duration
-	}{
-		{
-			name:          "Basic initialization",
-			target:        "http://example.com",
-			ogPassthrough: true,
-			ogTimeToLive:  5 * time.Minute,
-		},
-		{
-			name:          "Empty target",
-			target:        "",
-			ogPassthrough: false,
-			ogTimeToLive:  10 * time.Minute,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cache := NewOGTagCache(tt.target, tt.ogPassthrough, tt.ogTimeToLive)
-
-			if cache == nil {
-				t.Fatal("expected non-nil cache, got nil")
-			}
-
-			if cache.target != tt.target {
-				t.Errorf("expected target %s, got %s", tt.target, cache.target)
-			}
-
-			if cache.ogPassthrough != tt.ogPassthrough {
-				t.Errorf("expected ogPassthrough %v, got %v", tt.ogPassthrough, cache.ogPassthrough)
-			}
-
-			if cache.ogTimeToLive != tt.ogTimeToLive {
-				t.Errorf("expected ogTimeToLive %v, got %v", tt.ogTimeToLive, cache.ogTimeToLive)
-			}
-		})
-	}
-}
-
-func TestGetTarget(t *testing.T) {
-	tests := []struct {
-		name     string
-		target   string
-		path     string
-		query    string
-		expected string
-	}{
-		{
-			name:     "No path or query",
-			target:   "http://example.com",
-			path:     "",
-			query:    "",
-			expected: "http://example.com",
-		},
-		{
-			name:     "With complex path",
-			target:   "http://example.com",
-			path:     "/pag(#*((#@)ΓΓΓΓe/Γ",
-			query:    "id=123",
-			expected: "http://example.com/pag(#*((#@)ΓΓΓΓe/Γ",
-		},
-		{
-			name:     "With query and path",
-			target:   "http://example.com",
-			path:     "/page",
-			query:    "id=123",
-			expected: "http://example.com/page",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			cache := NewOGTagCache(tt.target, false, time.Minute)
-
-			u := &url.URL{
-				Path:     tt.path,
-				RawQuery: tt.query,
-			}
-
-			result := cache.getTarget(u)
-
-			if result != tt.expected {
-				t.Errorf("expected %s, got %s", tt.expected, result)
-			}
-		})
-	}
-}
--- a/internal/ogtags/parse.go
+++ b/internal/ogtags/parse.go
@@ -1,81 +0,0 @@
-package ogtags
-
-import (
-	"strings"
-
-	"golang.org/x/net/html"
-)
-
-// extractOGTags traverses the HTML document and extracts approved Open Graph tags
-func (c *OGTagCache) extractOGTags(doc *html.Node) map[string]string {
-	ogTags := make(map[string]string)
-
-	var traverseNodes func(*html.Node)
-	traverseNodes = func(n *html.Node) {
-		// isOGMetaTag only checks if it's a <meta> tag.
-		// The actual filtering happens in extractMetaTagInfo now.
-		if isOGMetaTag(n) {
-			property, content := c.extractMetaTagInfo(n)
-			if property != "" {
-				ogTags[property] = content
-			}
-		}
-
-		for child := n.FirstChild; child != nil; child = child.NextSibling {
-			traverseNodes(child)
-		}
-	}
-
-	traverseNodes(doc)
-	return ogTags
-}
-
-// isOGMetaTag checks if a node is *any* meta tag
-func isOGMetaTag(n *html.Node) bool {
-	if n == nil {
-		return false
-	}
-	return n.Type == html.ElementNode && n.Data == "meta"
-}
-
-// extractMetaTagInfo extracts property and content from a meta tag
-// *and* checks if the property is approved.
-// Returns empty property string if the tag is not approved.
-func (c *OGTagCache) extractMetaTagInfo(n *html.Node) (property, content string) {
-	var rawProperty string // Store the property found before approval check
-
-	for _, attr := range n.Attr {
-		if attr.Key == "property" || attr.Key == "name" {
-			rawProperty = attr.Val
-		}
-		if attr.Key == "content" {
-			content = attr.Val
-		}
-	}
-
-	// Check if the rawProperty is approved
-	isApproved := false
-	for _, prefix := range c.approvedPrefixes {
-		if strings.HasPrefix(rawProperty, prefix) {
-			isApproved = true
-			break
-		}
-	}
-	// Check exact approved tags if not already approved by prefix
-	if !isApproved {
-		for _, tag := range c.approvedTags {
-			if rawProperty == tag {
-				isApproved = true
-				break
-			}
-		}
-	}
-
-	// Only return the property if it's approved
-	if isApproved {
-		property = rawProperty
-	}
-
-	// Content is returned regardless, but property will be "" if not approved
-	return property, content
-}
--- a/internal/ogtags/parse_test.go
+++ b/internal/ogtags/parse_test.go
@@ -1,295 +0,0 @@
-package ogtags
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/net/html"
-)
-
-// TestExtractOGTags updated with correct expectations based on filtering logic
-func TestExtractOGTags(t *testing.T) {
-	// Use a cache instance that reflects the default approved lists
-	testCache := NewOGTagCache("", false, time.Minute)
-	// Manually set approved tags/prefixes based on the user request for clarity
-	testCache.approvedTags = []string{"description"}
-	testCache.approvedPrefixes = []string{"og:"}
-
-	tests := []struct {
-		name     string
-		htmlStr  string
-		expected map[string]string
-	}{
-		{
-			name: "Basic OG tags", // Includes standard 'description' meta tag
-			htmlStr: `<!DOCTYPE html>
-				<html>
-				<head>
-					<meta property="og:title" content="Test Title" />
-					<meta property="og:description" content="Test Description" />
-					<meta name="description" content="Regular Description" />
-					<meta name="keywords" content="test, keyword" />
-				</head>
-				<body></body>
-				</html>`,
-			expected: map[string]string{
-				"og:title":       "Test Title",
-				"og:description": "Test Description",
-				"description":    "Regular Description",
-			},
-		},
-		{
-			name: "OG tags with name attribute",
-			htmlStr: `<!DOCTYPE html>
-				<html>
-				<head>
-					<meta name="og:title" content="Test Title" />
-					<meta property="og:description" content="Test Description" />
-					<meta name="twitter:card" content="summary" />
-				</head>
-				<body></body>
-				</html>`,
-			expected: map[string]string{
-				"og:title":       "Test Title",
-				"og:description": "Test Description",
-				// twitter:card is still not approved
-			},
-		},
-		{
-			name: "No approved OG tags", // Contains only standard 'description'
-			htmlStr: `<!DOCTYPE html>
-				<html>
-				<head>
-					<meta name="description" content="Test Description" />
-					<meta name="keywords" content="Test" />
-				</head>
-				<body></body>
-				</html>`,
-			expected: map[string]string{
-				"description": "Test Description",
-			},
-		},
-		{
-			name: "Empty content",
-			htmlStr: `<!DOCTYPE html>
-				<html>
-				<head>
-					<meta property="og:title" content="" />
-					<meta property="og:description" content="Test Description" />
-				</head>
-				<body></body>
-				</html>`,
-			expected: map[string]string{
-				"og:title":       "",
-				"og:description": "Test Description",
-			},
-		},
-		{
-			name: "Explicitly approved tag",
-			htmlStr: `<!DOCTYPE html>
-						<html>
-						<head>
-							<meta property="description" content="Approved Description Tag" />
-						</head>
-						<body></body>
-						</html>`,
-			expected: map[string]string{
-				// This is approved because "description" is in cache.approvedTags
-				"description": "Approved Description Tag",
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			doc, err := html.Parse(strings.NewReader(tt.htmlStr))
-			if err != nil {
-				t.Fatalf("failed to parse HTML: %v", err)
-			}
-
-			ogTags := testCache.extractOGTags(doc)
-
-			if !reflect.DeepEqual(ogTags, tt.expected) {
-				t.Errorf("expected %v, got %v", tt.expected, ogTags)
-			}
-		})
-	}
-}
-
-func TestIsOGMetaTag(t *testing.T) {
-	tests := []struct {
-		name       string
-		nodeHTML   string
-		targetNode string // Helper to find the right node in parsed fragment
-		expected   bool
-	}{
-		{
-			name:       "Meta OG tag",
-			nodeHTML:   `<meta property="og:title" content="Test">`,
-			targetNode: "meta",
-			expected:   true,
-		},
-		{
-			name:       "Regular meta tag",
-			nodeHTML:   `<meta name="description" content="Test">`,
-			targetNode: "meta",
-			expected:   true,
-		},
-		{
-			name:       "Not a meta tag",
-			nodeHTML:   `<div>Test</div>`,
-			targetNode: "div",
-			expected:   false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Wrap the partial HTML in basic structure for parsing
-			fullHTML := "<html><head>" + tt.nodeHTML + "</head><body></body></html>"
-			doc, err := html.Parse(strings.NewReader(fullHTML))
-			if err != nil {
-				t.Fatalf("failed to parse HTML: %v", err)
-			}
-
-			// Find the target element node (meta or div based on targetNode)
-			var node *html.Node
-			var findNode func(*html.Node)
-			findNode = func(n *html.Node) {
-				// Skip finding if already found
-				if node != nil {
-					return
-				}
-				// Check if current node matches type and tag data
-				if n.Type == html.ElementNode && n.Data == tt.targetNode {
-					node = n
-					return
-				}
-				// Recursively check children
-				for c := n.FirstChild; c != nil; c = c.NextSibling {
-					findNode(c)
-				}
-			}
-			findNode(doc) // Start search from root
-
-			if node == nil {
-				t.Fatalf("Could not find target node '%s' in test HTML", tt.targetNode)
-			}
-
-			// Call the function under test
-			result := isOGMetaTag(node)
-			if result != tt.expected {
-				t.Errorf("expected %v, got %v", tt.expected, result)
-			}
-		})
-	}
-}
-
-func TestExtractMetaTagInfo(t *testing.T) {
-	// Use a cache instance that reflects the default approved lists
-	testCache := NewOGTagCache("", false, time.Minute)
-	testCache.approvedTags = []string{"description"}
-	testCache.approvedPrefixes = []string{"og:"}
-
-	tests := []struct {
-		name             string
-		nodeHTML         string
-		expectedProperty string
-		expectedContent  string
-	}{
-		{
-			name:             "OG title with property (approved by prefix)",
-			nodeHTML:         `<meta property="og:title" content="Test Title">`,
-			expectedProperty: "og:title",
-			expectedContent:  "Test Title",
-		},
-		{
-			name:             "OG description with name (approved by prefix)",
-			nodeHTML:         `<meta name="og:description" content="Test Description">`,
-			expectedProperty: "og:description",
-			expectedContent:  "Test Description",
-		},
-		{
-			name:             "Regular meta tag (name=description, approved by exact match)", // Updated name for clarity
-			nodeHTML:         `<meta name="description" content="Test Description">`,
-			expectedProperty: "description",
-			expectedContent:  "Test Description",
-		},
-		{
-			name:             "Regular meta tag (name=keywords, not approved)",
-			nodeHTML:         `<meta name="keywords" content="Test Keywords">`,
-			expectedProperty: "",
-			expectedContent:  "Test Keywords",
-		},
-		{
-			name:             "Twitter tag (not approved by default)",
-			nodeHTML:         `<meta name="twitter:card" content="summary">`,
-			expectedProperty: "",
-			expectedContent:  "summary",
-		},
-		{
-			name:             "No content (but approved property)",
-			nodeHTML:         `<meta property="og:title">`,
-			expectedProperty: "og:title",
-			expectedContent:  "",
-		},
-		{
-			name:             "No property/name attribute",
-			nodeHTML:         `<meta content="No property">`,
-			expectedProperty: "",
-			expectedContent:  "No property",
-		},
-		{
-			name:             "Explicitly approved tag with property attribute",
-			nodeHTML:         `<meta property="description" content="Approved Description Tag">`,
-			expectedProperty: "description", // Approved by exact match in approvedTags
-			expectedContent:  "Approved Description Tag",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			fullHTML := "<html><head>" + tt.nodeHTML + "</head><body></body></html>"
-			doc, err := html.Parse(strings.NewReader(fullHTML))
-			if err != nil {
-				t.Fatalf("failed to parse HTML: %v", err)
-			}
-
-			var node *html.Node
-			var findMetaNode func(*html.Node)
-			findMetaNode = func(n *html.Node) {
-				if node != nil { // Stop searching once found
-					return
-				}
-				if n.Type == html.ElementNode && n.Data == "meta" {
-					node = n
-					return
-				}
-				for c := n.FirstChild; c != nil; c = c.NextSibling {
-					findMetaNode(c)
-				}
-			}
-			findMetaNode(doc) // Start search from root
-
-			if node == nil {
-				// Handle cases where the input might not actually contain a meta tag, though all test cases do.
-				// If the test case is *designed* not to have a meta tag, this check should be different.
-				// But for these tests, failure to find implies an issue with the test setup or parser.
-				t.Fatalf("Could not find meta node in test HTML: %s", tt.nodeHTML)
-			}
-
-			// Call extractMetaTagInfo using the test cache instance
-			property, content := testCache.extractMetaTagInfo(node)
-
-			if property != tt.expectedProperty {
-				t.Errorf("expected property '%s', got '%s'", tt.expectedProperty, property)
-			}
-
-			if content != tt.expectedContent {
-				t.Errorf("expected content '%s', got '%s'", tt.expectedContent, content)
-			}
-		})
-	}
-}
--- a/internal/test/playwright_test.go
+++ b/internal/test/playwright_test.go
@@ -1,5 +1,3 @@
-//go:build !windows
-
 // Integration tests for Anubis, using Playwright.
 //
 // These tests require an already running Anubis and Playwright server.
@@ -18,13 +16,11 @@ package test
 import (
 	"flag"
 	"fmt"
-	"net"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"os"
 	"os/exec"
-	"strconv"
 	"testing"
 	"time"

@@ -34,8 +30,9 @@ import (
 )

 var (
-	playwrightPort        = flag.Int("playwright-port", 9001, "Playwright port")
-	playwrightServer      = flag.String("playwright", "ws://localhost:9001", "Playwright server URL")
+	serverBindAddr        = flag.String("bind", "localhost:3923", "test server bind address")
+	playwrightPort        = flag.Int("playwright-port", 3000, "Playwright port")
+	playwrightServer      = flag.String("playwright", "ws://localhost:3000", "Playwright server URL")
 	playwrightMaxTime     = flag.Duration("playwright-max-time", 5*time.Second, "maximum time for Playwright requests")
 	playwrightMaxHardTime = flag.Duration("playwright-max-hard-time", 5*time.Minute, "maximum time for hard Playwright requests")

@@ -52,24 +49,6 @@ var (
 			realIP:    placeholderIP,
 			userAgent: "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) HeadlessChrome/120.0.6099.28 Safari/537.36",
 		},
-		{
-			name:      "Amazonbot",
-			action:    actionDeny,
-			realIP:    placeholderIP,
-			userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/8.0.2 Safari/600.2.5 (Amazonbot/0.1; +https://developer.amazon.com/support/amazonbot)",
-		},
-		{
-			name:      "Amazonbot",
-			action:    actionDeny,
-			realIP:    placeholderIP,
-			userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/600.2.5 (KHTML, like Gecko) Version/8.0.2 Safari/600.2.5 (Amazonbot/0.1; +https://developer.amazon.com/support/amazonbot)",
-		},
-		{
-			name:      "PerplexityAI",
-			action:    actionDeny,
-			realIP:    placeholderIP,
-			userAgent: "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko; compatible; PerplexityBot/1.0; +https://perplexity.ai/perplexitybot)",
-		},
 		{
 			name:      "kagiBadIP",
 			action:    actionChallenge,
@@ -98,7 +77,7 @@ const (
 	actionChallenge action = "CHALLENGE"

 	placeholderIP     = "fd11:5ee:bad:c0de::"
-	playwrightVersion = "1.51.1"
+	playwrightVersion = "1.50.1"
 )

 type action string
@@ -119,9 +98,6 @@ func doesNPXExist(t *testing.T) {
 }

 func run(t *testing.T, command string) string {
-	if testing.Short() {
-		t.Skip("skipping integration smoke testing in short mode")
-	}
 	t.Helper()

 	shPath, err := exec.LookPath("sh")
@@ -245,17 +221,17 @@ func TestPlaywrightBrowser(t *testing.T) {
 					t.Skip("skipping hard challenge with deadline")
 				}

-				var performedAction action
+				var perfomedAction action
 				var err error
 				for i := 0; i < 5; i++ {
-					performedAction, err = executeTestCase(t, tc, typ, anubisURL)
-					if performedAction == tc.action {
+					perfomedAction, err = executeTestCase(t, tc, typ, anubisURL)
+					if perfomedAction == tc.action {
 						break
 					}
 					time.Sleep(time.Duration(i+1) * 250 * time.Millisecond)
 				}
-				if performedAction != tc.action {
-					t.Errorf("unexpected test result, expected %s, got %s", tc.action, performedAction)
+				if perfomedAction != tc.action {
+					t.Errorf("unexpected test result, expected %s, got %s", tc.action, perfomedAction)
 				}
 				if err != nil {
 					t.Fatalf("test error: %v", err)
@@ -265,132 +241,6 @@ func TestPlaywrightBrowser(t *testing.T) {
 	}
 }

-func TestPlaywrightWithBasePrefix(t *testing.T) {
-	if os.Getenv("DONT_USE_NETWORK") != "" {
-		t.Skip("test requires network egress")
-		return
-	}
-
-	t.Skip("NOTE(Xe)\\ these tests require HTTPS support in #364")
-
-	doesNPXExist(t)
-	startPlaywright(t)
-
-	pw := setupPlaywright(t)
-	basePrefix := "/myapp"
-	anubisURL := spawnAnubisWithOptions(t, basePrefix)
-
-	// Reset BasePrefix after test
-	t.Cleanup(func() {
-		anubis.BasePrefix = ""
-	})
-
-	browsers := []playwright.BrowserType{pw.Chromium}
-
-	for _, typ := range browsers {
-		t.Run(typ.Name()+"/basePrefix", func(t *testing.T) {
-			browser, err := typ.Connect(buildBrowserConnect(typ.Name()), playwright.BrowserTypeConnectOptions{
-				ExposeNetwork: playwright.String("<loopback>"),
-			})
-			if err != nil {
-				t.Fatalf("could not connect to remote browser: %v", err)
-			}
-			defer browser.Close()
-
-			ctx, err := browser.NewContext(playwright.BrowserNewContextOptions{
-				AcceptDownloads: playwright.Bool(false),
-				ExtraHttpHeaders: map[string]string{
-					"X-Real-Ip": "127.0.0.1",
-				},
-				UserAgent: playwright.String("Mozilla/5.0 (X11; Linux x86_64; rv:136.0) Gecko/20100101 Firefox/136.0"),
-			})
-			if err != nil {
-				t.Fatalf("could not create context: %v", err)
-			}
-			defer ctx.Close()
-
-			page, err := ctx.NewPage()
-			if err != nil {
-				t.Fatalf("could not create page: %v", err)
-			}
-			defer page.Close()
-
-			// Test accessing the base URL with prefix
-			_, err = page.Goto(anubisURL+basePrefix, playwright.PageGotoOptions{
-				Timeout: pwTimeout(testCases[0], time.Now().Add(5*time.Second)),
-			})
-			if err != nil {
-				pwFail(t, page, "could not navigate to test server with base prefix: %v", err)
-			}
-
-			// Check if challenge page is displayed
-			image := page.Locator("#image[src*=pensive], #image[src*=happy]")
-			err = image.WaitFor(playwright.LocatorWaitForOptions{
-				Timeout: pwTimeout(testCases[0], time.Now().Add(5*time.Second)),
-			})
-			if err != nil {
-				pwFail(t, page, "could not wait for challenge image: %v", err)
-			}
-
-			isVisible, err := image.IsVisible()
-			if err != nil {
-				pwFail(t, page, "could not check if challenge image is visible: %v", err)
-			}
-			if !isVisible {
-				pwFail(t, page, "challenge image not visible")
-			}
-
-			// Complete the challenge
-			// Wait for the challenge to be solved
-			anubisTest := page.Locator("#anubis-test")
-			err = anubisTest.WaitFor(playwright.LocatorWaitForOptions{
-				Timeout: pwTimeout(testCases[0], time.Now().Add(30*time.Second)),
-			})
-			if err != nil {
-				pwFail(t, page, "could not wait for challenge to be solved: %v", err)
-			}
-
-			// Verify the challenge was solved
-			content, err := anubisTest.TextContent(playwright.LocatorTextContentOptions{})
-			if err != nil {
-				pwFail(t, page, "could not get text content: %v", err)
-			}
-
-			var tm int64
-			if _, err := fmt.Sscanf(content, "%d", &tm); err != nil {
-				pwFail(t, page, "unexpected output: %s", content)
-			}
-
-			// Check if the timestamp is reasonable
-			now := time.Now().Unix()
-			if tm < now-60 || tm > now+60 {
-				pwFail(t, page, "unexpected timestamp in output: %d not in range %d±60", tm, now)
-			}
-
-			// Check if cookie has the correct path
-			cookies, err := ctx.Cookies()
-			if err != nil {
-				pwFail(t, page, "could not get cookies: %v", err)
-			}
-
-			var found bool
-			for _, cookie := range cookies {
-				if cookie.Name == anubis.CookieName {
-					found = true
-					if cookie.Path != basePrefix+"/" {
-						t.Errorf("cookie path is wrong, wanted %s, got: %s", basePrefix+"/", cookie.Path)
-					}
-					break
-				}
-			}
-
-			if !found {
-				t.Errorf("Cookie %q not found", anubis.CookieName)
-			}
-		})
-	}
-}
-
 func buildBrowserConnect(name string) string {
 	u, _ := url.Parse(*playwrightServer)

@@ -504,14 +354,14 @@ func pwFail(t *testing.T, page playwright.Page, format string, args ...any) erro
 }

 func pwTimeout(tc testCase, deadline time.Time) *float64 {
-	maxTime := *playwrightMaxTime
+	max := *playwrightMaxTime
 	if tc.isHard {
-		maxTime = *playwrightMaxHardTime
+		max = *playwrightMaxHardTime
 	}

 	d := time.Until(deadline)
-	if d <= 0 || d > maxTime {
-		return playwright.Float(float64(maxTime.Milliseconds()))
+	if d <= 0 || d > max {
+		return playwright.Float(float64(max.Milliseconds()))
 	}
 	return playwright.Float(float64(d.Milliseconds()))
 }
@@ -557,10 +407,6 @@ func setupPlaywright(t *testing.T) *playwright.Playwright {
 }

 func spawnAnubis(t *testing.T) string {
-	return spawnAnubisWithOptions(t, "")
-}
-
-func spawnAnubisWithOptions(t *testing.T, basePrefix string) string {
 	t.Helper()

 	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -573,31 +419,16 @@ func spawnAnubisWithOptions(t *testing.T, basePrefix string) string {
 		t.Fatal(err)
 	}

-	listener, err := net.Listen("tcp", ":0")
-	if err != nil {
-		t.Fatalf("can't listen on random port: %v", err)
-	}
-
-	addr := listener.Addr().(*net.TCPAddr)
-	host := "localhost"
-	port := strconv.Itoa(addr.Port)
-
 	s, err := libanubis.New(libanubis.Options{
 		Next:           h,
 		Policy:         policy,
 		ServeRobotsTXT: true,
-		Target:         "http://" + host + ":" + port,
-		BasePrefix:     basePrefix,
 	})
 	if err != nil {
 		t.Fatalf("can't construct libanubis.Server: %v", err)
 	}

-	ts := &httptest.Server{
-		Listener: listener,
-		Config:   &http.Server{Handler: s},
-	}
-	ts.Start()
+	ts := httptest.NewServer(s)
 	t.Log(ts.URL)

 	t.Cleanup(func() {
--- a/internal/xff_test.go
+++ b/internal/xff_test.go
@@ -1,166 +0,0 @@
-package internal
-
-import (
-	"errors"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-)
-
-func TestXForwardedForUpdateIgnoreUnix(t *testing.T) {
-	var remoteAddr = ""
-	var xff = ""
-
-	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		remoteAddr = r.RemoteAddr
-		xff = r.Header.Get("X-Forwarded-For")
-		w.WriteHeader(http.StatusOK)
-	})
-
-	r := httptest.NewRequest(http.MethodGet, "/", nil)
-
-	r.RemoteAddr = "@"
-
-	w := httptest.NewRecorder()
-
-	XForwardedForUpdate(h).ServeHTTP(w, r)
-
-	if r.RemoteAddr != remoteAddr {
-		t.Errorf("wanted remoteAddr to be %s, got: %s", r.RemoteAddr, remoteAddr)
-	}
-
-	if xff != "" {
-		t.Error("handler added X-Forwarded-For when it should not have")
-	}
-}
-
-func TestXForwardedForUpdateAddToChain(t *testing.T) {
-	var xff = ""
-	const expected = "1.1.1.1"
-
-	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		xff = r.Header.Get("X-Forwarded-For")
-		w.WriteHeader(http.StatusOK)
-	})
-
-	srv := httptest.NewServer(XForwardedForUpdate(h))
-
-	r, err := http.NewRequest(http.MethodGet, srv.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r.Header.Set("X-Forwarded-For", "1.1.1.1,10.20.30.40")
-
-	if _, err := srv.Client().Do(r); err != nil {
-		t.Fatal(err)
-	}
-
-	if xff != expected {
-		t.Logf("expected: %s", expected)
-		t.Logf("got:      %s", xff)
-		t.Error("X-Forwarded-For header was not what was expected")
-	}
-}
-
-func TestComputeXFFHeader(t *testing.T) {
-	for _, tt := range []struct {
-		name          string
-		remoteAddr    string
-		origXFFHeader string
-		pref          XFFComputePreferences
-		result        string
-		err           error
-	}{
-		{
-			name:          "StripPrivate",
-			remoteAddr:    "127.0.0.1:80",
-			origXFFHeader: "1.1.1.1,10.0.0.1",
-			pref: XFFComputePreferences{
-				StripPrivate: true,
-			},
-			result: "1.1.1.1,127.0.0.1",
-		},
-		{
-			name:          "StripLoopback",
-			remoteAddr:    "127.0.0.1:80",
-			origXFFHeader: "1.1.1.1,10.0.0.1,127.0.0.1",
-			pref: XFFComputePreferences{
-				StripLoopback: true,
-			},
-			result: "1.1.1.1,10.0.0.1",
-		},
-		{
-			name:          "StripCGNAT",
-			remoteAddr:    "100.64.0.1:80",
-			origXFFHeader: "1.1.1.1,10.0.0.1,100.64.0.1",
-			pref: XFFComputePreferences{
-				StripCGNAT: true,
-			},
-			result: "1.1.1.1,10.0.0.1",
-		},
-		{
-			name:          "StripLinkLocalUnicastIPv4",
-			remoteAddr:    "169.254.0.1:80",
-			origXFFHeader: "1.1.1.1,10.0.0.1,169.254.0.1",
-			pref: XFFComputePreferences{
-				StripLLU: true,
-			},
-			result: "1.1.1.1,10.0.0.1",
-		},
-		{
-			name:          "StripLinkLocalUnicastIPv6",
-			remoteAddr:    "169.254.0.1:80",
-			origXFFHeader: "1.1.1.1,10.0.0.1,fe80::",
-			pref: XFFComputePreferences{
-				StripLLU: true,
-			},
-			result: "1.1.1.1,10.0.0.1",
-		},
-		{
-			name:          "Flatten",
-			remoteAddr:    "127.0.0.1:80",
-			origXFFHeader: "1.1.1.1,10.0.0.1,fe80::,100.64.0.1,169.254.0.1",
-			pref: XFFComputePreferences{
-				StripPrivate:  true,
-				StripLoopback: true,
-				StripCGNAT:    true,
-				StripLLU:      true,
-				Flatten:       true,
-			},
-			result: "1.1.1.1",
-		},
-		{
-			name:       "invalid-ip-port",
-			remoteAddr: "fe80::",
-			err:        ErrCantSplitHostParse,
-		},
-		{
-			name:       "invalid-remote-ip",
-			remoteAddr: "anubis:80",
-			err:        ErrCantParseRemoteIP,
-		},
-		{
-			name:       "no-xff-dont-panic",
-			remoteAddr: "127.0.0.1:80",
-			pref: XFFComputePreferences{
-				StripPrivate:  true,
-				StripLoopback: true,
-				StripCGNAT:    true,
-				StripLLU:      true,
-				Flatten:       true,
-			},
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := computeXFFHeader(tt.remoteAddr, tt.origXFFHeader, tt.pref)
-			if err != nil && !errors.Is(err, tt.err) {
-				t.Errorf("computeXFFHeader got the wrong error, wanted %v but got: %v", tt.err, err)
-			}
-
-			if result != tt.result {
-				t.Errorf("computeXFFHeader returned the wrong result, wanted %q but got: %q", tt.result, result)
-			}
-		})
-	}
-}
--- a/lib/anubis.go
+++ b/lib/anubis.go
@@ -8,13 +8,12 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log"
 	"log/slog"
 	"math"
 	"net"
 	"net/http"
-	"net/url"
 	"os"
-	"slices"
 	"strconv"
 	"strings"
 	"time"
@@ -29,7 +28,6 @@ import (
 	"github.com/TecharoHQ/anubis/decaymap"
 	"github.com/TecharoHQ/anubis/internal"
 	"github.com/TecharoHQ/anubis/internal/dnsbl"
-	"github.com/TecharoHQ/anubis/internal/ogtags"
 	"github.com/TecharoHQ/anubis/lib/policy"
 	"github.com/TecharoHQ/anubis/lib/policy/config"
 	"github.com/TecharoHQ/anubis/web"
@@ -65,22 +63,14 @@ var (
 )

 type Options struct {
-	Next            http.Handler
-	Policy          *policy.ParsedConfig
-	RedirectDomains []string
-	ServeRobotsTXT  bool
-	PrivateKey      ed25519.PrivateKey
+	Next           http.Handler
+	Policy         *policy.ParsedConfig
+	ServeRobotsTXT bool
+	PrivateKey     ed25519.PrivateKey

 	CookieDomain      string
 	CookieName        string
 	CookiePartitioned bool
-
-	OGPassthrough bool
-	OGTimeToLive  time.Duration
-	Target        string
-
-	WebmasterEmail string
-	BasePrefix     string
 }

 func LoadPoliciesOrDefault(fname string, defaultDifficulty int) (*policy.ParsedConfig, error) {
@@ -93,23 +83,18 @@ func LoadPoliciesOrDefault(fname string, defaultDifficulty int) (*policy.ParsedC
 			return nil, fmt.Errorf("can't parse policy file %s: %w", fname, err)
 		}
 	} else {
-		fname = "(data)/botPolicies.yaml"
-		fin, err = data.BotPolicies.Open("botPolicies.yaml")
+		fname = "(data)/botPolicies.json"
+		fin, err = data.BotPolicies.Open("botPolicies.json")
 		if err != nil {
 			return nil, fmt.Errorf("[unexpected] can't parse builtin policy file %s: %w", fname, err)
 		}
 	}

-	defer func(fin io.ReadCloser) {
-		err := fin.Close()
-		if err != nil {
-			slog.Error("failed to close policy file", "file", fname, "err", err)
-		}
-	}(fin)
+	defer fin.Close()

-	anubisPolicy, err := policy.ParseConfig(fin, fname, defaultDifficulty)
+	policy, err := policy.ParseConfig(fin, fname, defaultDifficulty)

-	return anubisPolicy, err
+	return policy, err
 }

 func New(opts Options) (*Server, error) {
@@ -122,8 +107,6 @@ func New(opts Options) (*Server, error) {
 		opts.PrivateKey = priv
 	}

-	anubis.BasePrefix = opts.BasePrefix
-
 	result := &Server{
 		next:       opts.Next,
 		priv:       opts.PrivateKey,
@@ -131,48 +114,30 @@ func New(opts Options) (*Server, error) {
 		policy:     opts.Policy,
 		opts:       opts,
 		DNSBLCache: decaymap.New[string, dnsbl.DroneBLResponse](),
-		OGTags:     ogtags.NewOGTagCache(opts.Target, opts.OGPassthrough, opts.OGTimeToLive),
 	}

 	mux := http.NewServeMux()
 	xess.Mount(mux)

-	// Helper to add global prefix
-	registerWithPrefix := func(pattern string, handler http.Handler, method string) {
-		if method != "" {
-			method = method + " " // methods must end with a space to register with them
-		}
-
-		// Ensure there's no double slash when concatenating BasePrefix and pattern
-		basePrefix := strings.TrimSuffix(anubis.BasePrefix, "/")
-		prefix := method + basePrefix
-
-		// If pattern doesn't start with a slash, add one
-		if !strings.HasPrefix(pattern, "/") {
-			pattern = "/" + pattern
-		}
-
-		mux.Handle(prefix+pattern, handler)
-	}
-
-	// Ensure there's no double slash when concatenating BasePrefix and StaticPath
-	stripPrefix := strings.TrimSuffix(anubis.BasePrefix, "/") + anubis.StaticPath
-	registerWithPrefix(anubis.StaticPath, internal.UnchangingCache(internal.NoBrowsing(http.StripPrefix(stripPrefix, http.FileServerFS(web.Static)))), "")
+	mux.Handle(anubis.StaticPath, internal.UnchangingCache(http.StripPrefix(anubis.StaticPath, http.FileServerFS(web.Static))))

 	if opts.ServeRobotsTXT {
-		registerWithPrefix("/robots.txt", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		mux.HandleFunc("/robots.txt", func(w http.ResponseWriter, r *http.Request) {
 			http.ServeFileFS(w, r, web.Static, "static/robots.txt")
-		}), "GET")
-		registerWithPrefix("/.well-known/robots.txt", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		})
+
+		mux.HandleFunc("/.well-known/robots.txt", func(w http.ResponseWriter, r *http.Request) {
 			http.ServeFileFS(w, r, web.Static, "static/robots.txt")
-		}), "GET")
+		})
 	}

-	registerWithPrefix(anubis.APIPrefix+"make-challenge", http.HandlerFunc(result.MakeChallenge), "POST")
-	registerWithPrefix(anubis.APIPrefix+"pass-challenge", http.HandlerFunc(result.PassChallenge), "GET")
-	registerWithPrefix(anubis.APIPrefix+"check", http.HandlerFunc(result.maybeReverseProxyHttpStatusOnly), "")
-	registerWithPrefix(anubis.APIPrefix+"test-error", http.HandlerFunc(result.TestError), "GET")
-	registerWithPrefix("/", http.HandlerFunc(result.maybeReverseProxyOrPage), "")
+	// mux.HandleFunc("GET /.within.website/x/cmd/anubis/static/js/main.mjs", serveMainJSWithBestEncoding)
+
+	mux.HandleFunc("POST /.within.website/x/cmd/anubis/api/make-challenge", result.MakeChallenge)
+	mux.HandleFunc("GET /.within.website/x/cmd/anubis/api/pass-challenge", result.PassChallenge)
+	mux.HandleFunc("GET /.within.website/x/cmd/anubis/api/test-error", result.TestError)
+
+	mux.HandleFunc("/", result.MaybeReverseProxy)

 	result.mux = mux

@@ -187,47 +152,16 @@ type Server struct {
 	policy     *policy.ParsedConfig
 	opts       Options
 	DNSBLCache *decaymap.Impl[string, dnsbl.DroneBLResponse]
-	OGTags     *ogtags.OGTagCache
 }

 func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	s.mux.ServeHTTP(w, r)
 }

-func (s *Server) ServeHTTPNext(w http.ResponseWriter, r *http.Request) {
-	if s.next == nil {
-		redir := r.FormValue("redir")
-		urlParsed, err := r.URL.Parse(redir)
-		if err != nil {
-			templ.Handler(web.Base("Oh noes!", web.ErrorPage("Redirect URL not parseable", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-			return
-		}
-
-		if len(urlParsed.Host) > 0 && len(s.opts.RedirectDomains) != 0 && !slices.Contains(s.opts.RedirectDomains, urlParsed.Host) {
-			templ.Handler(web.Base("Oh noes!", web.ErrorPage("Redirect domain not allowed", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-			return
-		} else if urlParsed.Host != r.URL.Host {
-			templ.Handler(web.Base("Oh noes!", web.ErrorPage("Redirect domain not allowed", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-			return
-		}
-
-		if redir != "" {
-			http.Redirect(w, r, redir, http.StatusFound)
-			return
-		}
-
-		templ.Handler(
-			web.Base("You are not a bot!", web.StaticHappy()),
-		).ServeHTTP(w, r)
-	} else {
-		s.next.ServeHTTP(w, r)
-	}
-}
-
 func (s *Server) challengeFor(r *http.Request, difficulty int) string {
 	fp := sha256.Sum256(s.priv.Seed())

-	challengeData := fmt.Sprintf(
+	data := fmt.Sprintf(
 		"Accept-Language=%s,X-Real-IP=%s,User-Agent=%s,WeekTime=%s,Fingerprint=%x,Difficulty=%d",
 		r.Header.Get("Accept-Language"),
 		r.Header.Get("X-Real-Ip"),
@@ -236,18 +170,10 @@ func (s *Server) challengeFor(r *http.Request, difficulty int) string {
 		fp,
 		difficulty,
 	)
-	return internal.SHA256sum(challengeData)
+	return internal.SHA256sum(data)
 }

-func (s *Server) maybeReverseProxyHttpStatusOnly(w http.ResponseWriter, r *http.Request) {
-	s.maybeReverseProxy(w, r, true)
-}
-
-func (s *Server) maybeReverseProxyOrPage(w http.ResponseWriter, r *http.Request) {
-	s.maybeReverseProxy(w, r, false)
-}
-
-func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request, httpStatusOnly bool) {
+func (s *Server) MaybeReverseProxy(w http.ResponseWriter, r *http.Request) {
 	lg := slog.With(
 		"user_agent", r.UserAgent(),
 		"accept_language", r.Header.Get("Accept-Language"),
@@ -260,14 +186,14 @@ func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request, httpS
 	cr, rule, err := s.check(r)
 	if err != nil {
 		lg.Error("check failed", "err", err)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Internal Server Error: administrator has misconfigured Anubis. Please contact the administrator and ask them to look for the logs around \"maybeReverseProxy\"", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Internal Server Error: administrator has misconfigured Anubis. Please contact the administrator and ask them to look for the logs around \"maybeReverseProxy\"")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

 	r.Header.Add("X-Anubis-Rule", cr.Name)
 	r.Header.Add("X-Anubis-Action", string(cr.Rule))
 	lg = lg.With("check_result", cr)
-	policy.Applications.WithLabelValues(cr.Name, string(cr.Rule)).Add(1)
+	policy.PolicyApplications.WithLabelValues(cr.Name, string(cr.Rule)).Add(1)

 	ip := r.Header.Get("X-Real-Ip")

@@ -285,7 +211,7 @@ func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request, httpS

 		if resp != dnsbl.AllGood {
 			lg.Info("DNSBL hit", "status", resp.String())
-			templ.Handler(web.Base("Oh noes!", web.ErrorPage(fmt.Sprintf("DroneBL reported an entry: %s, see https://dronebl.org/lookup?ip=%s", resp.String(), ip), s.opts.WebmasterEmail)), templ.WithStatus(http.StatusOK)).ServeHTTP(w, r)
+			templ.Handler(web.Base("Oh noes!", web.ErrorPage(fmt.Sprintf("DroneBL reported an entry: %s, see https://dronebl.org/lookup?ip=%s", resp.String(), ip))), templ.WithStatus(http.StatusOK)).ServeHTTP(w, r)
 			return
 		}
 	}
@@ -293,30 +219,30 @@ func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request, httpS
 	switch cr.Rule {
 	case config.RuleAllow:
 		lg.Debug("allowing traffic to origin (explicit)")
-		s.ServeHTTPNext(w, r)
+		s.next.ServeHTTP(w, r)
 		return
 	case config.RuleDeny:
 		s.ClearCookie(w)
 		lg.Info("explicit deny")
 		if rule == nil {
 			lg.Error("rule is nil, cannot calculate checksum")
-			templ.Handler(web.Base("Oh noes!", web.ErrorPage("Other internal server error (contact the admin)", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+			templ.Handler(web.Base("Oh noes!", web.ErrorPage("Other internal server error (contact the admin)")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+			return
+		}
+		hash, err := rule.Hash()
+		if err != nil {
+			lg.Error("can't calculate checksum of rule", "err", err)
+			templ.Handler(web.Base("Oh noes!", web.ErrorPage("Other internal server error (contact the admin)")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 			return
 		}
-		hash := rule.Hash()
-
 		lg.Debug("rule hash", "hash", hash)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage(fmt.Sprintf("Access Denied: error code %s", hash), s.opts.WebmasterEmail)), templ.WithStatus(http.StatusOK)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage(fmt.Sprintf("Access Denied: error code %s", hash))), templ.WithStatus(http.StatusOK)).ServeHTTP(w, r)
 		return
 	case config.RuleChallenge:
 		lg.Debug("challenge requested")
-	case config.RuleBenchmark:
-		lg.Debug("serving benchmark page")
-		s.RenderBench(w, r)
-		return
 	default:
 		s.ClearCookie(w)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Other internal server error (contact the admin)", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Other internal server error (contact the admin)")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

@@ -324,21 +250,21 @@ func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request, httpS
 	if err != nil {
 		lg.Debug("cookie not found", "path", r.URL.Path)
 		s.ClearCookie(w)
-		s.RenderIndex(w, r, rule, httpStatusOnly)
+		s.RenderIndex(w, r)
 		return
 	}

 	if err := ckie.Valid(); err != nil {
 		lg.Debug("cookie is invalid", "err", err)
 		s.ClearCookie(w)
-		s.RenderIndex(w, r, rule, httpStatusOnly)
+		s.RenderIndex(w, r)
 		return
 	}

 	if time.Now().After(ckie.Expires) && !ckie.Expires.IsZero() {
 		lg.Debug("cookie expired", "path", r.URL.Path)
 		s.ClearCookie(w)
-		s.RenderIndex(w, r, rule, httpStatusOnly)
+		s.RenderIndex(w, r)
 		return
 	}

@@ -349,93 +275,85 @@ func (s *Server) maybeReverseProxy(w http.ResponseWriter, r *http.Request, httpS
 	if err != nil || !token.Valid {
 		lg.Debug("invalid token", "path", r.URL.Path, "err", err)
 		s.ClearCookie(w)
-		s.RenderIndex(w, r, rule, httpStatusOnly)
+		s.RenderIndex(w, r)
 		return
 	}

-	r.Header.Add("X-Anubis-Status", "PASS")
-	s.ServeHTTPNext(w, r)
-}
-
-func (s *Server) RenderIndex(w http.ResponseWriter, r *http.Request, rule *policy.Bot, returnHTTPStatusOnly bool) {
-	if returnHTTPStatusOnly {
-		w.WriteHeader(http.StatusUnauthorized)
-		w.Write([]byte("Authorization required"))
+	if randomJitter() {
+		r.Header.Add("X-Anubis-Status", "PASS-BRIEF")
+		lg.Debug("cookie is not enrolled into secondary screening")
+		s.next.ServeHTTP(w, r)
 		return
 	}

-	lg := slog.With(
-		"user_agent", r.UserAgent(),
-		"accept_language", r.Header.Get("Accept-Language"),
-		"priority", r.Header.Get("Priority"),
-		"x-forwarded-for",
-		r.Header.Get("X-Forwarded-For"),
-		"x-real-ip", r.Header.Get("X-Real-Ip"),
-	)
-
+	claims, ok := token.Claims.(jwt.MapClaims)
+	if !ok {
+		lg.Debug("invalid token claims type", "path", r.URL.Path)
+		s.ClearCookie(w)
+		s.RenderIndex(w, r)
+		return
+	}
 	challenge := s.challengeFor(r, rule.Challenge.Difficulty)

-	var ogTags map[string]string = nil
-	if s.opts.OGPassthrough {
-		var err error
-		ogTags, err = s.OGTags.GetOGTags(r.URL)
-		if err != nil {
-			lg.Error("failed to get OG tags", "err", err)
-			ogTags = nil
-		}
-	}
-
-	component, err := web.BaseWithChallengeAndOGTags("Making sure you're not a bot!", web.Index(), challenge, rule.Challenge, ogTags)
-	if err != nil {
-		lg.Error("render failed", "err", err)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Other internal server error (contact the admin)", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+	if claims["challenge"] != challenge {
+		lg.Debug("invalid challenge", "path", r.URL.Path)
+		s.ClearCookie(w)
+		s.RenderIndex(w, r)
 		return
 	}

-	handler := internal.NoStoreCache(templ.Handler(component))
-	handler.ServeHTTP(w, r)
+	var nonce int
+
+	if v, ok := claims["nonce"].(float64); ok {
+		nonce = int(v)
+	}
+
+	calcString := fmt.Sprintf("%s%d", challenge, nonce)
+	calculated := internal.SHA256sum(calcString)
+
+	if subtle.ConstantTimeCompare([]byte(claims["response"].(string)), []byte(calculated)) != 1 {
+		lg.Debug("invalid response", "path", r.URL.Path)
+		failedValidations.Inc()
+		s.ClearCookie(w)
+		s.RenderIndex(w, r)
+		return
+	}
+
+	slog.Debug("all checks passed")
+	r.Header.Add("X-Anubis-Status", "PASS-FULL")
+	s.next.ServeHTTP(w, r)
 }

-func (s *Server) RenderBench(w http.ResponseWriter, r *http.Request) {
+func (s *Server) RenderIndex(w http.ResponseWriter, r *http.Request) {
 	templ.Handler(
-		web.Base("Benchmarking Anubis!", web.Bench()),
+		web.Base("Making sure you're not a bot!", web.Index()),
 	).ServeHTTP(w, r)
 }

 func (s *Server) MakeChallenge(w http.ResponseWriter, r *http.Request) {
 	lg := slog.With("user_agent", r.UserAgent(), "accept_language", r.Header.Get("Accept-Language"), "priority", r.Header.Get("Priority"), "x-forwarded-for", r.Header.Get("X-Forwarded-For"), "x-real-ip", r.Header.Get("X-Real-Ip"))

-	encoder := json.NewEncoder(w)
 	cr, rule, err := s.check(r)
 	if err != nil {
 		lg.Error("check failed", "err", err)
 		w.WriteHeader(http.StatusInternalServerError)
-		err := encoder.Encode(struct {
+		json.NewEncoder(w).Encode(struct {
 			Error string `json:"error"`
 		}{
 			Error: "Internal Server Error: administrator has misconfigured Anubis. Please contact the administrator and ask them to look for the logs around \"makeChallenge\"",
 		})
-		if err != nil {
-			lg.Error("failed to encode error response", "err", err)
-			w.WriteHeader(http.StatusInternalServerError)
-		}
 		return
 	}
 	lg = lg.With("check_result", cr)
 	challenge := s.challengeFor(r, rule.Challenge.Difficulty)

-	err = encoder.Encode(struct {
+	json.NewEncoder(w).Encode(struct {
 		Challenge string                 `json:"challenge"`
 		Rules     *config.ChallengeRules `json:"rules"`
 	}{
 		Challenge: challenge,
 		Rules:     rule.Challenge,
 	})
-	if err != nil {
-		lg.Error("failed to encode challenge", "err", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
 	lg.Debug("made challenge", "challenge", challenge, "rules", rule.Challenge, "cr", cr)
 	challengesIssued.Inc()
 }
@@ -449,20 +367,10 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 		"x-real-ip", r.Header.Get("X-Real-Ip"),
 	)

-	redir := r.FormValue("redir")
-	redirURL, err := url.ParseRequestURI(redir)
-	if err != nil {
-		lg.Error("invalid redirect", "err", err)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid redirect", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-		return
-	}
-	// used by the path checker rule
-	r.URL = redirURL
-
 	cr, rule, err := s.check(r)
 	if err != nil {
 		lg.Error("check failed", "err", err)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Internal Server Error: administrator has misconfigured Anubis. Please contact the administrator and ask them to look for the logs around \"passChallenge\".", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Internal Server Error: administrator has misconfigured Anubis. Please contact the administrator and ask them to look for the logs around \"passChallenge\".")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}
 	lg = lg.With("check_result", cr)
@@ -471,7 +379,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if nonceStr == "" {
 		s.ClearCookie(w)
 		lg.Debug("no nonce")
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("missing nonce", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("missing nonce")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

@@ -479,7 +387,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if elapsedTimeStr == "" {
 		s.ClearCookie(w)
 		lg.Debug("no elapsedTime")
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("missing elapsedTime", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("missing elapsedTime")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

@@ -487,7 +395,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		s.ClearCookie(w)
 		lg.Debug("elapsedTime doesn't parse", "err", err)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid elapsedTime", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid elapsedTime")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

@@ -495,19 +403,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	timeTaken.Observe(elapsedTime)

 	response := r.FormValue("response")
-	urlParsed, err := r.URL.Parse(redir)
-	if err != nil {
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Redirect URL not parseable", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-		return
-	}
-
-	if len(urlParsed.Host) > 0 && len(s.opts.RedirectDomains) != 0 && !slices.Contains(s.opts.RedirectDomains, urlParsed.Host) {
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Redirect domain not allowed", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-		return
-	} else if urlParsed.Host != r.URL.Host {
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("Redirect domain not allowed", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-		return
-	}
+	redir := r.FormValue("redir")

 	challenge := s.challengeFor(r, rule.Challenge.Difficulty)

@@ -515,7 +411,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		s.ClearCookie(w)
 		lg.Debug("nonce doesn't parse", "err", err)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid nonce", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid nonce")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

@@ -525,7 +421,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if subtle.ConstantTimeCompare([]byte(response), []byte(calculated)) != 1 {
 		s.ClearCookie(w)
 		lg.Debug("hash does not match", "got", response, "want", calculated)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid response", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusForbidden)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid response")), templ.WithStatus(http.StatusForbidden)).ServeHTTP(w, r)
 		failedValidations.Inc()
 		return
 	}
@@ -534,16 +430,11 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if !strings.HasPrefix(response, strings.Repeat("0", rule.Challenge.Difficulty)) {
 		s.ClearCookie(w)
 		lg.Debug("difficulty check failed", "response", response, "difficulty", rule.Challenge.Difficulty)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid response", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusForbidden)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("invalid response")), templ.WithStatus(http.StatusForbidden)).ServeHTTP(w, r)
 		failedValidations.Inc()
 		return
 	}

-	// Adjust cookie path if base prefix is not empty
-	cookiePath := "/"
-	if anubis.BasePrefix != "" {
-		cookiePath = strings.TrimSuffix(anubis.BasePrefix, "/") + "/"
-	}
 	// generate JWT cookie
 	token := jwt.NewWithClaims(jwt.SigningMethodEdDSA, jwt.MapClaims{
 		"challenge": challenge,
@@ -557,7 +448,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		lg.Error("failed to sign JWT", "err", err)
 		s.ClearCookie(w)
-		templ.Handler(web.Base("Oh noes!", web.ErrorPage("failed to sign JWT", s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
+		templ.Handler(web.Base("Oh noes!", web.ErrorPage("failed to sign JWT")), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 		return
 	}

@@ -568,7 +459,7 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {
 		SameSite:    http.SameSiteLaxMode,
 		Domain:      s.opts.CookieDomain,
 		Partitioned: s.opts.CookiePartitioned,
-		Path:        cookiePath,
+		Path:        "/",
 	})

 	challengesValidated.Inc()
@@ -578,36 +469,38 @@ func (s *Server) PassChallenge(w http.ResponseWriter, r *http.Request) {

 func (s *Server) TestError(w http.ResponseWriter, r *http.Request) {
 	err := r.FormValue("err")
-	templ.Handler(web.Base("Oh noes!", web.ErrorPage(err, s.opts.WebmasterEmail)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
-}
-
-func cr(name string, rule config.Rule) policy.CheckResult {
-	return policy.CheckResult{
-		Name: name,
-		Rule: rule,
-	}
+	templ.Handler(web.Base("Oh noes!", web.ErrorPage(err)), templ.WithStatus(http.StatusInternalServerError)).ServeHTTP(w, r)
 }

 // Check evaluates the list of rules, and returns the result
-func (s *Server) check(r *http.Request) (policy.CheckResult, *policy.Bot, error) {
+func (s *Server) check(r *http.Request) (CheckResult, *policy.Bot, error) {
 	host := r.Header.Get("X-Real-Ip")
 	if host == "" {
-		return decaymap.Zilch[policy.CheckResult](), nil, fmt.Errorf("[misconfiguration] X-Real-Ip header is not set")
+		return decaymap.Zilch[CheckResult](), nil, fmt.Errorf("[misconfiguration] X-Real-Ip header is not set")
 	}

 	addr := net.ParseIP(host)
 	if addr == nil {
-		return decaymap.Zilch[policy.CheckResult](), nil, fmt.Errorf("[misconfiguration] %q is not an IP address", host)
+		return decaymap.Zilch[CheckResult](), nil, fmt.Errorf("[misconfiguration] %q is not an IP address", host)
 	}

 	for _, b := range s.policy.Bots {
-		match, err := b.Rules.Check(r)
-		if err != nil {
-			return decaymap.Zilch[policy.CheckResult](), nil, fmt.Errorf("can't run check %s: %w", b.Name, err)
+		if b.UserAgent != nil {
+			if b.UserAgent.MatchString(r.UserAgent()) && s.checkRemoteAddress(b, addr) {
+				return cr("bot/"+b.Name, b.Action), &b, nil
+			}
 		}

-		if match {
-			return cr("bot/"+b.Name, b.Action), &b, nil
+		if b.Path != nil {
+			if b.Path.MatchString(r.URL.Path) && s.checkRemoteAddress(b, addr) {
+				return cr("bot/"+b.Name, b.Action), &b, nil
+			}
+		}
+
+		if b.Ranger != nil {
+			if s.checkRemoteAddress(b, addr) {
+				return cr("bot/"+b.Name, b.Action), &b, nil
+			}
 		}
 	}

@@ -620,7 +513,15 @@ func (s *Server) check(r *http.Request) (policy.CheckResult, *policy.Bot, error)
 	}, nil
 }

-func (s *Server) CleanupDecayMap() {
-	s.DNSBLCache.Cleanup()
-	s.OGTags.Cleanup()
+func (s *Server) checkRemoteAddress(b policy.Bot, addr net.IP) bool {
+	if b.Ranger == nil {
+		return true
+	}
+
+	ok, err := b.Ranger.Contains(addr)
+	if err != nil {
+		log.Panicf("[unexpected] something very funky is going on, %q does not have a calculable network number: %v", addr.String(), err)
+	}
+
+	return ok
 }
--- a/lib/anubis_test.go
+++ b/lib/anubis_test.go
@@ -5,12 +5,9 @@ import (
 	"fmt"
 	"net/http"
 	"net/http/httptest"
-	"os"
-	"strings"
 	"testing"

 	"github.com/TecharoHQ/anubis"
-	"github.com/TecharoHQ/anubis/data"
 	"github.com/TecharoHQ/anubis/internal"
 	"github.com/TecharoHQ/anubis/lib/policy"
 )
@@ -18,12 +15,12 @@ import (
 func loadPolicies(t *testing.T, fname string) *policy.ParsedConfig {
 	t.Helper()

-	anubisPolicy, err := LoadPoliciesOrDefault(fname, anubis.DefaultDifficulty)
+	policy, err := LoadPoliciesOrDefault("", anubis.DefaultDifficulty)
 	if err != nil {
 		t.Fatal(err)
 	}

-	return anubisPolicy
+	return policy
 }

 func spawnAnubis(t *testing.T, opts Options) *Server {
@@ -37,95 +34,6 @@ func spawnAnubis(t *testing.T, opts Options) *Server {
 	return s
 }

-type challenge struct {
-	Challenge string `json:"challenge"`
-}
-
-func makeChallenge(t *testing.T, ts *httptest.Server) challenge {
-	t.Helper()
-
-	resp, err := ts.Client().Post(ts.URL+"/.within.website/x/cmd/anubis/api/make-challenge", "", nil)
-	if err != nil {
-		t.Fatalf("can't request challenge: %v", err)
-	}
-	defer resp.Body.Close()
-
-	var chall challenge
-	if err := json.NewDecoder(resp.Body).Decode(&chall); err != nil {
-		t.Fatalf("can't read challenge response body: %v", err)
-	}
-
-	return chall
-}
-
-func TestLoadPolicies(t *testing.T) {
-	for _, fname := range []string{"botPolicies.json", "botPolicies.yaml"} {
-		t.Run(fname, func(t *testing.T) {
-			fin, err := data.BotPolicies.Open(fname)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer fin.Close()
-
-			if _, err := policy.ParseConfig(fin, fname, 4); err != nil {
-				t.Fatal(err)
-			}
-		})
-	}
-}
-
-// Regression test for CVE-2025-24369
-func TestCVE2025_24369(t *testing.T) {
-	pol := loadPolicies(t, "")
-	pol.DefaultDifficulty = 4
-
-	srv := spawnAnubis(t, Options{
-		Next:   http.NewServeMux(),
-		Policy: pol,
-
-		CookieDomain:      "local.cetacean.club",
-		CookiePartitioned: true,
-		CookieName:        t.Name(),
-	})
-
-	ts := httptest.NewServer(internal.RemoteXRealIP(true, "tcp", srv))
-	defer ts.Close()
-
-	chall := makeChallenge(t, ts)
-	calcString := fmt.Sprintf("%s%d", chall.Challenge, 0)
-	calculated := internal.SHA256sum(calcString)
-	nonce := 0
-	elapsedTime := 420
-	redir := "/"
-
-	cli := ts.Client()
-	cli.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-		return http.ErrUseLastResponse
-	}
-
-	req, err := http.NewRequest(http.MethodGet, ts.URL+"/.within.website/x/cmd/anubis/api/pass-challenge", nil)
-	if err != nil {
-		t.Fatalf("can't make request: %v", err)
-	}
-
-	q := req.URL.Query()
-	q.Set("response", calculated)
-	q.Set("nonce", fmt.Sprint(nonce))
-	q.Set("redir", redir)
-	q.Set("elapsedTime", fmt.Sprint(elapsedTime))
-	req.URL.RawQuery = q.Encode()
-
-	resp, err := cli.Do(req)
-	if err != nil {
-		t.Fatalf("can't do challenge passing")
-	}
-
-	if resp.StatusCode == http.StatusFound {
-		t.Log("Regression on CVE-2025-24369")
-		t.Errorf("wanted HTTP status %d, got: %d", http.StatusForbidden, resp.StatusCode)
-	}
-}
-
 func TestCookieSettings(t *testing.T) {
 	pol := loadPolicies(t, "")
 	pol.DefaultDifficulty = 0
@@ -139,7 +47,7 @@ func TestCookieSettings(t *testing.T) {
 		CookieName:        t.Name(),
 	})

-	ts := httptest.NewServer(internal.RemoteXRealIP(true, "tcp", srv))
+	ts := httptest.NewServer(internal.DefaultXRealIP("127.0.0.1", srv))
 	defer ts.Close()

 	cli := &http.Client{
@@ -164,9 +72,8 @@ func TestCookieSettings(t *testing.T) {
 	nonce := 0
 	elapsedTime := 420
 	redir := "/"
-	calculated := ""
 	calcString := fmt.Sprintf("%s%d", chall.Challenge, nonce)
-	calculated = internal.SHA256sum(calcString)
+	calculated := internal.SHA256sum(calcString)

 	req, err := http.NewRequest(http.MethodGet, ts.URL+"/.within.website/x/cmd/anubis/api/pass-challenge", nil)
 	if err != nil {
@@ -186,7 +93,6 @@ func TestCookieSettings(t *testing.T) {
 	}

 	if resp.StatusCode != http.StatusFound {
-		resp.Write(os.Stderr)
 		t.Errorf("wanted %d, got: %d", http.StatusFound, resp.StatusCode)
 	}

@@ -198,10 +104,6 @@ func TestCookieSettings(t *testing.T) {
 			break
 		}
 	}
-	if ckie == nil {
-		t.Errorf("Cookie %q not found", anubis.CookieName)
-		return
-	}

 	if ckie.Domain != "local.cetacean.club" {
 		t.Errorf("cookie domain is wrong, wanted local.cetacean.club, got: %s", ckie.Domain)
@@ -210,6 +112,10 @@ func TestCookieSettings(t *testing.T) {
 	if ckie.Partitioned != srv.opts.CookiePartitioned {
 		t.Errorf("wanted partitioned flag %v, got: %v", srv.opts.CookiePartitioned, ckie.Partitioned)
 	}
+
+	if ckie == nil {
+		t.Errorf("Cookie %q not found", anubis.CookieName)
+	}
 }

 func TestCheckDefaultDifficultyMatchesPolicy(t *testing.T) {
@@ -219,14 +125,14 @@ func TestCheckDefaultDifficultyMatchesPolicy(t *testing.T) {

 	for i := 1; i < 10; i++ {
 		t.Run(fmt.Sprint(i), func(t *testing.T) {
-			anubisPolicy, err := LoadPoliciesOrDefault("", i)
+			policy, err := LoadPoliciesOrDefault("", i)
 			if err != nil {
 				t.Fatal(err)
 			}

 			s, err := New(Options{
 				Next:           h,
-				Policy:         anubisPolicy,
+				Policy:         policy,
 				ServeRobotsTXT: true,
 			})
 			if err != nil {
@@ -255,141 +161,3 @@ func TestCheckDefaultDifficultyMatchesPolicy(t *testing.T) {
 		})
 	}
 }
-
-func TestBasePrefix(t *testing.T) {
-	h := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, "OK")
-	})
-
-	testCases := []struct {
-		name       string
-		basePrefix string
-		path       string
-		expected   string
-	}{
-		{
-			name:       "no prefix",
-			basePrefix: "",
-			path:       "/.within.website/x/cmd/anubis/api/make-challenge",
-			expected:   "/.within.website/x/cmd/anubis/api/make-challenge",
-		},
-		{
-			name:       "with prefix",
-			basePrefix: "/myapp",
-			path:       "/myapp/.within.website/x/cmd/anubis/api/make-challenge",
-			expected:   "/myapp/.within.website/x/cmd/anubis/api/make-challenge",
-		},
-		{
-			name:       "with prefix and trailing slash",
-			basePrefix: "/myapp/",
-			path:       "/myapp/.within.website/x/cmd/anubis/api/make-challenge",
-			expected:   "/myapp/.within.website/x/cmd/anubis/api/make-challenge",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			// Reset the global BasePrefix before each test
-			anubis.BasePrefix = ""
-
-			pol := loadPolicies(t, "")
-			pol.DefaultDifficulty = 4
-
-			srv := spawnAnubis(t, Options{
-				Next:       h,
-				Policy:     pol,
-				BasePrefix: tc.basePrefix,
-			})
-
-			ts := httptest.NewServer(internal.RemoteXRealIP(true, "tcp", srv))
-			defer ts.Close()
-
-			// Test API endpoint with prefix
-			resp, err := ts.Client().Post(ts.URL+tc.path, "", nil)
-			if err != nil {
-				t.Fatalf("can't request challenge: %v", err)
-			}
-			defer resp.Body.Close()
-
-			if resp.StatusCode != http.StatusOK {
-				t.Errorf("expected status code %d, got: %d", http.StatusOK, resp.StatusCode)
-			}
-
-			var chall challenge
-			if err := json.NewDecoder(resp.Body).Decode(&chall); err != nil {
-				t.Fatalf("can't read challenge response body: %v", err)
-			}
-
-			if chall.Challenge == "" {
-				t.Errorf("expected non-empty challenge")
-			}
-
-			// Test cookie path when passing challenge
-			// Find a nonce that produces a hash with the required number of leading zeros
-			nonce := 0
-			var calculated string
-			for {
-				calcString := fmt.Sprintf("%s%d", chall.Challenge, nonce)
-				calculated = internal.SHA256sum(calcString)
-				if strings.HasPrefix(calculated, strings.Repeat("0", pol.DefaultDifficulty)) {
-					break
-				}
-				nonce++
-			}
-			elapsedTime := 420
-			redir := "/"
-
-			cli := ts.Client()
-			cli.CheckRedirect = func(req *http.Request, via []*http.Request) error {
-				return http.ErrUseLastResponse
-			}
-
-			// Construct the correct path for pass-challenge
-			passChallengePath := tc.path
-			passChallengePath = passChallengePath[:strings.LastIndex(passChallengePath, "/")+1] + "pass-challenge"
-
-			req, err := http.NewRequest(http.MethodGet, ts.URL+passChallengePath, nil)
-			if err != nil {
-				t.Fatalf("can't make request: %v", err)
-			}
-
-			q := req.URL.Query()
-			q.Set("response", calculated)
-			q.Set("nonce", fmt.Sprint(nonce))
-			q.Set("redir", redir)
-			q.Set("elapsedTime", fmt.Sprint(elapsedTime))
-			req.URL.RawQuery = q.Encode()
-
-			resp, err = cli.Do(req)
-			if err != nil {
-				t.Fatalf("can't do challenge passing: %v", err)
-			}
-
-			if resp.StatusCode != http.StatusFound {
-				t.Errorf("wanted %d, got: %d", http.StatusFound, resp.StatusCode)
-			}
-
-			// Check cookie path
-			var ckie *http.Cookie
-			for _, cookie := range resp.Cookies() {
-				if cookie.Name == anubis.CookieName {
-					ckie = cookie
-					break
-				}
-			}
-			if ckie == nil {
-				t.Errorf("Cookie %q not found", anubis.CookieName)
-				return
-			}
-
-			expectedPath := "/"
-			if tc.basePrefix != "" {
-				expectedPath = strings.TrimSuffix(tc.basePrefix, "/") + "/"
-			}
-
-			if ckie.Path != expectedPath {
-				t.Errorf("cookie path is wrong, wanted %s, got: %s", expectedPath, ckie.Path)
-			}
-		})
-	}
-}
--- a/lib/policy/checkresult.go
+++ b/lib/policy/checkresult.go
@@ -1,4 +1,4 @@
-package policy
+package lib

 import (
 	"log/slog"
@@ -16,3 +16,10 @@ func (cr CheckResult) LogValue() slog.Value {
 		slog.String("name", cr.Name),
 		slog.String("rule", string(cr.Rule)))
 }
+
+func cr(name string, rule config.Rule) CheckResult {
+	return CheckResult{
+		Name: name,
+		Rule: rule,
+	}
+}
--- a/lib/policy/bot.go
+++ b/lib/policy/bot.go
@@ -2,18 +2,31 @@ package policy

 import (
 	"fmt"
+	"regexp"

 	"github.com/TecharoHQ/anubis/internal"
 	"github.com/TecharoHQ/anubis/lib/policy/config"
+	"github.com/yl2chen/cidranger"
 )

 type Bot struct {
 	Name      string
-	Action    config.Rule
+	UserAgent *regexp.Regexp
+	Path      *regexp.Regexp
+	Action    config.Rule `json:"action"`
 	Challenge *config.ChallengeRules
-	Rules     Checker
+	Ranger    cidranger.Ranger
 }

-func (b Bot) Hash() string {
-	return internal.SHA256sum(fmt.Sprintf("%s::%s", b.Name, b.Rules.Hash()))
+func (b Bot) Hash() (string, error) {
+	var pathRex string
+	if b.Path != nil {
+		pathRex = b.Path.String()
+	}
+	var userAgentRex string
+	if b.UserAgent != nil {
+		userAgentRex = b.UserAgent.String()
+	}
+
+	return internal.SHA256sum(fmt.Sprintf("%s::%s::%s", b.Name, pathRex, userAgentRex)), nil
 }
--- a/lib/policy/checker.go
+++ b/lib/policy/checker.go
@@ -1,201 +0,0 @@
-package policy
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"github.com/TecharoHQ/anubis/internal"
-	"github.com/yl2chen/cidranger"
-)
-
-var (
-	ErrMisconfiguration = errors.New("[unexpected] policy: administrator misconfiguration")
-)
-
-type Checker interface {
-	Check(*http.Request) (bool, error)
-	Hash() string
-}
-
-type CheckerList []Checker
-
-func (cl CheckerList) Check(r *http.Request) (bool, error) {
-	for _, c := range cl {
-		ok, err := c.Check(r)
-		if err != nil {
-			return ok, err
-		}
-		if ok {
-			return ok, nil
-		}
-	}
-
-	return false, nil
-}
-
-func (cl CheckerList) Hash() string {
-	var sb strings.Builder
-
-	for _, c := range cl {
-		fmt.Fprintln(&sb, c.Hash())
-	}
-
-	return internal.SHA256sum(sb.String())
-}
-
-type RemoteAddrChecker struct {
-	ranger cidranger.Ranger
-	hash   string
-}
-
-func NewRemoteAddrChecker(cidrs []string) (Checker, error) {
-	ranger := cidranger.NewPCTrieRanger()
-	var sb strings.Builder
-
-	for _, cidr := range cidrs {
-		_, rng, err := net.ParseCIDR(cidr)
-		if err != nil {
-			return nil, fmt.Errorf("%w: range %s not parsing: %w", ErrMisconfiguration, cidr, err)
-		}
-
-		ranger.Insert(cidranger.NewBasicRangerEntry(*rng))
-		fmt.Fprintln(&sb, cidr)
-	}
-
-	return &RemoteAddrChecker{
-		ranger: ranger,
-		hash:   internal.SHA256sum(sb.String()),
-	}, nil
-}
-
-func (rac *RemoteAddrChecker) Check(r *http.Request) (bool, error) {
-	host := r.Header.Get("X-Real-Ip")
-	if host == "" {
-		return false, fmt.Errorf("%w: header X-Real-Ip is not set", ErrMisconfiguration)
-	}
-
-	addr := net.ParseIP(host)
-	if addr == nil {
-		return false, fmt.Errorf("%w: %s is not an IP address", ErrMisconfiguration, host)
-	}
-
-	ok, err := rac.ranger.Contains(addr)
-	if err != nil {
-		return false, err
-	}
-
-	if ok {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (rac *RemoteAddrChecker) Hash() string {
-	return rac.hash
-}
-
-type HeaderMatchesChecker struct {
-	header string
-	regexp *regexp.Regexp
-	hash   string
-}
-
-func NewUserAgentChecker(rexStr string) (Checker, error) {
-	return NewHeaderMatchesChecker("User-Agent", rexStr)
-}
-
-func NewHeaderMatchesChecker(header, rexStr string) (Checker, error) {
-	rex, err := regexp.Compile(rexStr)
-	if err != nil {
-		return nil, fmt.Errorf("%w: regex %s failed parse: %w", ErrMisconfiguration, rexStr, err)
-	}
-	return &HeaderMatchesChecker{header, rex, internal.SHA256sum(header + ": " + rexStr)}, nil
-}
-
-func (hmc *HeaderMatchesChecker) Check(r *http.Request) (bool, error) {
-	if hmc.regexp.MatchString(r.Header.Get(hmc.header)) {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (hmc *HeaderMatchesChecker) Hash() string {
-	return hmc.hash
-}
-
-type PathChecker struct {
-	regexp *regexp.Regexp
-	hash   string
-}
-
-func NewPathChecker(rexStr string) (Checker, error) {
-	rex, err := regexp.Compile(rexStr)
-	if err != nil {
-		return nil, fmt.Errorf("%w: regex %s failed parse: %w", ErrMisconfiguration, rexStr, err)
-	}
-	return &PathChecker{rex, internal.SHA256sum(rexStr)}, nil
-}
-
-func (pc *PathChecker) Check(r *http.Request) (bool, error) {
-	if pc.regexp.MatchString(r.URL.Path) {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (pc *PathChecker) Hash() string {
-	return pc.hash
-}
-
-func NewHeaderExistsChecker(key string) Checker {
-	return headerExistsChecker{key}
-}
-
-type headerExistsChecker struct {
-	header string
-}
-
-func (hec headerExistsChecker) Check(r *http.Request) (bool, error) {
-	if r.Header.Get(hec.header) != "" {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (hec headerExistsChecker) Hash() string {
-	return internal.SHA256sum(hec.header)
-}
-
-func NewHeadersChecker(headermap map[string]string) (Checker, error) {
-	var result CheckerList
-	var errs []error
-
-	for key, rexStr := range headermap {
-		if rexStr == ".*" {
-			result = append(result, headerExistsChecker{key})
-			continue
-		}
-
-		rex, err := regexp.Compile(rexStr)
-		if err != nil {
-			errs = append(errs, fmt.Errorf("while compiling header %s regex %s: %w", key, rexStr, err))
-			continue
-		}
-
-		result = append(result, &HeaderMatchesChecker{key, rex, internal.SHA256sum(key + ": " + rexStr)})
-	}
-
-	if len(errs) != 0 {
-		return nil, errors.Join(errs...)
-	}
-
-	return result, nil
-}
--- a/lib/policy/checker_test.go
+++ b/lib/policy/checker_test.go
@@ -1,200 +0,0 @@
-package policy
-
-import (
-	"errors"
-	"net/http"
-	"testing"
-)
-
-func TestRemoteAddrChecker(t *testing.T) {
-	for _, tt := range []struct {
-		name  string
-		cidrs []string
-		ip    string
-		ok    bool
-		err   error
-	}{
-		{
-			name:  "match_ipv4",
-			cidrs: []string{"0.0.0.0/0"},
-			ip:    "1.1.1.1",
-			ok:    true,
-			err:   nil,
-		},
-		{
-			name:  "match_ipv6",
-			cidrs: []string{"::/0"},
-			ip:    "cafe:babe::",
-			ok:    true,
-			err:   nil,
-		},
-		{
-			name:  "not_match_ipv4",
-			cidrs: []string{"1.1.1.1/32"},
-			ip:    "1.1.1.2",
-			ok:    false,
-			err:   nil,
-		},
-		{
-			name:  "not_match_ipv6",
-			cidrs: []string{"cafe:babe::/128"},
-			ip:    "cafe:babe:4::/128",
-			ok:    false,
-			err:   nil,
-		},
-		{
-			name:  "no_ip_set",
-			cidrs: []string{"::/0"},
-			ok:    false,
-			err:   ErrMisconfiguration,
-		},
-		{
-			name:  "invalid_ip",
-			cidrs: []string{"::/0"},
-			ip:    "According to all natural laws of aviation",
-			ok:    false,
-			err:   ErrMisconfiguration,
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			rac, err := NewRemoteAddrChecker(tt.cidrs)
-			if err != nil && !errors.Is(err, tt.err) {
-				t.Fatalf("creating RemoteAddrChecker failed: %v", err)
-			}
-
-			r, err := http.NewRequest(http.MethodGet, "/", nil)
-			if err != nil {
-				t.Fatalf("can't make request: %v", err)
-			}
-
-			if tt.ip != "" {
-				r.Header.Add("X-Real-Ip", tt.ip)
-			}
-
-			ok, err := rac.Check(r)
-
-			if tt.ok != ok {
-				t.Errorf("ok: %v, wanted: %v", ok, tt.ok)
-			}
-
-			if err != nil && tt.err != nil && !errors.Is(err, tt.err) {
-				t.Errorf("err: %v, wanted: %v", err, tt.err)
-			}
-		})
-	}
-}
-
-func TestHeaderMatchesChecker(t *testing.T) {
-	for _, tt := range []struct {
-		name           string
-		header         string
-		rexStr         string
-		reqHeaderKey   string
-		reqHeaderValue string
-		ok             bool
-		err            error
-	}{
-		{
-			name:           "match",
-			header:         "Cf-Worker",
-			rexStr:         ".*",
-			reqHeaderKey:   "Cf-Worker",
-			reqHeaderValue: "true",
-			ok:             true,
-			err:            nil,
-		},
-		{
-			name:           "not_match",
-			header:         "Cf-Worker",
-			rexStr:         "false",
-			reqHeaderKey:   "Cf-Worker",
-			reqHeaderValue: "true",
-			ok:             false,
-			err:            nil,
-		},
-		{
-			name:           "not_present",
-			header:         "Cf-Worker",
-			rexStr:         "foobar",
-			reqHeaderKey:   "Something-Else",
-			reqHeaderValue: "true",
-			ok:             false,
-			err:            nil,
-		},
-		{
-			name:   "invalid_regex",
-			rexStr: "a(b",
-			err:    ErrMisconfiguration,
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			hmc, err := NewHeaderMatchesChecker(tt.header, tt.rexStr)
-			if err != nil && !errors.Is(err, tt.err) {
-				t.Fatalf("creating HeaderMatchesChecker failed")
-			}
-
-			if tt.err != nil && hmc == nil {
-				return
-			}
-
-			r, err := http.NewRequest(http.MethodGet, "/", nil)
-			if err != nil {
-				t.Fatalf("can't make request: %v", err)
-			}
-
-			r.Header.Set(tt.reqHeaderKey, tt.reqHeaderValue)
-
-			ok, err := hmc.Check(r)
-
-			if tt.ok != ok {
-				t.Errorf("ok: %v, wanted: %v", ok, tt.ok)
-			}
-
-			if err != nil && tt.err != nil && !errors.Is(err, tt.err) {
-				t.Errorf("err: %v, wanted: %v", err, tt.err)
-			}
-		})
-	}
-}
-
-func TestHeaderExistsChecker(t *testing.T) {
-	for _, tt := range []struct {
-		name      string
-		header    string
-		reqHeader string
-		ok        bool
-	}{
-		{
-			name:      "match",
-			header:    "Authorization",
-			reqHeader: "Authorization",
-			ok:        true,
-		},
-		{
-			name:      "not_match",
-			header:    "Authorization",
-			reqHeader: "Authentication",
-		},
-	} {
-		t.Run(tt.name, func(t *testing.T) {
-			hec := headerExistsChecker{tt.header}
-
-			r, err := http.NewRequest(http.MethodGet, "/", nil)
-			if err != nil {
-				t.Fatalf("can't make request: %v", err)
-			}
-
-			r.Header.Set(tt.reqHeader, "hunter2")
-
-			ok, err := hec.Check(r)
-
-			if tt.ok != ok {
-				t.Errorf("ok: %v, wanted: %v", ok, tt.ok)
-			}
-
-			if err != nil {
-				t.Errorf("err: %v", err)
-			}
-		})
-	}
-}
--- a/lib/policy/config/config.go
+++ b/lib/policy/config/config.go
@@ -3,30 +3,19 @@ package config
 import (
 	"errors"
 	"fmt"
-	"io"
-	"io/fs"
 	"net"
-	"os"
 	"regexp"
-	"strings"
-
-	"github.com/TecharoHQ/anubis/data"
-	"k8s.io/apimachinery/pkg/util/yaml"
 )

 var (
 	ErrNoBotRulesDefined                 = errors.New("config: must define at least one (1) bot rule")
 	ErrBotMustHaveName                   = errors.New("config.Bot: must set name")
-	ErrBotMustHaveUserAgentOrPath        = errors.New("config.Bot: must set either user_agent_regex, path_regex, headers_regex, or remote_addresses")
+	ErrBotMustHaveUserAgentOrPath        = errors.New("config.Bot: must set either user_agent_regex, path_regex, or remote_addresses")
 	ErrBotMustHaveUserAgentOrPathNotBoth = errors.New("config.Bot: must set either user_agent_regex, path_regex, and not both")
 	ErrUnknownAction                     = errors.New("config.Bot: unknown action")
 	ErrInvalidUserAgentRegex             = errors.New("config.Bot: invalid user agent regex")
 	ErrInvalidPathRegex                  = errors.New("config.Bot: invalid path regex")
-	ErrInvalidHeadersRegex               = errors.New("config.Bot: invalid headers regex")
 	ErrInvalidCIDR                       = errors.New("config.Bot: invalid CIDR")
-	ErrInvalidImportStatement            = errors.New("config.ImportStatement: invalid source file")
-	ErrCantSetBotAndImportValuesAtOnce   = errors.New("config.BotOrImport: can't set bot rules and import values at the same time")
-	ErrMustSetBotOrImportRules           = errors.New("config.BotOrImport: rule definition is invalid, you must set either bot rules or an import statement, not both")
 )

 type Rule string
@@ -36,7 +25,6 @@ const (
 	RuleAllow     Rule = "ALLOW"
 	RuleDeny      Rule = "DENY"
 	RuleChallenge Rule = "CHALLENGE"
-	RuleBenchmark Rule = "DEBUG_BENCHMARK"
 )

 type Algorithm string
@@ -48,31 +36,12 @@ const (
 )

 type BotConfig struct {
-	Name           string            `json:"name"`
-	UserAgentRegex *string           `json:"user_agent_regex"`
-	PathRegex      *string           `json:"path_regex"`
-	HeadersRegex   map[string]string `json:"headers_regex"`
-	Action         Rule              `json:"action"`
-	RemoteAddr     []string          `json:"remote_addresses"`
-	Challenge      *ChallengeRules   `json:"challenge,omitempty"`
-}
-
-func (b BotConfig) Zero() bool {
-	for _, cond := range []bool{
-		b.Name != "",
-		b.UserAgentRegex != nil,
-		b.PathRegex != nil,
-		len(b.HeadersRegex) != 0,
-		b.Action != "",
-		len(b.RemoteAddr) != 0,
-		b.Challenge != nil,
-	} {
-		if cond {
-			return false
-		}
-	}
-
-	return true
+	Name           string          `json:"name"`
+	UserAgentRegex *string         `json:"user_agent_regex"`
+	PathRegex      *string         `json:"path_regex"`
+	Action         Rule            `json:"action"`
+	RemoteAddr     []string        `json:"remote_addresses"`
+	Challenge      *ChallengeRules `json:"challenge,omitempty"`
 }

 func (b BotConfig) Valid() error {
@@ -82,7 +51,7 @@ func (b BotConfig) Valid() error {
 		errs = append(errs, ErrBotMustHaveName)
 	}

-	if b.UserAgentRegex == nil && b.PathRegex == nil && len(b.RemoteAddr) == 0 && len(b.HeadersRegex) == 0 {
+	if b.UserAgentRegex == nil && b.PathRegex == nil && len(b.RemoteAddr) == 0 {
 		errs = append(errs, ErrBotMustHaveUserAgentOrPath)
 	}

@@ -102,18 +71,6 @@ func (b BotConfig) Valid() error {
 		}
 	}

-	if len(b.HeadersRegex) > 0 {
-		for name, expr := range b.HeadersRegex {
-			if name == "" {
-				continue
-			}
-
-			if _, err := regexp.Compile(expr); err != nil {
-				errs = append(errs, ErrInvalidHeadersRegex, err)
-			}
-		}
-	}
-
 	if len(b.RemoteAddr) > 0 {
 		for _, cidr := range b.RemoteAddr {
 			if _, _, err := net.ParseCIDR(cidr); err != nil {
@@ -123,7 +80,7 @@ func (b BotConfig) Valid() error {
 	}

 	switch b.Action {
-	case RuleAllow, RuleBenchmark, RuleChallenge, RuleDeny:
+	case RuleAllow, RuleChallenge, RuleDeny:
 		// okay
 	default:
 		errs = append(errs, fmt.Errorf("%w: %q", ErrUnknownAction, b.Action))
@@ -179,147 +136,9 @@ func (cr ChallengeRules) Valid() error {
 	return nil
 }

-type ImportStatement struct {
-	Import string `json:"import"`
-	Bots   []BotConfig
-}
-
-func (is *ImportStatement) open() (fs.File, error) {
-	if strings.HasPrefix(is.Import, "(data)/") {
-		fname := strings.TrimPrefix(is.Import, "(data)/")
-		fin, err := data.BotPolicies.Open(fname)
-		return fin, err
-	}
-
-	return os.Open(is.Import)
-}
-
-func (is *ImportStatement) load() error {
-	fin, err := is.open()
-	if err != nil {
-		return fmt.Errorf("can't open %s: %w", is.Import, err)
-	}
-	defer fin.Close()
-
-	var result []BotConfig
-
-	if err := yaml.NewYAMLToJSONDecoder(fin).Decode(&result); err != nil {
-		return fmt.Errorf("can't parse %s: %w", is.Import, err)
-	}
-
-	var errs []error
-
-	for _, b := range result {
-		if err := b.Valid(); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(errs) != 0 {
-		return fmt.Errorf("config %s is not valid:\n%w", is.Import, errors.Join(errs...))
-	}
-
-	is.Bots = result
-
-	return nil
-}
-
-func (is *ImportStatement) Valid() error {
-	return is.load()
-}
-
-type BotOrImport struct {
-	*BotConfig       `json:",inline"`
-	*ImportStatement `json:",inline"`
-}
-
-func (boi *BotOrImport) Valid() error {
-	if boi.BotConfig != nil && boi.ImportStatement != nil {
-		return ErrCantSetBotAndImportValuesAtOnce
-	}
-
-	if boi.BotConfig != nil {
-		return boi.BotConfig.Valid()
-	}
-
-	if boi.ImportStatement != nil {
-		return boi.ImportStatement.Valid()
-	}
-
-	return ErrMustSetBotOrImportRules
-}
-
-type fileConfig struct {
-	Bots  []BotOrImport `json:"bots"`
-	DNSBL bool          `json:"dnsbl"`
-}
-
-func (c fileConfig) Valid() error {
-	var errs []error
-
-	if len(c.Bots) == 0 {
-		errs = append(errs, ErrNoBotRulesDefined)
-	}
-
-	for _, b := range c.Bots {
-		if err := b.Valid(); err != nil {
-			errs = append(errs, err)
-		}
-	}
-
-	if len(errs) != 0 {
-		return fmt.Errorf("config is not valid:\n%w", errors.Join(errs...))
-	}
-
-	return nil
-}
-
-func Load(fin io.Reader, fname string) (*Config, error) {
-	var c fileConfig
-	if err := yaml.NewYAMLToJSONDecoder(fin).Decode(&c); err != nil {
-		return nil, fmt.Errorf("can't parse policy config YAML %s: %w", fname, err)
-	}
-
-	if err := c.Valid(); err != nil {
-		return nil, err
-	}
-
-	result := &Config{
-		DNSBL: c.DNSBL,
-	}
-
-	var validationErrs []error
-
-	for _, boi := range c.Bots {
-		if boi.ImportStatement != nil {
-			if err := boi.load(); err != nil {
-				validationErrs = append(validationErrs, err)
-				continue
-			}
-
-			result.Bots = append(result.Bots, boi.ImportStatement.Bots...)
-		}
-
-		if boi.BotConfig != nil {
-			if err := boi.BotConfig.Valid(); err != nil {
-				validationErrs = append(validationErrs, err)
-				continue
-			}
-
-			result.Bots = append(result.Bots, *boi.BotConfig)
-		}
-	}
-
-	if len(validationErrs) > 0 {
-		return nil, fmt.Errorf("errors validating policy config %s: %w", fname, errors.Join(validationErrs...))
-	}
-
-	return result, nil
-}
-
 type Config struct {
-	Bots  []BotConfig
-	DNSBL bool
+	Bots  []BotConfig `json:"bots"`
+	DNSBL bool        `json:"dnsbl"`
 }

 func (c Config) Valid() error {
--- a/lib/policy/config/config_test.go
+++ b/lib/policy/config/config_test.go
@@ -1,14 +1,11 @@
 package config

 import (
+	"encoding/json"
 	"errors"
-	"io/fs"
 	"os"
 	"path/filepath"
 	"testing"
-
-	"github.com/TecharoHQ/anubis/data"
-	"k8s.io/apimachinery/pkg/util/yaml"
 )

 func p[V any](v V) *V { return &v }
@@ -90,18 +87,6 @@ func TestBotValid(t *testing.T) {
 			},
 			err: ErrInvalidPathRegex,
 		},
-		{
-			name: "invalid headers regex",
-			bot: BotConfig{
-				Name:   "mozilla-ua",
-				Action: RuleChallenge,
-				HeadersRegex: map[string]string{
-					"Content-Type": "a(b",
-				},
-				PathRegex: p("a(b"),
-			},
-			err: ErrInvalidHeadersRegex,
-		},
 		{
 			name: "challenge difficulty too low",
 			bot: BotConfig{
@@ -221,69 +206,13 @@ func TestConfigValidKnownGood(t *testing.T) {
 			}
 			defer fin.Close()

-			c, err := Load(fin, st.Name())
-			if err != nil {
-				t.Fatal(err)
+			var c Config
+			if err := json.NewDecoder(fin).Decode(&c); err != nil {
+				t.Fatalf("can't decode file: %v", err)
 			}

 			if err := c.Valid(); err != nil {
-				t.Error(err)
-			}
-
-			if len(c.Bots) == 0 {
-				t.Error("wanted more than 0 bots, got zero")
-			}
-		})
-	}
-}
-
-func TestImportStatement(t *testing.T) {
-	type testCase struct {
-		name       string
-		importPath string
-		err        error
-	}
-
-	var tests []testCase
-
-	for _, folderName := range []string{
-		"apps",
-		"bots",
-		"common",
-		"crawlers",
-	} {
-		if err := fs.WalkDir(data.BotPolicies, folderName, func(path string, d fs.DirEntry, err error) error {
-			if err != nil {
-				return err
-			}
-			if d.IsDir() {
-				return nil
-			}
-
-			tests = append(tests, testCase{
-				name:       "(data)/" + path,
-				importPath: "(data)/" + path,
-				err:        nil,
-			})
-
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			is := &ImportStatement{
-				Import: tt.importPath,
-			}
-
-			if err := is.Valid(); err != nil {
-				t.Errorf("validation error: %v", err)
-			}
-
-			if len(is.Bots) == 0 {
-				t.Error("wanted bot definitions, but got none")
+				t.Fatal(err)
 			}
 		})
 	}
@@ -304,8 +233,8 @@ func TestConfigValidBad(t *testing.T) {
 			}
 			defer fin.Close()

-			var c fileConfig
-			if err := yaml.NewYAMLToJSONDecoder(fin).Decode(&c); err != nil {
+			var c Config
+			if err := json.NewDecoder(fin).Decode(&c); err != nil {
 				t.Fatalf("can't decode file: %v", err)
 			}

@@ -317,49 +246,3 @@ func TestConfigValidBad(t *testing.T) {
 		})
 	}
 }
-
-func TestBotConfigZero(t *testing.T) {
-	var b BotConfig
-	if !b.Zero() {
-		t.Error("zero value BotConfig is not zero value")
-	}
-
-	b.Name = "hi"
-	if b.Zero() {
-		t.Error("BotConfig with name is zero value")
-	}
-
-	b.UserAgentRegex = p(".*")
-	if b.Zero() {
-		t.Error("BotConfig with user agent regex is zero value")
-	}
-
-	b.PathRegex = p(".*")
-	if b.Zero() {
-		t.Error("BotConfig with path regex is zero value")
-	}
-
-	b.HeadersRegex = map[string]string{"hi": "there"}
-	if b.Zero() {
-		t.Error("BotConfig with headers regex is zero value")
-	}
-
-	b.Action = RuleAllow
-	if b.Zero() {
-		t.Error("BotConfig with action is zero value")
-	}
-
-	b.RemoteAddr = []string{"::/0"}
-	if b.Zero() {
-		t.Error("BotConfig with remote addresses is zero value")
-	}
-
-	b.Challenge = &ChallengeRules{
-		Difficulty: 4,
-		ReportAs:   4,
-		Algorithm:  AlgorithmFast,
-	}
-	if b.Zero() {
-		t.Error("BotConfig with challenge rules is zero value")
-	}
-}
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .16.0
 .15.2