35 Commits

Author	SHA1	Message	Date
WeidiDeng	80f2ae92cd	reverseproxy: make error chan bigger when reverse proxying websocket (#7419)	2026-01-06 04:55:47 -05:00
Anthony Biondo	7fb39ec1e5	reverseproxy: Use http1.1 upgrade for websocket for extended connect of http2 and http3 (#7305) ... Co-authored-by: WeidiDeng <weidi_deng@icloud.com>	2025-10-16 02:20:20 +00:00
Mohammed Al Sahaf	25be2f26fc	chore: ugh, lint fix... (#7275) ... * chore: ugh, lint fix... Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * more lint fixes Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2025-09-26 03:14:48 -04:00
mountdisk	c712cfcd76	docs: fix some minor issues in the comments (#7101)	2025-06-30 06:50:00 +00:00
WeidiDeng	9c0c71e577	reverseproxy: Rewrite requests and responses for websocket over http2 (#6567) ... * reverse proxy: rewrite requests and responses for websocket over http2 * delete protocol pseudo-header * modify cloned requests * set request variable to track if it's a h2 websocket * use request bodu * rewrite request body * use WebSocket instead of Websocket in the headers * use logger check for zap loggers * fix lint	2024-12-06 13:23:27 -07:00
Matthew Holt	5e6024c48d	reverseproxy: Fix log message ... Fixes regression from #6560	2024-10-21 12:19:04 -06:00
WeidiDeng	48ce47f1d4	reverseproxy: Use correct cases for websocket related headers (#6621) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-10-11 09:02:23 +00:00
Kévin Dunglas	f4bf4e0097	perf: use zap's Check() to prevent useless allocs (#6560) ... * perf: use zap's Check() to prevent useless allocs * fix * fix * fix * fix * restore previous replacer behavior * fix linter	2024-09-13 11:16:37 -06:00
WeidiDeng	1b9042bcdd	reverseproxy: handle buffered data during hijack (#6274)	2024-04-26 09:09:18 -06:00
WeidiDeng	b40cacf5ce	reverseproxy: Wait for both ends of websocket to close (#6175)	2024-04-15 11:37:37 -06:00
Francis Lavoie	3248e4c89f	logging: Add zap.Option support (#5944)	2023-12-18 20:48:34 +00:00
Matt Holt	3a3182fba3	reverseproxy: Add more debug logs (#5793) ... * reverseproxy: Add more debug logs This makes debug logging very noisy when reverse proxying, but I guess that's the point. This has shown to be useful in troubleshooting infrastructure issues. * Update modules/caddyhttp/reverseproxy/streaming.go Co-authored-by: Francis Lavoie <lavofr@gmail.com> * Update modules/caddyhttp/reverseproxy/streaming.go Co-authored-by: Francis Lavoie <lavofr@gmail.com> * Add opt-in `trace_logs` option * Rename to VerboseLogs --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-10-11 13:36:20 -06:00
Jacob Gadikian	b32f265eca	ci: Use gofumpt to format code (#5707)	2023-08-07 19:40:31 +00:00
WeidiDeng	e2fc08bd34	reverseproxy: Fix hijack ordering which broke websockets (#5679)	2023-08-03 04:08:12 +00:00
Francis Lavoie	cd486c25d1	caddyhttp: Make use of http.ResponseController (#5654) ... * caddyhttp: Make use of http.ResponseController Also syncs the reverseproxy implementation with stdlib's which now uses ResponseController as well 2449bbb5e6 * Enable full-duplex for HTTP/1.1 * Appease linter * Add warning for builds with Go 1.20, so it's less surprising to users * Improved godoc for EnableFullDuplex, copied text from stdlib * Only wrap in encode if not already wrapped	2023-08-02 20:03:26 +00:00
mmm444	424ae0f420	reverseproxy: Experimental streaming timeouts (#5567) ... * reverseproxy: WIP streaming timeouts * More verbose logging by using the child logger * reverseproxy: Implement streaming timeouts * reverseproxy: Refactor cleanup * reverseproxy: Avoid **time.Timer --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-06-19 15:54:43 -06:00
Francis Lavoie	66e571e687	reverseproxy: Add mention of which half a copyBuffer err comes from (#5472) ... Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-03-31 15:46:29 -04:00
WeidiDeng	c77a6bea66	reverseproxy: Log status code and byte count for websockets (#5140) ... * log response size for websocket request * record size when using hijack bufio.Writer	2023-02-06 16:14:59 -07:00
Francis Lavoie	ee7c92ec9b	reverseproxy: Mask the WS close message when we're the client (#5199) ... * reverseproxy: Mask the WS close message when we're the client * weakrand * Bump golangci-lint version so path ignores work on Windows * gofmt * ugh, gofmt everything, I guess	2022-11-14 09:38:02 -07:00
Matt Holt	66476d8c8f	reverseproxy: Close hijacked conns on reload/quit (#4895) ... * reverseproxy: Close hijacked conns on reload/quit We also send a Close control message to both ends of WebSocket connections. I have tested this many times in my dev environment with consistent success, although the variety of scenarios was limited. * Oops... actually call Close() this time * CloseMessage --> closeMessage Co-authored-by: Francis Lavoie <lavofr@gmail.com> * Use httpguts, duh * Use map instead of sync.Map Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2022-09-02 17:01:55 -06:00
Francis Lavoie	141872ed80	chore: Bump up to Go 1.19, minimum 1.18 (#4925)	2022-08-02 16:39:09 -04:00
Francis Lavoie	e4ce40f8ff	reverseproxy: Sync up handleUpgradeResponse with stdlib (#4664) ... * reverseproxy: Sync up `handleUpgradeResponse` with stdlib I had left this as a TODO for when we bump to minimum 1.17, but I should've realized it was under `internal` so it couldn't be used directly. Copied the functions we needed for parity. Hopefully this is ok! * Add tests and fix godoc comments Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2022-04-11 12:49:56 -06:00
Francis Lavoie	e6c29ce081	reverseproxy: Incorporate latest proxy changes from stdlib (#4266) ... I went through the commits that touched stdlib's `reverseproxy.go` file, and copied over all the changes that are to code that was copied into Caddy. The commits I pulled changes from: - 2cc347382f - a5cea062b3 - ecdbffd4ec - 21898524f6 -ca3c0df1f8 - 9c017ff30d This may also fix https://github.com/caddyserver/caddy/issues/4247 because of the change to `copyResponse` to set `mlw.flushPending = true` right away.	2021-08-12 10:48:24 -06:00
Matthew Holt	a17c3b568d	reverseproxy: Minor logging improvements	2021-05-05 14:52:24 -06:00
Dave Henderson	bd17eb205d	ci: Use golangci's github action for linting (#3794) ... * ci: Use golangci's github action for linting Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix most of the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the prealloc lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the misspell lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the varcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the errcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the bodyclose lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the deadcode lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the unused lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosec lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosimple lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the ineffassign lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert the misspell change, use a neutral English Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove broken golangci-lint CI job Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Re-add errantly-removed weakrand initialization Signed-off-by: Dave Henderson <dhenderson@gmail.com> * don't break the loop and return * Removing extra handling for null rootKey * unignore RegisterModule/RegisterAdapter Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> * single-line log message Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Fix lint after a1808b0dbf209c615e438a496d257ce5e3acdce2 was merged Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert ticker change, ignore it instead Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Ignore some of the write errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove blank line Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Use lifetime Signed-off-by: Dave Henderson <dhenderson@gmail.com> * close immediately Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Preallocate configVals Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Update modules/caddytls/distributedstek/distributedstek.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2020-11-22 14:50:29 -07:00
Francis Lavoie	96058538f0	reverseproxy: Logging for streaming and upgrades (#3689) ... * reverseproxy: Enable error logging for connection upgrades * reverseproxy: Change some of the error levels, unsugar * Use unsugared log in one spot Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2020-11-20 14:24:58 -07:00
Christian Flach	fdfdc03339	reverseproxy: Ignore RFC 1521 params in Content-Type header (#3758) ... Without this change, a Content-Type header like "text/event-stream;charset=utf-8" would not trigger the immediate flushing. Fixes #3765	2020-10-01 12:15:45 -06:00
Matthew Holt	c94f5bb7dd	reverseproxy: Make default buffer size const	2020-08-17 16:17:16 -06:00
Kevin Lin	904f149e5b	reverse_proxy: fix bidirectional streams with encodings (fix #3606) (#3620) ... * reverse_proxy: fix bi-h2stream breaking gzip encode handle(#3606). * reverse_proxy: check http version of both sides to avoid affecting non-h2 upstream. * Minor cleanup; apply review suggestions Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2020-08-03 20:50:38 -06:00
Kevin Lin	e9b1d7dcb4	reverse_proxy: flush HTTP/2 response when ContentLength is unknown (#3561) ... * reverse proxy: Support more h2 stream scenarios (#3556) * reverse proxy: add integration test for better h2 stream (#3556) * reverse proxy: adjust comments as francislavoie suggests * link to issue #3556 in the comments	2020-07-20 12:14:46 -06:00
Matthew Holt	b3bff13f7d	reverseproxy: Close websocket conn if req context cancels ... This is a recent patch in the Go standard library	2020-06-11 15:25:26 -06:00
Matthew Holt	881b826fb5	reverseproxy: Pool copy buffers (minor optimization)	2020-05-27 11:42:19 -06:00
Mohammed Al Sahaf	dff78d82ce	v2: housekeeping: address minor lint complaints (#2957) ... * v2: housekeeping: update tools * v2: housekeeping: adhere to US locale in spelling * v2: housekeeping: simplify code	2020-01-03 11:33:22 -07:00
Matthew Holt	1228dd7d93	reverse_proxy: Allow buffering of client requests ... This is a bad idea, but some backends apparently require it. See discussion in #176.	2019-11-15 17:15:33 -07:00
Matthew Holt	652460e03e	Some cleanup and godoc	2019-09-03 16:56:09 -06:00