1242 Commits

Author	SHA1	Message	Date
Sam.An	7e83775e3a	Merge commit from fork ... Only apply repl.ReplaceAll() on values from literal variable names (e.g. map outputs), not on values resolved from placeholder keys (e.g. {http.request.header.*}). The placeholder path already resolves the value via repl.Get(), so a second expansion allows user-controlled input containing {env.*} or {file.*} to be evaluated, leaking environment variables and file contents. Add regression test to verify placeholder-sourced values are not re-expanded.	2026-03-04 09:08:39 -07:00
newklei	2dbcdefbbe	forward_auth: copy_headers does not strip client-supplied identity headers (Fixes GHSA-7r4p-vjf4-gxv4) (#7545) ... When using copy_headers in a forward_auth block, client-supplied headers with the same names were not being removed before being forwarded to the backend. This happens because PR #6608 added a MatchNot guard that skips the Set operation when the auth service does not return a given header. That guard prevents setting headers to empty strings, which is the correct behavior, but it also means a client can send X-User-Id: admin in their request and if the auth service validates the token without returning X-User-Id, Caddy skips the Set and the client value passes through unchanged to the backend. The fix adds an unconditional delete route for each copy_headers entry, placed just before the existing conditional set route. The delete always runs regardless of what the auth service returns. The conditional set still only runs when the auth service provides that header. The end result is: - Client-supplied headers are always removed - When the auth service returns the header, the backend gets that value - When the auth service does not return the header, the backend sees nothing Existing behavior is unchanged for any deployment where the auth service returns all of the configured copy_headers entries. Fixes GHSA-7r4p-vjf4-gxv4	2026-03-03 23:30:49 -05:00
Varun Chawla	dc36082859	caddyhttp: Collect metrics once per route instead of per handler (#7492) ... * perf: collect metrics once per route instead of per handler (#4644) Move Prometheus metrics instrumentation from the per-handler level to the per-route level. Previously, every middleware handler in a route was individually wrapped with metricsInstrumentedHandler, causing metrics to be collected N times per request (once per handler in the chain). Since all handlers in a route see the same request, these per-handler metrics were redundant and added significant CPU overhead (73% of request handling time per the original profiling). The fix introduces metricsInstrumentedRoute which wraps the entire compiled handler chain once in wrapRoute, collecting metrics only when the route actually matches. The handler label uses the first handler's module name, which is the most meaningful identifier for the route. Benchmark results (5 handlers per route): Old (per-handler): ~4650 ns/op, 4400 B/op, 45 allocs/op New (per-route): ~940 ns/op, 816 B/op, 8 allocs/op Improvement: ~5x faster, ~5.4x less memory, ~5.6x fewer allocs Signed-off-by: Varun Chawla <varun_6april@hotmail.com> * Remove unused metricsInstrumentedHandler code Delete the metricsInstrumentedHandler type, its constructor, and ServeHTTP method since they are no longer used after switching to route-level metrics collection via metricsInstrumentedRoute. Also remove the unused metrics parameter from wrapMiddleware and the middlewareHandlerFunc test helper, and convert existing tests to use the new route-level API. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Address review feedback: restore comments, move function to bottom - Move computeApproximateRequestSize back to bottom of file to minimize diff - Restore all useful comments that were accidentally dropped - Old metricsInstrumentedHandler already removed in previous commit --------- Signed-off-by: Varun Chawla <varun_6april@hotmail.com> Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>	2026-03-03 15:15:55 -07:00
Paulo Henrique	88616e86e6	api: Add all in-flight requests /reverse_proxy/upstreams (Fixes #7277) (#7517) ... This refactors the initial approach in PR #7281, replacing the UsagePool with a dedicated package-level sync.Map and atomic.Int64 to track in-flight requests without global lock contention. It also introduces a lookup map in the admin API to fix a potential O(n^2) iteration over upstreams, ensuring that draining upstreams are correctly exposed across config reloads without leaking memory. Co-authored-by: Y.Horie <u5.horie@gmail.com> reverseproxy: optimize in-flight tracking and admin API - Replaced sync.RWMutex with sync.Map and atomic.Int64 to avoid lock contention under high RPS. - Introduced a lookup map in the admin API to fix a potential O(n^2) iteration over upstreams.	2026-03-03 15:14:55 -07:00
Francis Lavoie	d935a6956c	autohttps: Ensure CertMagic config is recreated after autohttps runs (#7510)	2026-03-03 14:44:06 -07:00
Akın Demirci	11b56c6cfc	reverseproxy: Fix health_port being ignored in health checks (#7533)	2026-03-03 13:10:54 -05:00
WeidiDeng	2ab043b890	reverseproxy: query escape request urls when proxy protocol is enabled (#7537)	2026-03-02 02:04:06 -05:00
Matt Holt	174fa2ddb9	caddyhttp: Evaluate tls.client placeholders more accurately (fix #7530) (#7534)	2026-02-28 22:03:18 -07:00
Matthew Holt	06a05e383c	Revert "encode: Implement Flush for legacy compatibility" ... This reverts commit bdcdaf77ba6276b5ead20fa2518e00391150523d.	2026-02-27 14:14:19 -07:00
Matthew Holt	eac02ee98f	caddyhttp: Limit empty Host check to HTTP/1.1	2026-02-27 10:22:39 -07:00
Oleksandr Redko	72eaf2583a	chore: Enable modernize linter (#7519)	2026-02-26 14:01:35 -07:00
Fardjad Davari	9798f6964d	caddyhttp: Avoid nil pointer dereference in proxyWrapper (#7521)	2026-02-25 04:08:41 -05:00
Paulo Henrique	76b198f586	http: Sort auto-HTTPS redirect routes by host specificity (fixes #7390) (#7502)	2026-02-21 21:42:40 -05:00
Mohammed Al Sahaf	d7b21c6104	reverseproxy: fix tls dialing w/ proxy protocol (#7508)	2026-02-21 21:37:10 -05:00
Matthew Holt	cb436f0a0e	fileserver: Fix tests on Windows	2026-02-20 11:46:45 -07:00
Matt Holt	a1081194bf	Merge commit from fork ... Necessary as otherwise the early-bail in `until = strings.IndexByte(remaining, nextCh) ... if until == -1` can cause a case-insensitive mismatch Co-authored-by: Asim Viladi Oglu Manizada <manizada@users.noreply.github.com>	2026-02-20 10:54:50 -07:00
Asim Viladi Oglu Manizada	eec32a0bb5	Merge commit from fork ... Normalize exact hosts at provisioning and reqHost in the fast path so case-different Host variants can’t bypass host-gated routes. Co-authored-by: Asim Viladi Oglu Manizada <manizada@users.noreply.github.com>	2026-02-20 10:19:42 -07:00
Matthew Holt	a2825c5dd9	fileserver: Replace \ with \\ in file matcher paths	2026-02-19 13:18:14 -07:00
Matt Holt	95941a71e8	chore: Add nolints to work around haywire linters (#7493) ... * chore: Add nolints to work around haywire linters * More lint wrangling	2026-02-17 16:52:54 -07:00
Matthew Holt	bdcdaf77ba	encode: Implement Flush for legacy compatibility ... (By sponsor request)	2026-02-16 15:59:10 -07:00
zjumathcode	68d50020ee	refactor: use strings.Builder to improve performance (#7364) ... * refactor: use strings.Builder to improve performance Signed-off-by: zjumathcode <pai314159@2980.com> * refactor: small builder improvements per review (WriteByte / split writes) also revert builder change in client_test.go refactor(logging): build IP mask output via join of parts (more efficient) --------- Signed-off-by: zjumathcode <pai314159@2980.com> Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2026-02-16 19:30:44 +00:00
Mohammed Al Sahaf	23d07ac89d	dep: upgrade cel-go (#7478) ... * dep: upgrade cel-go Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * Try handling `map[any]any`, fix error messages --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2026-02-16 18:25:49 +00:00
Francis Lavoie	d64c7e67a4	caddyhttp: Option to disable 0-RTT (#7485)	2026-02-16 10:20:47 -07:00
WeidiDeng	47f3e8f8dc	use math/rand/v2 instead of math/rand (#7413)	2026-02-11 09:15:51 -07:00
XYenon	03e6e439dd	reverseproxy: fix X-Forwarded-* headers for Unix socket requests (#7463) ... When a request arrives via a Unix domain socket (RemoteAddr == "@"), net.SplitHostPort fails, causing addForwardedHeaders to strip all X-Forwarded-* headers even when the connection is trusted via trusted_proxies_unix. Handle Unix socket connections before parsing RemoteAddr: if untrusted, strip headers for security; if trusted, let clientIP remain empty (no peer IP for a Unix socket hop) and fall through to the shared header logic, preserving the existing XFF chain without appending a spurious entry. Amp-Thread-ID: https://ampcode.com/threads/T-019c4225-a0ad-7283-ac56-e2c01eae1103 Co-authored-by: Amp <amp@ampcode.com>	2026-02-10 13:00:20 -07:00
Kévin Dunglas	7c28c0c07a	Merge commit from fork ... * fix: FastCGI split SCRIPT_NAME/PATH_INFO confusion * fix comment	2026-02-10 11:52:36 -07:00
Matthew Holt	1f43e8566b	caddyhttp: Use case-insensitive comparison for large Host lists	2026-02-09 14:18:55 -07:00
Matthew Holt	bd374ca9d7	caddyhttp: Lowercase comparison when matching with escape sequence	2026-02-09 13:12:00 -07:00
Francis Lavoie	2ae0f7af69	reverseproxy: Set Host to {upstream_hostport} automatically if TLS (#7454)	2026-02-09 13:06:19 -07:00
Matthew Holt	3bb22672f9	reverseproxy: Customizable dial network for SRV upstreams ... By request of a sponsor	2026-02-02 11:25:51 -07:00
Matthew Holt	7d24124430	caddyhttp: Reject invalid Host header (fix #7449)	2026-01-30 12:24:16 -07:00
Paulo Henrique	565c1c3054	autohttps: deterministic logic and strict bind checking on Linux (#7435) ... * http: fix non-deterministic auto-https and improve Linux bind matching * docs: restore historical context about Linux bind behavior	2026-01-16 08:51:23 -07:00
Mohammed Al Sahaf	e40bd019ff	caddyfile: add observe_catchall_hosts option (#7434) ... * caddyfile: add `observe_catchall_hosts` option Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * correct JSON field name and doc comment Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2026-01-14 00:06:16 +00:00
Paulo Henrique	62134d65af	reverseproxy: fix error when remote address is not an IP (#7429)	2026-01-13 19:52:56 +00:00
Francis Lavoie	90972fbebc	chore: Dumb prealloc lint fix (#7430)	2026-01-13 14:13:43 -05:00
Tom Paulus	6a57142896	headers: Make ApplyTo nil-safe (#7426)	2026-01-06 17:39:58 -05:00
WeidiDeng	80f2ae92cd	reverseproxy: make error chan bigger when reverse proxying websocket (#7419)	2026-01-06 04:55:47 -05:00
Felix Hildén	1f1be3f4fe	tracing: Add span attributes to tracing module (#7269) ... * WIP tracing span attributes * better test * only write attributes after other middleware (and request) * Fix test to use header response placeholders	2025-12-31 11:33:18 -07:00
Francis Lavoie	decc8a4d6f	logging: log_append Early option, Supports {http.response.body} (#7368) ... * logging: `log_append` early option * logging: `log_append` supports `{http.response.body}` * Convenience auto-early for request body	2025-12-16 23:42:42 -05:00
Francis Lavoie	4037d05760	caddyhttp: {http.request.body_base64} placeholder (#7367)	2025-12-13 21:01:12 -07:00
WeidiDeng	6e0cbd0fa0	caddyhttp: create a placeholder for and log ech status (#7328) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2025-12-07 16:01:58 +00:00
Steffen Busch	bfdb04912d	docs: add maybe template function documentation (#7388)	2025-12-06 06:51:28 -05:00
vnxme	31960dc998	Introduce packet conn wrappers (#7180) ... * packet_conn_wrappers: Initial changes * packet_conn_wrappers: Unwrap a packet conn only if there are no wrappers --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2025-12-04 14:15:56 -07:00
Francis Lavoie	be5f49fbeb	caddyhttp: Fix logging on wildcard sites when SkipUnmappedHosts is true (#7372)	2025-12-03 18:46:11 +00:00
Petr	67a9e0657e	reverseproxy: Fix retries for requests with bodies (#7360) ... * capture the buffered body once, then reset clonedReq.Body before each retry * no copy * keep receiver name * set the buf to nil after extraction and only return it to pool if not nil --------- Co-authored-by: WeidiDeng <weidi_deng@icloud.com>	2025-11-24 12:03:18 -07:00
ledigang	2cb426776c	encode: modernize, replace HasSuffix+TrimSuffix with CutSuffix (#7357) ... Signed-off-by: ledigang <shuangcui@msn.com>	2025-11-21 15:30:26 -07:00
WeidiDeng	a6da1acdc8	reverse_proxy: use interfaces to modify the behaviors of the transports (#7353)	2025-11-17 09:51:37 -07:00
Kévin Dunglas	b3f2db233b	core: custom slog handlers for modules (log contextual data) (#7346)	2025-11-12 13:29:47 -07:00
Marten Seemann	f2199d48b2	chore: update quic-go to v0.56.0, enable qlog for HTTP/3 (#7345)	2025-11-08 00:41:15 -05:00
Kévin Dunglas	8285eba842	caddyhttp: allow customizing the Server header (#7338)	2025-11-03 21:00:27 -07:00