From a6297b86a43aa3522e3c33bb2a736f84d9314e9a Mon Sep 17 00:00:00 2001 From: Miguel Lozano Date: Mon, 16 Nov 2026 14:33:20 -0500 Subject: [PATCH 1/6] ci(deps): bump upload-sarif and login-action to latest pinned SHAs --- .github/workflows/docker-build-scan-sign.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build-scan-sign.yml b/.github/workflows/docker-build-scan-sign.yml index 4f438a9..7979262 100644 --- a/.github/workflows/docker-build-scan-sign.yml +++ b/.github/workflows/docker-build-scan-sign.yml @@ -187,7 +187,7 @@ jobs: uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1 - name: Login to GHCR - uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6 # v4.7.0 + uses: docker/login-action@8aa5831fb8d48d8f76594c7ddde61ae58019f550 # v4.7.0 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -286,7 +286,7 @@ jobs: - name: Upload Trivy SARIF (amd64) if: (!cancelled()) && steps.build-push.outputs.digest != '' continue-on-error: true - uses: github/codeql-action/upload-sarif@0911ee96d2d6c8def97122c36c5cadd93829a4b4 # v4 + uses: github/codeql-action/upload-sarif@3ea37a44b6e4e6847c46edae209410d258d548d1 # v4 with: sarif_file: trivy-sarif/trivy-results.sarif category: trivy @@ -294,7 +294,7 @@ jobs: - name: Upload Trivy SARIF (arm64) if: (!cancelled()) && steps.build-push.outputs.digest != '' continue-on-error: true - uses: github/codeql-action/upload-sarif@0911ee96d2d6c8def97122c36c5cadd93829a4b4 # v4 + uses: github/codeql-action/upload-sarif@3ea37a44b6e4e6847c46edae209410d258d548d1 # v4 with: sarif_file: trivy-sarif/trivy-results-arm64.sarif category: trivy-arm64 From c156d42277a2b19fa9a91e2f726a16c0ce73cb92 Mon Sep 17 00:00:00 2001 From: Miguel Lozano Date: Mon, 16 Nov 2026 14:33:21 -0500 Subject: [PATCH 2/6] chore(tools): upgrade trivy to v0.76.2 and update asset checksums --- tools/versions.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/versions.mk b/tools/versions.mk index 411fc78..4ad3432 100755 --- a/tools/versions.mk +++ b/tools/versions.mk @@ -27,9 +27,9 @@ GOFTW_SHA256_LINUX_ARM64 := cf22cd460bec6b171438067479295fb6dea477490de0f03099 GOFTW_SHA256_DARWIN_AMD64 := dc739a0a18fbb34211655be60adb706a45f7b3ef7d91a142f560d55551a30502 GOFTW_SHA256_DARWIN_ARM64 := a6fdba1b934c051391eafabce6ee54bd1b960fbc794ad97d6ba040e8744fb2c5 -TRIVY_VERSION := 0.76.1 -TRIVY_SHA256_LINUX_AMD64 := c7cbe3137fb8a48a17574bede3dd6beb16742d1e9772929940fc90082c39d9c0 -TRIVY_SHA256_LINUX_ARM64 := e174dff2a6dba5e3ae41f8d0537a6324405bd08132497340304c6b20e0f16a1f -TRIVY_SHA256_DARWIN_AMD64 := 7aa762eacd582052d053b62dcf972a1ab058abe39a57ccae234ed8894945b6b7 -TRIVY_SHA256_DARWIN_ARM64 := 11a9b6cd2752011b54f01ea4bd0dbfa9f0c41dc6538d5a3f9d23955f471bf4e5 +TRIVY_VERSION := 0.76.2 +TRIVY_SHA256_LINUX_AMD64 := bc0fc726e017b8927a62b2d3531d7a84ee01769daf5c99ed866dced54089fdbf +TRIVY_SHA256_LINUX_ARM64 := ab9d51f86e6a5fb936f605faff6b593ac51bc378fff4d3e8b9d58358b9c367c3 +TRIVY_SHA256_DARWIN_AMD64 := e08bb9ea449ecf66c6bfb03cbb8697c503ff33d35fc585c9747e3eaeb7ed4c7b +TRIVY_SHA256_DARWIN_ARM64 := ae7ea358326960406b703c77b2ac490190797d80b306b5b50c2a27221da0a5b8 From 1820e33090ff9f72ad9e986f7ad674a2cc6fcc02 Mon Sep 17 00:00:00 2001 From: Miguel Lozano Date: Mon, 16 Nov 2026 14:33:21 -0500 Subject: [PATCH 3/6] feat(core): upgrade caddy to v2.11.9 and go-jose to v4.1.9 --- Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8860dae..4b01782 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # Build Stage -# caddy:2.11.7-builder pinned to its multi-arch index digest (tag comment for readability) -FROM caddy:2.11.7-builder@sha256:a576be4d0ba99e7259e98268cbac2e2c897feeab8b7b49885cd3cac5409523f8 AS builder +# caddy:2.11.9-builder pinned to its multi-arch index digest (tag comment for readability) +FROM caddy:2.11.9-builder@sha256:29f98311e17e583811355fa62cc080f71d6f3aa19cf09a9e1494d30579f8bebf AS builder -ENV GOTOOLCHAIN=go1.27.3 +ENV GOTOOLCHAIN=go1.27.4 # Build args for deterministic plugin references. # coraza-caddy: https://github.com/corazawaf/coraza-caddy/releases/tag/v2.6.2 @@ -18,11 +18,11 @@ RUN xcaddy build \ --with github.com/mholt/caddy-ratelimit@${CADDY_RATELIMIT_REF} \ --with github.com/caddy-dns/cloudflare@${CADDY_DNS_CLOUDFLARE_REF} \ --replace golang.org/x/net=golang.org/x/net@v0.62.0 \ - --replace github.com/go-jose/go-jose/v4=github.com/go-jose/go-jose/v4@v4.1.8 + --replace github.com/go-jose/go-jose/v4=github.com/go-jose/go-jose/v4@v4.1.9 # Final Stage -# caddy:2.11.7 pinned to its multi-arch index digest (tag comment for readability) -FROM caddy:2.11.7@sha256:d76116d819d5162f464b0f2cd09bd28c568a86148c7bc539ce17c33eb22d8bbb +# caddy:2.11.9 pinned to its multi-arch index digest (tag comment for readability) +FROM caddy:2.11.9@sha256:fc9cbc100585871d18d4e451cca7021785c90a7006087427ae5ceb3e4efe6424 SHELL ["/bin/ash", "-eo", "pipefail", "-c"] # Container metadata @@ -39,7 +39,7 @@ LABEL waf.owasp-crs.version="4.30.0" # Copy the custom binary COPY --from=builder /usr/bin/caddy /usr/bin/caddy -# Upgrade all base image packages - pulls current Alpine 3.23 security fixes +# Upgrade all base image packages - pulls current Alpine 3.24 security fixes # (openssl/libssl, musl, busybox, zlib, ca-certificates, curl, c-ares, ...) RUN apk upgrade --no-cache @@ -51,7 +51,7 @@ ARG CORAZA_CONF_SHA256=372f7fde584115d9192d46023e9debd4cd59b62c30e9ca0eddc59bc1d # Install dependencies, download CRS and configure WAF in a single layer RUN mkdir -p /etc/caddy/owasp-crs /tmp/downloads && \ # Ensure wget and tar are available (Alpine base includes them) - apk add --no-cache wget=1.25.0-r2 tar=1.35-r4 && \ + apk add --no-cache wget=1.25.0-r3 tar=1.35-r5 && \ # Download OWASP CRS v4.30.0 source archive with SHA256 verification wget -q -O /tmp/downloads/coreruleset.tar.gz https://github.com/coreruleset/coreruleset/archive/refs/tags/v4.30.0.tar.gz && \ # Verify SHA256 checksum From 248f1e501ee1a8b1ed1dacbf2a1a2c8fd495bcb0 Mon Sep 17 00:00:00 2001 From: Miguel Lozano Date: Mon, 16 Nov 2026 14:33:21 -0500 Subject: [PATCH 4/6] docs(security): document caddy 2.11.9 mitigations and go 1.27.4 adoption --- SECURITY.md | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 27872b4..b8fe279 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -267,7 +267,7 @@ The following advisories do not affect this project. Listed for transparency. | Advisory | Severity | Description | Why not applicable | |----------|----------|-------------|--------------------| -| `GHSA-wwhq-w58m-w29c` | High (no CVE) | Bypass of the CVE-2026-30852 fix - literal keys in `vars_regexp` (e.g. `tenant_id`) still double-expand and leak `{env.*}` / `{file.*}` placeholders | Affects Caddy <= 2.11.2 only (no patched release); caddy-waf ships Caddy 2.11.7 - out of affected range | +| `GHSA-wwhq-w58m-w29c` | High (no CVE) | Bypass of the CVE-2026-30852 fix - literal keys in `vars_regexp` (e.g. `tenant_id`) still double-expand and leak `{env.*}` / `{file.*}` placeholders | Affects Caddy <= 2.11.2 only (no patched release); caddy-waf ships Caddy 2.11.9 - out of affected range | | `GHSA-gx7w-56w6-g48x` | Moderate | Remote admin authorization bypass on PKI endpoints via prefix-based path matching | Remote admin is not enabled in this project (admin listener is localhost-only) - not reachable. Re-verify before adopting roadmap item 6 (mTLS remote admin) | --- @@ -276,9 +276,30 @@ The following advisories do not affect this project. Listed for transparency. | Advisory | Component | Severity | Status & Assessment | |----------|-----------|----------|---------------------| -| `CVE-2026-116587` | `github.com/go-jose/go-jose/v4` | HIGH | Mitigated: patched to `v4.1.8` via `xcaddy build --replace` in `Dockerfile` (incorporating upstream fixes for GHSA-r39w-98wm-9pp6, GHSA-27pc-rm86-68pq, GHSA-p9j4-2j95-j4rv, GHSA-v6h2-qj3f-2h6v, GHSA-c67m-wr4h-2ccg). | +| `CVE-2026-116587` | `github.com/go-jose/go-jose/v4` | HIGH | Mitigated: patched to `v4.1.9` via `xcaddy build --replace` in `Dockerfile` (incorporating upstream fixes for GHSA-r39w-98wm-9pp6, GHSA-27pc-rm86-68pq, GHSA-p9j4-2j95-j4rv, GHSA-v6h2-qj3f-2h6v, GHSA-c67m-wr4h-2ccg). | | `CVE-2026-116587` | `github.com/go-jose/go-jose/v3` | HIGH | Unpatched upstream (`v3.0.5` is latest; `first_patched_version` is null). Transitive dependency via `smallstep/crypto` in Caddy PKI. Untrusted JWKs are not parsed or accepted in standard WAF reverse-proxy deployment; temporarily suppressed in `.trivyignore`. | +**Resolved in Caddy 2.11.9 (2026-11-16)** — upgrading the Caddy base image to `v2.11.9` resolved 7 security advisories in upstream Caddy: + +| Advisory | Component | Description / Impact | Fixed in | +|----------|-----------|----------------------|----------| +| `GHSA-r766-rf9f-588h` | `file_server` / `php_fastcgi` | Host and `:authority` values with dot segments or slashes escape `{host}`-based root | Caddy 2.11.9 | +| `GHSA-f278-mgc7-46j3` | `php_fastcgi` | Authorization bypass via dot-segments in request path | Caddy 2.11.9 | +| `GHSA-25cw-38mq-q7m6` | `file` matcher | Matcher resolves `/file/./` to regular file, bypassing suffix path rules | Caddy 2.11.9 | +| `GHSA-69hv-5jfc-mvmv` | `rewrite` handler | Rewrite re-decodes `{http.matchers.file.remainder}`, bypassing path-based deny rules | Caddy 2.11.9 | +| `GHSA-jf74-f69g-hcj9` | `file_server` | File server exposes private keys when data directory falls back to `./caddy` | Caddy 2.11.9 | +| `GHSA-8qx7-j2v2-x6q5` | `reverse_proxy` | Hop-by-hop headers leak through during WebSocket upgrades (HTTP 101) | Caddy 2.11.9 | +| `GHSA-q34h-28rj-5hjm` | `reverse_proxy/fastcgi` | Client-supplied request headers override configured `HTTP_*` environment variables | Caddy 2.11.9 | + +**Resolved in Go 1.27.4 (2026-11-16)** — compiling Caddy with `GOTOOLCHAIN=go1.27.4` addresses 4 security advisories in the Go toolchain and standard library: + +| Advisory | Component | Description / Impact | Fixed in | +|----------|-----------|----------------------|----------| +| `CVE-2026-97054` | Go stdlib `net/http` | Concurrent header write and MaxBytesReader close header race condition causing panic | Go 1.27.4 toolchain pin (`GOTOOLCHAIN=go1.27.4`) | +| `CVE-2026-97043` | Go toolchain `cmd/go`, `cmd/compile` | Build-time arbitrary flag injection and code execution via escaped `#cgo LDFLAGS` quotes | Go 1.27.4 toolchain pin (`GOTOOLCHAIN=go1.27.4`) | +| `CVE-2026-97042` | Go toolchain `cmd/cgo`, `cmd/compile`, `cmd/link` | Windows PE & cgo external linker argument injection via unvalidated DLL / library names | Go 1.27.4 toolchain pin (`GOTOOLCHAIN=go1.27.4`) | +| `CVE-2026-97041` | Go toolchain `cmd/compile`, `cmd/link` | Arbitrary host linker flag injection on ELF platforms via unescaped commas in `//go:cgo_*` directives | Go 1.27.4 toolchain pin (`GOTOOLCHAIN=go1.27.4`) | + **Resolved in x/net v0.62.0 (2026-11-07)** — updating `golang.org/x/net` to `v0.62.0` in the builder stage resolved 1 HIGH vulnerability detected by Trivy in `usr/bin/caddy`: | Advisory | Component (before) | Fixed by | @@ -357,6 +378,8 @@ The following advisories do not affect this project. Listed for transparency. | **2026-10-28** | Routine tooling & toolchain upgrade - Go 1.27.3, Trivy v0.76.1, go-ftw v2.6.2; mitigated CVE-2026-116587 (go-jose/v4 to v4.1.6, suppressed unpatched v3) | | **2026-11-04** | caddy-waf **v3.6.3** released - Upgraded go-jose/v4 to v4.1.8 (mitigating 5 upstream security advisories) | | **2026-11-07** | caddy-waf **v3.6.4** released - Upgraded golang.org/x/net to v0.62.0 (mitigating CVE-2026-78661) | +| **2026-11-16** | Caddy 2.11.9 released - fixes GHSA-r766-rf9f-588h, GHSA-f278-mgc7-46j3, GHSA-25cw-38mq-q7m6, GHSA-69hv-5jfc-mvmv, GHSA-jf74-f69g-hcj9, GHSA-8qx7-j2v2-x6q5, GHSA-q34h-28rj-5hjm | +| **2026-11-16** | Go 1.27.4 toolchain adopted - fixes CVE-2026-97054, CVE-2026-97043, CVE-2026-97042, CVE-2026-97041; go-jose/v4 bumped to v4.1.9, Trivy v0.76.2 | --- From cbd88a48bb80818253af13f03b23a8e3c1e27b8c Mon Sep 17 00:00:00 2001 From: Miguel Lozano Date: Mon, 16 Nov 2026 15:31:11 -0500 Subject: [PATCH 5/6] chore(release): bump version to 3.7.0 in manifests and docker compose --- .env.example | 2 +- Dockerfile | 2 +- docker-compose.yml | 2 +- docs/deployment-checklist.md | 2 +- pyproject.toml | 2 +- uv.lock | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 98cf389..84bb47e 100644 --- a/.env.example +++ b/.env.example @@ -5,7 +5,7 @@ # ============================================================================= # Main Caddy WAF image (pin to a digest in production for deterministic deployments) -CADDY_WAF_IMAGE=ghcr.io/developmi/caddy-waf:v3.6.4 +CADDY_WAF_IMAGE=ghcr.io/developmi/caddy-waf:v3.7.0 # Optional demo backend for local validation (remove in production) EXAMPLE_APP_IMAGE=containous/whoami:latest diff --git a/Dockerfile b/Dockerfile index 4b01782..1fb2746 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,7 +32,7 @@ LABEL org.opencontainers.image.description="Production-ready Caddy web server wi LABEL org.opencontainers.image.licenses="MIT" LABEL maintainer="Miguel Lozano" LABEL vendor="Developmi" -LABEL version="3.6.4" +LABEL version="3.7.0" LABEL waf.coraza.version="2.6.2" LABEL waf.owasp-crs.version="4.30.0" diff --git a/docker-compose.yml b/docker-compose.yml index e0cb430..8bb3d44 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ services: caddy-waf: - image: ${CADDY_WAF_IMAGE:-ghcr.io/developmi/caddy-waf:v3.6.4} + image: ${CADDY_WAF_IMAGE:-ghcr.io/developmi/caddy-waf:v3.7.0} container_name: caddy-waf user: "1337:1337" restart: unless-stopped diff --git a/docs/deployment-checklist.md b/docs/deployment-checklist.md index afbadb0..044e2f4 100644 --- a/docs/deployment-checklist.md +++ b/docs/deployment-checklist.md @@ -25,7 +25,7 @@ README.md:228-235). | `SITE_ADDRESS` | `localhost` | Site address / server name | Set to your public domain when serving TLS via Let's Encrypt | | `BACKEND_UPSTREAM` | `example-app:80` | Reverse proxy target | Point to your real backend (service name on the compose network, or host:port) | | `ACME_EMAIL` | empty | Let's Encrypt certificate issuance | Set to a monitored mailbox (expiry warnings) | -| `CADDY_WAF_IMAGE` | `ghcr.io/developmi/caddy-waf:v3.6.4` | Image to run | Prefer an immutable digest (`@sha256:...`) in production | +| `CADDY_WAF_IMAGE` | `ghcr.io/developmi/caddy-waf:v3.7.0` | Image to run | Prefer an immutable digest (`@sha256:...`) in production | - [ ] `.env` exists and has real values (`cp .env.example .env`, then edit) - [ ] Runtime `Caddyfile` exists (`cp Caddyfile.example Caddyfile`) and matches diff --git a/pyproject.toml b/pyproject.toml index 5905cdb..ee718d9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "caddy-waf" -version = "3.6.4" +version = "3.7.0" description = "Production-ready Caddy image with Coraza WAF and OWASP CRS." readme = "README.md" requires-python = ">=3.14" diff --git a/uv.lock b/uv.lock index fe0f301..b1c3b61 100644 --- a/uv.lock +++ b/uv.lock @@ -4,7 +4,7 @@ requires-python = ">=3.14" [[package]] name = "caddy-waf" -version = "3.6.4" +version = "3.7.0" source = { virtual = "." } [package.dev-dependencies] From 348ab215922edbff3bab830a00ce6b0cb42b92b4 Mon Sep 17 00:00:00 2001 From: Miguel Lozano Date: Mon, 16 Nov 2026 15:31:12 -0500 Subject: [PATCH 6/6] docs(release): document v3.7.0 release in changelog, roadmap, and security policy --- AGENTS.md | 2 +- CHANGELOG.md | 16 ++++++++++++++++ README.md | 9 +++++---- ROADMAP.md | 1 + SECURITY.md | 7 ++++--- 5 files changed, 27 insertions(+), 8 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 530d13f..e830f9a 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -42,7 +42,7 @@ ## Conventions - Commit style: Conventional Commits (`feat:`, `fix:`, `docs:`, `chore:`, `ci:`) -- Versioning: Semantic Versioning (v3.6.4 current) +- Versioning: Semantic Versioning (v3.7.0 current) - Branch naming: `feat/desc`, `fix/desc`, `docs/desc`, `chore/desc`, `ci/desc` - go-ftw integration tests via `make test-waf` (122 tests across 12 CRS families, baseline, false positives, perimeter hardening) + live header validation (CSP, HSTS, no banners) + active rate limit burst test + bare-boot regression + kernel asserts (`make test-kernel`) - WAF default: DetectionOnly (change to On after 7-14 day observation window) diff --git a/CHANGELOG.md b/CHANGELOG.md index 245601f..ee0a17f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file. Format: [Keep a Changelog](https://keepachangelog.com/) · Versioning: [SemVer](https://semver.org/) +## [3.7.0] - 2026-11-16 + +### Security + +- **Caddy v2.11.9 Upgrade**: Updated Caddy to **v2.11.9** (multi-arch digests: builder `sha256:29f98311e17e583811355fa62cc080f71d6f3aa19cf09a9e1494d30579f8bebf`, runtime `sha256:fc9cbc100585871d18d4e451cca7021785c90a7006087427ae5ceb3e4efe6424`), mitigating 7 security advisories (GHSA-r766-rf9f-588h, GHSA-f278-mgc7-46j3, GHSA-25cw-38mq-q7m6, GHSA-69hv-5jfc-mvmv, GHSA-jf74-f69g-hcj9, GHSA-8qx7-j2v2-x6q5, GHSA-q34h-28rj-5hjm). +- **Go 1.27.4 Toolchain Adoption**: Enforced `GOTOOLCHAIN=go1.27.4` in builder stage, mitigating CVE-2026-97054, CVE-2026-97043, CVE-2026-97042, and CVE-2026-97041. +- **go-jose v4.1.9 Upgrade**: Updated `github.com/go-jose/go-jose/v4` replacement to **v4.1.9** via `xcaddy build --replace`, fixing oversized RSA modulus and unsupported curve handling. + +### Changed + +- **Alpine Base Refresh & Package Pinning**: Updated pinned package versions to `wget=1.25.0-r3 tar=1.35-r5` to align with the Alpine 3.24 base in Caddy 2.11.9. +- **Development Tooling**: Upgraded Trivy to **0.76.2** with verified multi-architecture SHA-256 digests in `tools/versions.mk`. +- **CI Dependencies**: Updated GitHub Actions (`upload-sarif`, `login-action`) to latest pinned commit SHAs. +- **Version Alignment**: OCI `LABEL version` → **3.7.0** in `Dockerfile`, default compose image to `v3.7.0`. + ## [3.6.4] - 2026-11-07 ### Security @@ -332,6 +347,7 @@ Format: [Keep a Changelog](https://keepachangelog.com/) · Versioning: [SemVer]( - README.md and README.es.md with setup instructions. +[3.7.0]: https://github.com/Developmi/caddy-waf/compare/v3.6.4...v3.7.0 [3.6.4]: https://github.com/Developmi/caddy-waf/compare/v3.6.3...v3.6.4 [3.6.3]: https://github.com/Developmi/caddy-waf/compare/v3.6.2...v3.6.3 [3.6.2]: https://github.com/Developmi/caddy-waf/compare/v3.6.1...v3.6.2 diff --git a/README.md b/README.md index 82fe3b1..1760c7b 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ Starting from v3.0.0, the image ships with updated Caddy 2.11.7, official upstre ### 1. Pull the Image ```bash -docker pull ghcr.io/developmi/caddy-waf:v3.6.4 +docker pull ghcr.io/developmi/caddy-waf:v3.7.0 ``` ### 2. Create Environment File @@ -232,7 +232,7 @@ volumes: ### Environment Variables | Variable | Default | Description | |----------|---------|-------------| -| `CADDY_WAF_IMAGE` | `ghcr.io/developmi/caddy-waf:v3.6.4` | Caddy WAF image reference | +| `CADDY_WAF_IMAGE` | `ghcr.io/developmi/caddy-waf:v3.7.0` | Caddy WAF image reference | | `EXAMPLE_APP_IMAGE` | `containous/whoami:latest` | Demo backend image | | `SITE_ADDRESS` | `localhost` | Site address/server name used by Caddy | | `BACKEND_UPSTREAM` | `example-app:80` | Reverse proxy backend upstream | @@ -318,10 +318,10 @@ curl -I https://yourdomain.com ### Security Scanning ```bash # Scan image with Trivy -docker run --rm aquasec/trivy image ghcr.io/developmi/caddy-waf:v3.6.4 +docker run --rm aquasec/trivy image ghcr.io/developmi/caddy-waf:v3.7.0 # Scan with Docker Scout -docker scout quickview ghcr.io/developmi/caddy-waf:v3.6.4 +docker scout quickview ghcr.io/developmi/caddy-waf:v3.7.0 ``` ### Integration Tests (go-ftw & Perimeter Hardening) @@ -500,6 +500,7 @@ The project follows [Keep a Changelog](https://keepachangelog.com/) and [Semanti | Version | Date | Highlights | |---------|------|------------| +| [3.7.0](./CHANGELOG.md#370---2026-11-16) | 2026-11-16 | Upgraded Caddy core to v2.11.9 (7 GHSAs mitigated), go-jose/v4 to v4.1.9, Go toolchain to 1.27.4 | | [3.6.4](./CHANGELOG.md#364---2026-11-07) | 2026-11-07 | Upstream golang.org/x/net to v0.62.0 (mitigating CVE-2026-78661) | | [3.6.3](./CHANGELOG.md#363---2026-11-04) | 2026-11-04 | Upstream go-jose/v4 to v4.1.8 (5 security advisories mitigated, ML-DSA support) | | [3.6.2](./CHANGELOG.md#362---2026-10-28) | 2026-10-28 | Mitigated CVE-2026-116587 (go-jose v4.1.6), Go 1.27.3 toolchain, Trivy 0.76.1, go-ftw 2.6.2 | diff --git a/ROADMAP.md b/ROADMAP.md index 9a8587c..b6cdf78 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -42,6 +42,7 @@ Every completed item links to the exact commit or PR that delivered it — verif | 15. CVE-2026-116587 Mitigation & Toolchain Alignment | → `v3.6.2` | Mitigated CVE-2026-116587 (go-jose/v4 to v4.1.6, suppressed unpatched v3); updated Go toolchain to 1.27.3, Trivy to 0.76.1, and go-ftw to 2.6.2 | | 16. Upstream go-jose/v4 Security Bump | → `v3.6.3` | Upgraded `go-jose/v4` to `v4.1.8`, mitigating 5 additional upstream security advisories (GHSA-r39w-98wm-9pp6, etc.) and adding ML-DSA support | | 17. Upstream x/net Security Bump | → `v3.6.4` | Upgraded `golang.org/x/net` to `v0.62.0`, mitigating CVE-2026-78661 (DoS in html parser via crafted input) | +| 18. Caddy 2.11.9 Core Security & Go 1.27.4 Bump | → `v3.7.0` | Upgraded Caddy core to 2.11.9 (7 GHSAs mitigated), go-jose/v4 to v4.1.9, Go toolchain to 1.27.4 (4 CVEs mitigated), and Alpine base packages to tar 1.35-r5 / wget 1.25.0-r3. | **Observability note:** The same `metrics/prometheus.yml` feeds both backends (VictoriaMetrics via `-promscrape.config`, Prometheus via `--config.file`) — Caddy's `/metrics` output needs no changes. Admin `:2019` remains internal-only. diff --git a/SECURITY.md b/SECURITY.md index b8fe279..bae34b7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,9 +4,10 @@ | Version | Supported | |---------|-----------| -| 3.6.x | ✅ Yes (current) | -| 3.5.x | ❌ No - upgrade to 3.6.x | -| 2.0.x | ❌ No - migrated to Developmi, upgrade to 3.6.x | +| 3.7.x | ✅ Yes (current) | +| 3.6.x | ❌ No - upgrade to 3.7.x | +| 3.5.x | ❌ No - upgrade to 3.7.x | +| 2.0.x | ❌ No - migrated to Developmi, upgrade to 3.7.x | | 1.0.x | ❌ No | Only the latest release line receives security updates.