157 Commits

Author	SHA1	Message	Date
Matt Holt	1bfa111552	caddytls: Prefer managed wildcard certs over individual subdomain certs (#6959) ... * caddytls: Prefer managed wildcard certs over individual subdomain certs * Repurpose force_automate as no_wildcard * Fix a couple bugs * Restore force_automate and use automate loader as wildcard override	2025-04-18 11:44:23 -06:00
Matthew Holt	1975408d89	chore: Remove unnecessary explicit type parameters	2025-03-07 11:18:00 -07:00
Matt Holt	d7764dfdbb	caddytls: Encrypted ClientHello (ECH) (#6862) ... * caddytls: Initial commit of Encrypted ClientHello (ECH) * WIP Caddyfile * Fill out Caddyfile support * Enhance godoc comments * Augment, don't overwrite, HTTPS records * WIP * WIP: publication history * Fix republication logic * Apply global DNS module to ACME challenges This allows DNS challenges to be enabled without locally-configured DNS modules * Ignore false positive from prealloc linter * ci: Use only latest Go version (1.24 currently) We no longer support older Go versions, for security benefits. * Remove old commented code Static ECH keys for now * Implement SendAsRetry	2025-03-05 17:04:10 -07:00
Francis Lavoie	afa778ae05	httpcaddyfile: Implement experimental force_automate option (#6712)	2024-12-24 08:58:40 -07:00
Francis Lavoie	09b2cbcf4d	caddyhttp: Add MatchWithError to replace SetVar hack (#6596) ... * caddyhttp: Add `MatchWithError` to replace SetVar hack * Error in IP matchers on TLS handshake not complete * Use MatchWithError everywhere possible * Move implementations to MatchWithError versions * Looser interface checking to allow fallback * CEL factories can return RequestMatcherWithError * Clarifying comment since it's subtle that an err is returned * Return 425 Too Early status in IP matchers * Keep AnyMatch signature the same for now * Apparently Deprecated can't be all-uppercase to get IDE linting * Linter	2024-11-04 23:18:50 +00:00
Francis Lavoie	b129ed6be8	httpcaddyfile: Fixes for prefer_wildcard mode (#6636) ... * httpcaddyfile: Fixes for prefer_wildcard mode The wildcard hosts need to be collected first, then considered after, because there's no guarantee that all non-wildcards will appear after all wildcards when looping. Also we should not add a domain to Skip if it doesn't qualify for TLS anyway. * Alternate solution by avoiding adding APs altogether if covered by wildcard	2024-10-30 17:09:12 +00: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
Francis Lavoie	16724842d9	caddyhttp: Implement auto_https prefer_wildcard option (#6146) ... * Allow specifying multiple `auto_https` options * Implement `auto_https prefer_wildcard` option * Adapt tests, add mock DNS module for config testing * Rebase fix	2024-10-02 07:31:58 -06: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
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
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
Francis Lavoie	feeb6af403	httpcaddyfile: Fix expression matcher shortcut in snippets (#6288)	2024-05-01 07:43:05 -04:00
Francis Lavoie	9cd472c031	caddyfile: Populate regexp matcher names by default (#6145) ... * caddyfile: Populate regexp matcher names by default * Some lint cleanup that my VSCode complained about * Pass down matcher name through expression matcher * Compat with #6113: fix adapt test, set both styles in replacer	2024-04-17 12:19:14 -06: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
Francis Lavoie	1c4a807667	chore: Upgrade some dependencies (#6221)	2024-04-04 18:27:52 -04:00
Aziz Rmadi	b893c8c5f8	caddyfile: Reject directives in the place of site addresses (#6104) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-02-19 00:22:48 +00:00
Francis Lavoie	750d0b8331	caddyfile: Normalize & flatten all unmarshalers (#6037)	2024-01-23 19:36:59 -05:00
Aziz Rmadi	4181c79a81	httpcaddyfile: Add optional status code argument to handle_errors directive (#5965) ... Co-authored-by: Aziz Rmadi <azizrmadi@Azizs-MacBook-Air.local>	2024-01-16 01:24:17 -05:00
a	c839a98ff5	filesystem: Globally declared filesystems, fs directive (#5833)	2024-01-13 20:12:43 +00:00
Francis Lavoie	da7d8cb26d	httpcaddyfile: Sort skip_hosts for deterministic JSON (#5990) ... * httpcaddyfile: Sort skip_hosts for deterministic JSON * Update caddyconfig/httpcaddyfile/httptype.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> * Fix test * Bah --------- Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2023-12-18 12:54:52 -07:00
Francis Lavoie	ac1f20b9e4	httpcaddyfile: Remove port from logger names (#5881) ... Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-10-16 23:57:03 -06:00
Francis Lavoie	33d8d2c6b5	httpcaddyfile: Sort TLS SNI matcher for deterministic JSON output (#5860) ... * httpcaddyfile: Sort TLS SNI matcher, for deterministic adapt output * Update caddyconfig/httpcaddyfile/httptype.go --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-10-11 09:47:07 -06:00
Đỗ Trọng Hải	df99502977	httpcaddyfile: Enable TLS for catch-all site if tls directive is specified (#5808)	2023-10-10 21:46:39 +00:00
Đỗ Trọng Hải	2cac3c5491	httpcaddyfile: fix placeholder shorthands in named routes (#5791) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-09-08 14:38:44 -04: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
Jacob Gadikian	b32f265eca	ci: Use gofumpt to format code (#5707)	2023-08-07 19:40:31 +00:00
Herman Slatman	4aa4f3ac70	httpcaddyfile: Fix string does not match ~[]E error (#5675) ... Only happens for some people. Unable to confirm.	2023-08-03 00:41:37 +00:00
Francis Lavoie	5c51c1db2c	httpcaddyfile: Allow hostnames & logger name overrides for log directive (#5643) ... * httpcaddyfile: Allow `hostnames` override for log directive * Implement access logger name overrides * Fix panic & default logger clobbering edgecase	2023-08-02 03:13:46 -04: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
Matthew Holt	e96aafe1ca	Slightly more helpful error message	2023-05-13 08:04:42 -06:00
Matt Holt	faf0399e80	caddytls: Configurable fallback SNI (#5527) ... * Initial implementation of fallback_sni * Apply upstream patch	2023-05-10 14:29:29 -06:00
Mohammed Al Sahaf	1aef807c71	log: Make sink logs encodable (#5441) ... * log: make `sink` encodable * deduplicate logger fields * extract common fields into `BaseLog` and embed it into `SinkLog` * amend godoc on `BaseLog` and `SinkLog` * minor style change --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-03-27 21:41:24 +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
Y.Horie	d73660f7c3	httpcaddyfile: Add persist_config global option (#5339) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-01-27 23:31:37 -05:00
Francis Lavoie	7f2a93e6c3	caddyfile: Allow overriding server names (#5323)	2023-01-27 14:56:39 -05:00
WeidiDeng	c38a040e85	httpcaddyfile: Fix handle grouping inside route (#5315) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-01-18 16:04:41 -05:00
Matt Holt	3e1fd2a8d4	httpcaddyfile: Wrap site block in subroute if host matcher used (#5130) ... * httpcaddyfile: Wrap site block in subroute if host matcher used (fix #5124) * Correct boolean logic (oops)	2022-10-12 09:27:08 -06:00
Francis Lavoie	99ffe93388	logging: Fix skip_hosts with wildcards (#5102) ... Fix #4859	2022-10-05 12:14:13 -06:00
Matthew Holt	b6cec37893	caddyhttp: Add --debug flag to commands ... file-server and reverse-proxy This might be useful!	2022-09-15 23:10:16 -06:00
Matthew Holt	754fe4f7b4	httpcaddyfile: Fix sorting of repeated directives ... Fixes #5037	2022-09-13 13:43:21 -06:00
Francis Lavoie	8cc8f9fddd	httpcaddyfile: Add a couple more placeholder shortcuts (#5015) ... This adds: - `{file.*}` -> `{http.request.uri.path.file.*}` - `{file_match.*}` -> `{http.matchers.file.*}` This is a follow-up to #4993 which introduces the new URI file placeholders, and a shortcut for using `file` matcher output. For example, where the `try_files` directive is a shortcut for this: ``` @try_files file <files...> rewrite @try_files {http.matchers.file.relative} ``` It could instead be: ``` @try_files file <files...> rewrite @try_files {file_match.relative} ```	2022-09-05 21:41:48 -06:00
Francis Lavoie	7d5108d132	httpcaddyfile: Add shortcut for expression matchers (#4976)	2022-09-01 23:12:37 -04:00
Francis Lavoie	68d8ac9802	httpcaddyfile: Add {cookie.*} placeholder shortcut (#5001)	2022-08-31 10:18:29 -06:00
Matt Holt	1960a0dc11	httpserver: Configurable shutdown delay (#4906)	2022-08-03 11:04:51 -06:00
Francis Lavoie	141872ed80	chore: Bump up to Go 1.19, minimum 1.18 (#4925)	2022-08-02 16:39:09 -04:00
Matthew Holt	1e18afb5c8	httpcaddyfile: Detect ambiguous site definitions (fix #4635) ... Previously, our "duplicate key in server block" logic was flawed because it did not account for the site's bind address. We defer this check to when the listener addresses have been assigned, but before we commit a server block to its listener. Also refined how network address parsing and joining works, which was necessary for a less convoluted fix.	2022-07-25 17:28:20 -06:00
Francis Lavoie	58970cae92	httpcaddyfile: Add {err.*} placeholder shortcut (#4798)	2022-05-24 10:06:46 -06:00
Francis Lavoie	f7be0ee101	map: Prevent output destinations overlap with Caddyfile shorthands (#4657)	2022-05-06 10:25:31 -06:00
Francis Lavoie	f6900fcf53	reverseproxy: Support performing pre-check requests (#4739)	2022-05-06 10:50:26 -04:00
Francis Lavoie	af7321511c	httpcaddyfile: Fix duplicate access log when debug is on (#4746)	2022-04-28 12:16:25 -04:00