156 Commits

Author	SHA1	Message	Date
joemicky	5125fbed41	use a more modern writing style to simplify code (#7182) ... Signed-off-by: joemicky <joemickychang@outlook.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2025-08-20 11:41:21 -06:00
WeidiDeng	7590c9ca1b	caddyhttp: Free up quic listener when stopping (#7177)	2025-08-13 12:35:06 -06:00
Matthew Holt	9b74a53e51	Revert "logging: Always set fields func; fix #6829" ... This reverts commit 932dac157a3c4693b80576477498bb86208b9b30. Somehow the code I was looking at changed when I committed, without realizing it. This has already been fixed in #6777.	2025-02-07 06:23:43 -07:00
Matthew Holt	197c564f20	caddyhttp: Set default ReadHeaderTimeout (1 min) ... Ref. #6663	2024-11-19 11:24:12 -07:00
Mohammed Al Sahaf	388c7e898c	metrics: move metrics up, outside servers (#6606) ... * metrics: move `metrics` up, outside `servers` This change moves the metrics configuration from per-server level to a single config knob within the `http` app. Enabling `metrics` in any of the configured servers inside `http` enables metrics for all servers. Fix #6604 Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * normalize domain name --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-10-18 09:54:21 -06:00
WeidiDeng	c6f2979986	caddyhttp: Close http3 server gracefully (#6213) ... * close http3 server gracefully * update server field * update from upstream --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-10-15 21:28:20 -04:00
Aaron Paterson	4b1a9b6cc1	core: Implement socket activation listeners (#6573) ... * caddy adapt for listen_protocols * adapt listen_socket * allow multiple listen sockets for port ranges and readd socket fd listen logic * readd logic to start servers according to listener protocols * gofmt * adapt caddytest * gosec * fmt and rename listen to listenWithSocket * fmt and rename listen to listenWithSocket * more consistent error msg * non unix listenReusableWithSocketFile * remove unused func * doc comment typo * nonosec * commit * doc comments * more doc comments * comment was misleading, cardinality did not change * addressesWithProtocols * update test * fd/ and fdgram/ * rm addr * actually write... * i guess we doin' "skip": now * wrong var in placeholder * wrong var in placeholder II * update param name in comment * dont save nil file pointers * windows * key -> parsedKey * osx * multiple default_bind with protocols * check for h1 and h2 listener netw	2024-09-30 10:55:03 -06:00
Alexander Stecher	22c98ea165	caddyhttp: Optimize logs using zap's WithLazy() (#6590) ... * uses zap's .WithLazy with a cloned request * fixes the cloning * adds comment explaining why cloning is faster	2024-09-26 12:23:12 -06:00
Francis Lavoie	2faeac0a10	chore: Use slices package where possible (#6585) ... * chore: Use slices package where possible * More, mostly using ContainsFunc * Even more slice operations	2024-09-25 14:30:56 -06:00
Marten Seemann	ff67b97126	caddyhttp: enable qlog, controlled by QLOGDIR env (#6581)	2024-09-21 05:47:18 +02:00
Mohammed Al Sahaf	6ab9fb6f74	ci: update the linter action version (#6575) ... * ci: update the linter action version Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * exclude rule `G115`; disable deprecated linter Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-09-16 07:50:26 -06: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	a8b0dfa8da	go.mod: update quic-go package (#6498)	2024-08-06 22:08:32 -06:00
Matt Holt	9ba999141b	caddyhttp: Trace individual middleware handlers (#6313) ... * caddyhttp: Trace individual middleware handlers * Fix typo	2024-05-18 14:48:42 -06:00
Aziz Rmadi	4356635d12	logging: Add support for additional logger filters other than hostname (#6082) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-05-11 13:31:44 +00:00
Matthew Holt	4af38e5ac8	caddyhttp: Log 4xx as INFO; 5xx as ERROR (close #6106)	2024-05-10 15:52:50 -06:00
Matthew Holt	399186abfc	Second half of 6dce493 ... Not sure how it got unstaged	2024-05-10 15:51:28 -06:00
Matthew Holt	2fc620d38d	caddyhttp: Fix linter warning about deprecation	2024-04-27 12:41:17 -06:00
Matthew Holt	a46ff50a1c	go.mod: Upgrade to quic-go v0.43.0	2024-04-27 12:01:30 -06:00
Francis Lavoie	726a9a8fde	logging: Fix default access logger (#6251) ... * logging: Fix default access logger * Simplify logic, remove retry without port, reject config with port, docs * Nil check	2024-04-22 06:33:07 -06:00
WeidiDeng	e0daa39cd3	caddyhttp: record num. bytes read when response writer is hijacked (#6173) ... * record the number of bytes read when response writer is hijacked * record body size when not nil	2024-04-17 15:00:37 +00:00
Francis Lavoie	70953e873a	caddyhttp: Support multiple logger names per host (#6088) ... * caddyhttp: Support multiple logger names per host * Lint * Add adapt test * Implement "string or array" parsing, keep original `logger_names` * Rewrite adapter test to be more representative of the usecase	2024-04-16 22:26:18 +00:00
WeidiDeng	924010cd3d	caddyhttp: close quic connections when server closes (#6202) ... * close quic connections when server closes * fix lint * add comment about CloseGracefully	2024-03-29 11:51:46 -06:00
Marten Seemann	32f7dd44ae	chore: Update quic-go to v0.42.0 (#6176) ... * update quic-go to v0.42.0 * use a rate limiter to control QUIC source address verification * Lint * remove deprecated ListenQUIC * remove number of requests tracking * increase the number of handshakes before source address verification is needed * remove references to request counters * remove deprecated listen* --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: WeidiDeng <weidi_deng@icloud.com>	2024-03-21 10:56:10 -06:00
Francis Lavoie	63d597c09d	caddyhttp: Accept XFF header values with ports, when parsing client IP (#6183)	2024-03-21 10:54:25 -06:00
Francis Lavoie	0d44e3ecba	logging: Implement log_append handler (#6066) ... * logging: Implement `extra_log` handler * Rename to `log_append` * Rename `skip_log` to `log_skip` --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-03-05 17:03:59 -07:00
Matt Holt	127788807f	caddyhttp: Register post-shutdown callbacks (#5948)	2024-02-14 21:21:23 -07:00
Francis Lavoie	2c48dda109	caddyhttp: Only attempt to enable full duplex for HTTP/1.x (#6102)	2024-02-13 13:45:38 -05:00
Marten Seemann	697cc593a1	chore: Update quic-go to v0.41.0, bump Go minimum to 1.21 (#6043) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-01-25 13:58:19 -05:00
Nebez Briefkani	cc0c0cf03e	caddyhttp: Security enhancements for client IP parsing (#5805) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-01-13 20:46:37 +00:00
Mohammed Al Sahaf	3b3d678714	Revert "caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848)" (#5924)	2023-11-01 13:17:02 -04:00
Harish Shan	c8559c4485	caddyhttp: Use sync.Pool to reduce lengthReader allocations (#5848) ... * Use sync.Pool to reduce lengthReader allocations Signed-off-by: Harish Shan <140232061+perhapsmaple@users.noreply.github.com> * Add defer putLengthReader to prevent leak Signed-off-by: Harish Shan <140232061+perhapsmaple@users.noreply.github.com> * Cleanup in putLengthReader Co-authored-by: Francis Lavoie <lavofr@gmail.com> --------- Signed-off-by: Harish Shan <140232061+perhapsmaple@users.noreply.github.com> Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-10-16 14:42:01 -06:00
WeidiDeng	7c82e265da	core: quic listener will manage the underlying socket by itself (#5749) ... * core: quic listener will manage the underlying socket by itself. * format code * rename sharedQUICTLSConfig to sharedQUICState, and it will now manage the number of active requests * add comment * strict unwrap type * fix unwrap * remove comment	2023-10-16 09:28:15 -06:00
Jacob Gadikian	d6f86cccf5	ci: use gci linter (#5708) ... * use gofmput to format code * use gci to format imports * reconfigure gci * linter autofixes * rearrange imports a little * export GOOS=windows golangci-lint run ./... --fix	2023-08-14 09:41:15 -06:00
Matt Holt	6cdcc2a782	ci: Update to Go 1.21 (#5719) ... * ci: Update to Go 1.21 * Bump quic-go to v0.37.4 * Check EnableFullDuplex err * Linter bug suppression See https://github.com/timakin/bodyclose/issues/52 --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-08-09 12:34:28 -04:00
Matthew Holt	431adc0980	templates: Fix httpInclude (fix #5698) ... Allowable during feature freeze because this is a simple, non-invasive bug fix only.	2023-08-07 12:53:21 -06: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
Dominik Roos	6a41b62e70	caddyhttp: Support custom network for HTTP/3 (#5573) ... Allow registering a custom network mapping for HTTP/3. This is useful if the original network for HTTP/1.1 and HTTP/2 is not a standard `unix`, `tcp4`, or `tcp6` network. To keep backwards compatibility, we fall back to `udp` if the original network is not registered in the mapping. Fixes #5555	2023-06-13 19:33:39 -06:00
WeidiDeng	29452647d8	caddyhttp: Fix h3 shutdown (#5541) ... * swap h3server close and listener close, avoid quic-listener not closing * fix typo	2023-05-19 10:00:00 -06:00
Francis Lavoie	cbf16f6d9e	caddyhttp: Implement named routes, invoke directive (#5107) ... * caddyhttp: Implement named routes, `invoke` directive * gofmt * Add experimental marker * Adjust route compile comments	2023-05-16 15:27:52 +00:00
jjiang-stripe	cfc85ae8ca	caddyhttp: Add a getter for Server.name (#5531)	2023-05-11 10:34:05 -06:00
Dave Henderson	f0e3981774	logging: Add traceID field to access logs when tracing is active (#5507) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-04-27 02:46:41 +00:00
WeidiDeng	d8d87a378f	caddyhttp: Serve http2 when listener wrapper doesn't return *tls.Conn (#4929) ... * Serve http2 when listener wrapper doesn't return *tls.Conn * close conn when h2server serveConn returns * merge from upstream * rebase from latest * run New and Closed ConnState hook for h2 conns * go fmt * fix lint * Add comments * reorder import	2023-04-10 17:05:02 +00:00
Francis Lavoie	2b3046de36	caddyhttp: Log request body bytes read (#5461)	2023-03-27 22:40:15 +00:00
Francis Lavoie	05e9974570	caddyhttp: Determine real client IP if trusted proxies configured (#5104) ... * caddyhttp: Determine real client IP if trusted proxies configured * Support customizing client IP header * Implement client_ip matcher, deprecate remote_ip's forwarded option	2023-03-27 20:22:59 +00:00
Francis Lavoie	12bcbe2c49	caddyhttp: Pluggable trusted proxy IP range sources (#5328) ... * caddyhttp: Pluggable trusted proxy IP range sources * Add request to the IPRangeSource interface	2023-02-06 12:44:11 -07:00
Francis Lavoie	e62b5fb586	chore: Build with Go 1.20, keep minimum at 1.18 for now (#5353)	2023-02-06 11:29:20 -05:00
Francis Lavoie	223cbe3d0b	caddyhttp: Add server-level trusted_proxies config (#5103)	2023-01-10 00:08:23 -05:00
Matt Holt	6bad878a22	httpcaddyfile: Improve detection of indistinguishable TLS automation policies (#5120) ... * httpcaddyfile: Skip some logic if auto_https off * Try removing this check altogether... * Refine test timeouts slightly, sigh * caddyhttp: Assume udp for unrecognized network type Seems like the reasonable thing to do if a plugin registers its own network type. * Add comment to document my lack of knowledge * Clean up and prepare to merge Add comments to try to explain what happened	2022-10-13 11:30:57 -06:00
Francis Lavoie	99ffe93388	logging: Fix skip_hosts with wildcards (#5102) ... Fix #4859	2022-10-05 12:14:13 -06:00