324 Commits

Author	SHA1	Message	Date
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
Omar Ramadan	d85cc2ec10	logging: Customizable zap cores (#6381)	2024-06-10 09:03:24 -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
Kévin Dunglas	fb63e2e40c	caddyhttp: New experimental handler for intercepting responses (#6232) ... * feat: add generic response interceptors * fix: cs * rename intercept * add some docs * @francislavoie review (first round) * Update modules/caddyhttp/intercept/intercept.go Co-authored-by: Francis Lavoie <lavofr@gmail.com> * shorthands: ir to resp * mark exported symbols as experimental --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-05-13 17:38:18 +00:00
Matthew Holt	583c585c81	httpcaddyfile: Set challenge ports when http_port or https_port are used	2024-05-11 21:39: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
Mohammed Al Sahaf	87c7127c28	chore: add warn logs when using deprecated fields (#6276)	2024-04-27 15:51:00 -04:00
clauverjat	76c4cf5a56	caddytls: Option to configure certificate lifetime (#6253) ... * Add option to configure certificate lifetime * Bump CertMagic dep to latest master commit * Apply suggestions and ran go mod tidy * Update modules/caddytls/acmeissuer.go Co-authored-by: Matt Holt <mholt@users.noreply.github.com> --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-04-24 14:35:14 -06:00
Matthew Holt	6a02999054	caddytls: Add Caddyfile support for on-demand permission module (close #6260)	2024-04-22 15:47:09 -06:00
Matthew Holt	3efda6fb3a	httpcaddyfile: Skip automate loader if disable_certs is specified (fix #6148)	2024-04-17 12:26:03 -06: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
Matt Holt	81413caea2	caddytls: Upgrade ACMEz to v2; support ZeroSSL API; various fixes (#6229) ... * WIP: acmez v2, CertMagic, and ZeroSSL issuer upgrades * caddytls: ZeroSSLIssuer now uses ZeroSSL API instead of ACME * Fix go.mod * caddytls: Fix automation related to managers (fix #6060) * Fix typo (appease linter) * Fix HTTP validation with ZeroSSL API	2024-04-13 21:31:43 -04:00
Francis Lavoie	1c4a807667	chore: Upgrade some dependencies (#6221)	2024-04-04 18:27:52 -04:00
Steffen Busch	c27425ef5d	httpcaddyfile: Keep deprecated skip_log in directive order (#6153)	2024-03-07 14:34:01 -05:00
Francis Lavoie	258d906140	httpcaddyfile: Add RegisterDirectiveOrder function for plugin authors (#5865) ... * httpcaddyfile: Add `RegisterDirectiveOrder` function for plugin authors * Set up Positional enum * Linter doesn't like a switch on an enum with default * Update caddyconfig/httpcaddyfile/directives.go Co-authored-by: Matt Holt <mholt@users.noreply.github.com> --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-03-06 19:41:45 +00: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
Francis Lavoie	2a78c9c5e4	httpcaddyfile: Allow nameless regexp placeholder shorthand (#6113) ... Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-03-05 23:37:14 +00: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	f9e11158bc	caddyauth: Rename basicauth to basic_auth (#6092)	2024-02-12 17:34:23 +00:00
Matt Holt	57c5b921a4	caddytls: Make on-demand 'ask' permission modular (#6055) ... * caddytls: Make on-demand 'ask' permission modular This makes the 'ask' endpoint a module, which means that developers can write custom plugins for granting permission for on-demand certificates. Kicking myself that we didn't do it this way at the beginning, but who coulda known... * Lint * Error on conflicting config * Fix bad merge --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-01-30 16:11:29 -07:00
Mohammed Al Sahaf	e965b111cd	tls: modularize trusted CA providers (#5784) ... * tls: modularize client authentication trusted CA * add `omitempty` to `CARaw` * docs * initial caddyfile support * revert anything related to leaf cert validation The certs are used differently than the CA pool flow * complete caddyfile unmarshalling implementation * Caddyfile syntax documentation * enhance caddyfile parsing and documentation Apply suggestions from code review Co-authored-by: Francis Lavoie <lavofr@gmail.com> * add client_auth caddyfile tests * add caddyfile unmarshalling tests * fix and add missed adapt tests * fix rebase issue --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-01-25 11:44:41 +03: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
Francis Lavoie	5e2f1b5ced	httpcaddyfile: Rewrite root and rewrite parsing to allow omitting matcher (#5844)	2024-01-15 09:57:08 -07: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
a	c839a98ff5	filesystem: Globally declared filesystems, fs directive (#5833)	2024-01-13 20:12:43 +00:00
Subhaditya Nath	c2d889f85e	httpcaddyfile: Fix redir <to> html (#6001)	2024-01-10 12:24:47 +00:00
Zach Galvin	cb86319bd5	httpcaddyfile: Support client auth verifiers (#6022) ... * Added verifier case Update author * Update verifier to match struct tag * gci run	2024-01-09 23:14:51 +00:00
Rithvik Vibhu	ed41c924cf	tls: add reuse_private_keys (#6025)	2024-01-09 16:00:31 -07:00
Francis Lavoie	f976c84d9e	httpcaddyfile: Fix cert file decoding to load multiple PEM in one file (#5997)	2023-12-20 08:37:21 -07: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	3d7d60f7cf	caddyhttp: Add uuid to access logs when used (#5859)	2023-12-13 15:40:15 -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	7984e6f6fd	httpcaddyfile: Fix TLS automation policy merging with get_certificate (#5896)	2023-10-14 14:23:50 -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
Francis Lavoie	38a7b6b3d0	caddyfile: Adjust error formatting (#5765)	2023-08-20 08:51:03 -06:00
Karun Agarwal	288216e1fb	httpcaddyfile: Stricter errors for site and upstream address schemes (#5757) ... Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-08-19 07:28:25 -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	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
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
WeidiDeng	bbe1952a59	caddyfile: Fix comparing if two tokens are on the same line (#5626) ... * fix comparing if two tokens are on the same line * compare tokens from copies when importing	2023-07-12 14:32:22 -06:00
WeidiDeng	9cde715525	caddyfile: Track import name instead of modifying filename (#5540) ... * Merge branch 'master' into import_file_stack * remove space in log key	2023-05-25 13:05:00 -06:00
WeidiDeng	cee4441cb1	caddyfile: Do not replace import tokens if they are part of a snippet (#5539) ... * fix variadic placeholder in imported file which also imports * fix tests. * skip replacing args when imported token may be part of a snippet	2023-05-22 15:36:55 -06:00