Commit Graph
4 Commits
Author SHA1 Message Date
DashCaddy Polish Loop 384f9c8bdb Merge remote-tracking branch 'origin/fix/dc-069-caddy-admin-ipv6-origin'
CI / Test & Lint (push) Canceled after 0s
CI / Security audit (push) Canceled after 0s
2026-08-18 13:35:30 -07:00
DashCaddy Polish Loop c6b2f556c2 fix(openclaw): harden proxy — 5 MiB cap, RFC 7230 hop-by-hop strip, open-redirect (Location/Refresh/WWW-Auth) strip, path + status validators (DC-065) [glm-grade=A]
CI / Test & Lint (push) Canceled after 0s
CI / Security audit (push) Canceled after 0s
Round 1 GLM-5.3: C — missing "location" (open-redirect through proxy).
Round 2 GLM-5.3: C — missing "refresh" + "www-authenticate" (same class).
Round 3 GLM-5.3: A — ship.

Closure of four vulnerabilities in routes/openclaw.js proxyRequest():

  (a) Unbounded response passthrough → 5 MiB cap with 502 + DC-065
      message on overrun. Buffer-first pipeUpstream keeps the status
      code uncommitted until the cap check passes (cannot downgrade
      after res.write()).

  (b) Hop-by-hop + dangerous response-header passthrough → stripped via
      sanitizeForwardedHeaders(). Hop-by-hop per RFC 7230 §6.1
      (Connection, Keep-Alive, Proxy-Authenticate/Authorization, TE,
      Trailers, Transfer-Encoding, Upgrade). Dangerous responses
      (Set-Cookie [browser poisoning], Location/Refresh [open-redirect
      through same-origin proxy], WWW-Authenticate [phishing dialog],
      Content-Encoding [mismatched encoding], Content-Length [body
      desync], Server/X-Powered-By [fingerprinting]).

  (c) proxyRes.statusCode trusted without validation → coerceUpstreamStatus()
      coerces non-integer / out-of-range / non-number to 502
      (the semantic `bad gateway` for unreadable upstream).

  (d) Path taken from req.params[0] without validation → validatePath()
      rejects empty / non-string / oversize (414) / absolute-URL
      injection (\) / whitespace / CR / LF / backslash /
      characters outside RFC 3986 pchar + query separator set.

Tests: __tests__/routes/openclaw.proxy-hardening.test.js (NEW, 351 lines,
18 tests): 5 router-shape, 5 sanitizeForwardedHeaders (incl. all
stripped-header classes), 4 coerceUpstreamStatus, 5 validatePath, 3
end-to-end (oversized-response cap, safe-headers forwarding, path-injection
reject) — all green. Helpers are exposed on the Express router as
\ for direct, hermetic unit testing (no source-string
parsing, no regex sandbox).

Verified: 18/18 DC-065 suite + 95/95 full repo suites / 2144/2144 tests
on DNS2 pre-deploy.

Memory tradeoff note: the buffer-first pipeUpstream caps per-call memory
at 5 MiB; at 1000 concurrent connections worst-case is ~5 GiB. Node CLI
flags in start.sh + ulimit bound concurrency. Documented inline.
2026-08-18 11:59:58 -07:00
DashCaddy Polish Loop 4e75b13e90 Merge feature/dc-064-discover-adopt-fetcht: DC-064 discover-adopt fetchT (glm-grade=A)
CI / Test & Lint (push) Canceled after 0s
CI / Security audit (push) Canceled after 0s
2026-08-18 11:32:14 -07:00
DashCaddy Polish Loop c01a011d47 [glm-grade=A] fix(caddy-upstreams): swap errorResponse arg order to statusCode-first; add type validator (DC-062)
CI / Test & Lint (push) Canceled after 0s
CI / Security audit (push) Canceled after 0s
Routes/caddy-upstreams.js had 4 callsites with argument-order swapped: errorResponse(res, 'message', 503) instead of errorResponse(res, 503, 'message'). The canonical signature from src/utils/responses.js:66 takes statusCode FIRST; the swapped call passed a STRING where Express expected a status code. res.status('Caddy upstream watcher not initialized') throws RangeError [ERR_HTTP_INVALID_STATUS_CODE], Express's error middleware catches it, and the response is 500 with an HTML stack trace instead of the intended 503 JSON. Four `!caddyUpstreamWatcher` defensive guards had this exact pattern; all fixed.

Defense-in-depth (responses.js): errorResponse() now validates that statusCode is an integer in 100..599 and that message is a string BEFORE calling res.status(). Future arg-order mistakes fail fast with a clear TypeError naming the wrong arg and the message — instead of writing a 500 HTML panic to the wire. Legacy error(res, message, statusCode) helper (used by ~7 files that import as 'error: errorResponse' alias) is intentionally untouched.

Tests (__tests__/utils-responses-dc-062.test.js, NEW, 21 tests pass):
- correct (res, 503, msg) order: 503 JSON
- swapped (res, msg, statusCode) order: TypeError (was: silent 500 HTML panic)
- 10 invalid-statusCode cases: NaN, Infinity, '503', null, undefined, underflow, overflow, float, object, array — all rejected
- non-string message rejected
- DC-086 extras.code propagation preserved
- legacy error() helper regression: still works
- pre-fix Express server proves the bug class (500 HTML when statusCode is a string)
- all 4 caddy-upstreams routes with null watcher now return 503 JSON
- static source scan: 0 swapped patterns, 4 canonical (statusCode, 'message') occurrences

Full suite: 92 suites / 2039 tests / all green pre and post fix.

[glm-grade=A] from deleg_45e44614 (3 tool calls, 82s, MiniMax-M3 stand-in per Sami's 2026-08-17 authorization)
2026-08-18 09:03:58 -07:00