275 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
lollipopkit🏳️‍⚧️	5c47c2f147	fileserver: browse: Configurable default sort (#6502) ... * fileserver: add `sort` options * fix: test * fileserver: check options in `Provison` * fileserver: more obvious err alerts in sort options * fileserver: move `sort` to `browse` --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-08-30 09:01:37 -06:00
Mohammed Al Sahaf	4ade967005	reverseproxy: allow user to define source address (#6504) ... * reverseproxy: allow user to define source address Closes #6503 Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * reverse_proxy: caddyfile support for local_address Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-08-22 19:52:05 +00:00
Mohammed Al Sahaf	8af646730b	caddyhttp: run error (msg) through replacer (#6536) ... * error: run `error` (msg) through replacer Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * fix integration test Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-08-22 11:32:44 -06:00
Jesper Brix Rosenkilde	54a0c8f948	reverseproxy: Active health checks request body option (#6520) ... * Add an option to specify the body used for active health checks * Replacer on request body	2024-08-19 10:55:55 -06:00
Steffen Busch	b85b6c6469	replacer: {file.*} global placeholder strips trailing newline (#6411) ... Co-authored-by: Kanashimia <chad@redpilled.dev>	2024-08-07 19:39:15 +00:00
lollipopkit🏳️‍⚧️	b198678174	browse: Customizable default sort options (#6468) ... * fileserver: add `sort` options * fix: test * fileserver: check options in `Provison` * fileserver: more obvious err alerts in sort options	2024-08-05 08:27:45 -06:00
Jesper Brix Rosenkilde	07c863637d	reverseproxy: Caddyfile support for health_method (#6454) ... * Add Caddyfile support of setting active health check request method * Add integration test for active health check request method	2024-07-12 17:01:58 -04:00
Kévin Dunglas	0287009ee5	intercept: fix http.intercept.header.* placeholder (#6429)	2024-07-03 08:43:13 -06:00
a	aca4002fd8	caddyfile: Pass blocks to import for snippets (#6130) ... * a * a * a * a * a * a	2024-06-14 11:27:51 -06:00
Francis Lavoie	40c582ce82	caddyhttp: Fix merging consecutive client_ip or remote_ip matchers (#6350)	2024-05-30 07:32:17 -06:00
Ranveer Avhad	e6f46c8d78	acmeserver: Add sign_with_root for Caddyfile (#6345) ... * Added sign_with_root option available in the Caddyfile * Added tests for sign_with_root to validate the adapted JSON config	2024-05-27 20:06:54 -04:00
Mohammed Al Sahaf	4c90f1427f	caddytest: normalize the JSON config (#6316) ... * caddytest: normalize the JSON config	2024-05-14 07:50:14 +00: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
Viktor Szépe	d7e3a1974b	Fix typos (#6311) ... * Fix typos * Revert * Revert to "htlm" * fix indentations	2024-05-10 08:08:54 -06:00
Francis Lavoie	feeb6af403	httpcaddyfile: Fix expression matcher shortcut in snippets (#6288)	2024-05-01 07:43:05 -04:00
Francis Lavoie	797973944f	replacer: Implement file.* global replacements (#5463) ... Co-authored-by: Matt Holt <mholt@users.noreply.github.com> Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-04-24 16:26:18 -04:00
Aziz Rmadi	868af6a062	reverse_proxy: Add grace_period for SRV upstreams to Caddyfile (#6264)	2024-04-23 07:12:57 -06:00
Mohammed Al Sahaf	c6673ad4d8	staticresp: Use the evaluated response body for sniffing JSON content-type (#6249)	2024-04-18 20:31:00 +00: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
coderwander	eafc875ea9	chore: fix some typos in comments (#6243)	2024-04-16 04:10:11 +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
Aziz Rmadi	567d96c624	fileserver: read etags from precomputed files (#6222)	2024-04-13 06:49:55 -04:00
Aziz Rmadi	0b381eb766	reverseproxy: Implement modular CA provider for TLS transport (#6065) ... * added new modular ca providers to caddy tls HttpTransport * reverse-proxy, httptransport: added tests and caddyfile support for ca module --------- Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-04-12 07:19:14 -06:00
Emily	ddb1d2c2b1	caddyhttp: add http.request.local{,.host,.port} placeholder (#6182) ... * caddyhttp: add `http.request.local{,.host,.port}` placeholder This is the counterpart of `http.request.remote{,.host,.port}`. `http.request.remote` operates on the remote client's address, while `http.request.local` operates on the address the connection arrived on. Take the following example: - Caddy serving on `203.0.113.1:80` - Client on `203.0.113.2` `http.request.remote.host` would return `203.0.113.2` (client IP) `http.request.local.host` would return `203.0.113.1` (server IP) `http.request.local.port` would return `80` (server port) I find this helpful for debugging setups with multiple servers and/or multiple network paths (multiple IPs, AnyIP, Anycast). Co-authored-by: networkException <git@nwex.de> * caddyhttp: add unit test for `http.request.local{,.host,.port}` * caddyhttp: add integration test for `http.request.local.port` * caddyhttp: fix `http.request.local.host` placeholder handling with unix sockets The implementation matches the one of `http.request.remote.host` now and returns the unix socket path (just like `http.request.local` already did) instead of an empty string. --------- Co-authored-by: networkException <git@nwex.de>	2024-03-27 21:36:53 +00:00
Aziz Rmadi	29f57faa86	rewrite: uri query replace operation (#6165) ... * Implemented query replace oeration * Modified replace operation to use regexes in caddyfile * Added more tests to uri query operations	2024-03-22 02:23:42 +00:00
Sam Ottenhoff	e65b97f55b	reverseproxy: configurable active health_passes and health_fails (#6154) ... * reverseproxy: active health check allows configurable health_passes and health_fails * Need to reset counters after recovery * rename methods to be more clear that these are coming from active health checks * do not export methods	2024-03-20 11:13:35 -06:00
Aziz Rmadi	69290d232d	rewrite: Implement uri query operations (#6120) ... * Implemented basic uri query operations * Added support for query operations block * Applied Replacer on all query keys and values * Implemented rename query key opration * Rewrite struct: Changed QueryOperations field to Query and comments cleanup * Cleaned up comments, changed the order of operations and added more tests * Changed order of fields in queryOps struct to match the operations order	2024-03-06 10:08:46 -05: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
Francis Lavoie	01d5568b20	logging: Implement append encoder, allow flatter filters config (#6069) ... * logging: Implement `add` encoder * Allow flatter config structure for `filter` & `add` * Rename to append * govulncheck was unhappy	2024-03-05 16:24:32 -07:00
Mohammed Al Sahaf	1f4a6fa7e7	ci: fix the integration test TestLeafCertLoaders (#6149)	2024-03-06 02:09:13 +03:00
Aziz Rmadi	3ae07a73dc	caddytls: clientauth: leaf verifier: make trusted leaf certs source pluggable (#6050) ... * Made trusted leaf certificates pluggable into the tls.client_auth.leaf module * Added leaf loaders modules: file, folder, pem aand storage * Cleaned implementation of leaf cert loader modules * Added tests for leaf certs file and folder loaders * cmd: fix the output of the `Usage` section (#6138) * core: OnExit hooks (#6128) * core: OnExit callbacks * core: Process-global OnExit callbacks * ci: bump golangci/golangci-lint-action from 3 to 4 (#6141) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 3 to 4. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v3...v4) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Added more leaf certificate loaders tests and cleaned up code * Modified leaf cert loaders json field names and cleaned up storage loader comment * Update modules/caddytls/leaffileloader.go * Update LeafStorageLoader certificates field name * Upgraded protobuf version --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-03-05 14:55:37 -07:00
Mohammed Al Sahaf	03f703a00e	caddytls: verifier: caddyfile: re-add Caddyfile support (#6127) ... * caddytls: verifier: caddyfile: re-add Caddyfile support * appease the linter * caddytls: client_auth: verifier: change namespace to `tls.client_auth.verifier`	2024-02-26 00:13:48 +03:00
Mohammed Al Sahaf	931656bd68	acmeserver: add policy field to define allow/deny rules (#5796) ... * acmeserver: support specifying the allowed challenge types * add caddyfile adapt tests * acmeserver: add `policy` field to define allow/deny rules * allow `omitempty` to work * add caddyfile support for `policy` * remove "uri domain" policy * fmt the files * add docs * do not support `CommonName`; the field is deprecated * r/DNSDomains/Domains/g * Caddyfile docs * add tests * move `Policy` to top of file	2024-02-24 02:26:00 +03:00
Francis Lavoie	4512be49a9	caddytest: Rename adapt tests to *.caddyfiletest extension (#6119)	2024-02-21 00:37:40 +00:00
José Carlos Chávez	f8143a3af1	tests: uses testing.TB interface for helper to be able to use test server in benchmarks. (#6103)	2024-02-20 22:04: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	91ec75441a	logging: Inline Caddyfile syntax for ip_mask filter (#6094)	2024-02-12 17:15:35 +00:00
Mohammed Al Sahaf	e1aa862e6a	acmeserver: support specifying the allowed challenge types (#5794) ... * acmeserver: support specifying the allowed challenge types * add caddyfile adapt tests * introduce basic acme_server test * skip acme test on unsuitable environments * skip integration tests of ACME * documentation * add negative-scenario test for mismatched allowed challenges * a bit more docs * fix tests for ACME challenges * appease the linter * skip ACME tests on s390x * enable ACME challenge tests on all machines * Apply suggestions from code review Co-authored-by: Matt Holt <mholt@users.noreply.github.com> --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-02-08 11:42:03 +03: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
Yolan Romailler	2fe69a828f	chore: enabling a few more linters (#5961) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-01-25 15:24:58 +00: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	b9c40e7111	logging: Automatic wrap default for filter encoder (#5980) ... Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>	2024-01-25 04:00:22 +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
Francis Lavoie	5e2f1b5ced	httpcaddyfile: Rewrite root and rewrite parsing to allow omitting matcher (#5844)	2024-01-15 09:57:08 -07:00