191 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
Bas Westerbaan	dcbf38d0b3	tls: use Go default kex for the moment that include PQC (#6542) ... By default Go 1.23 enables X25519Kyber768, a post-quantum key agreement method that is enabled by default on Chrome. Go 1.23 does not expose the CurveID, so we cannot add it by specifying it in CurvePreferences. The reason is that X25519Kyber768 is a preliminary key agreement that will be supplanted by X25519MLKEM768. For the moment there is value in enabling it. A consequence of this is that by default Caddy will enable support for P-384 and P-521. This PR also removes the special code to add support for X25519Kyber768 via the Cloudflare Go branch. Cf #6540	2024-08-27 17:08:16 -06:00
a	8ccfedf2bb	cmd: Use a factory to create the caddy root command (#6533) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-08-22 03:29:42 +00:00
WeidiDeng	9ddb78fadc	cmd: ignore exec.ErrDot when starting caddy in background (#6512) ... Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-08-12 20:26:20 -06:00
Mohammed Al Sahaf	243351b2b1	cmd: remove zealous check of Caddyfile auto-detection (#6370) ... * cmd: remove zealous check of Caddyfile auto-detection * add test case * remove redundant check, add comment * one more case	2024-06-05 08:57:15 -06:00
Mohammed Al Sahaf	7088605cc1	cmd: fix regression in auto-detect of Caddyfile (#6362) ... * cmd: fix regression in auto-detect of Caddyfile Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * fix typo Co-authored-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> * add tests * address review comments --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>	2024-06-02 11:40:56 +00:00
Mohammed Al Sahaf	15faeacb60	cmd: fix auto-detetction of .caddyfile extension (#6356) ... * cmd: fix auto-detetction of .caddyfile extension Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * move conditions around and add clarifying comment Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> * reject ambiguous config file name Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com> --------- Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2024-06-02 03:49:38 +00:00
Matt Holt	6d97d8d87b	caddyhttp: Address some Go 1.20 features (#6252) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-04-24 00:05:57 +00:00
Mohammed Al Sahaf	8f87c5d993	cmd: Only validate config is proper JSON if config slice has data (#6250) ... * cmd: fix error when running without config * ci: add smoke test	2024-04-18 15:40:12 -06: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
Matthew Holt	e1f4b83ffa	cmd: Fix panic related to config filename (fix #5919)	2024-04-11 17:04:43 -06:00
Omar Hussein	185ed6fe7c	cmd: Assume Caddyfile based on filename prefix and suffix (#5919) ... This can be helpful if editors only consider file extensions for certain features. * added special case support for caddyfile suffix, case insensitive * Update cmd/main.go Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * skip caddyfile adapter for registered file extensions --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-04-11 15:28:16 -06:00
Francis Lavoie	e473ae6803	cmd: Adjust config load logs/errors (#6032) ... * cmd: Adjust config load logs/errors * Update cmd/main.go Co-authored-by: Matt Holt <mholt@users.noreply.github.com> --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-03-05 19:26:30 +00:00
Mohammed Al Sahaf	de4959fe7b	cmd: fix the output of the Usage section (#6138)	2024-03-01 19:00:29 +03:00
Matthew Holt	1919c08ecc	Update comment in setcap helper script	2024-01-31 12:59:26 -07:00
Kévin Dunglas	dba556fe4b	refactor: move automaxprocs init in caddycmd.Main()	2024-01-19 11:17:35 +01:00
Mohammed Al Sahaf	787f6b257f	chore: check against errors of io/fs instead of os (#6011) ... * chore: replace `os.ErrNotExist` with `fs.ErrNotExist` * check against permission error from `io/fs` package	2024-01-02 08:48:55 +03:00
Kévin Dunglas	d54dcf1598	cmd: use automaxprocs for better perf in containers (#5711) ... * feat: use automaxprocs for better perf in containers * better logs * cs	2023-12-18 15:50:26 -07:00
Jens-Uwe Mager	56c6b3f673	cmd: Preserve LastModified date when exporting storage (#5968)	2023-12-13 09:06:06 -07:00
Thanmay Nath	24b0ecc310	cmd: Add newline character to version string in CLI output (#5895)	2023-10-16 09:58:32 -06:00
Mohammed Al Sahaf	d70608b656	cmd: upgrade: resolve symlink of the executable (#5891)	2023-10-13 17:19:22 -04:00
Francis Lavoie	9c419f1e1a	cmd: Fix exiting with custom status code, add caddy -v (#5874) ... * Simplify variables for commands * Add --envfile support for adapt command * Carry custom status code for commands to os.Exit() * cmd: add `-v` and `--version` to root caddy command * Add `--envfile` to `caddy environ`, extract flag parsing to func --------- Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2023-10-11 09:46:18 -06:00
Evan Van Dam	f2ab7099db	cmd: Prevent overwriting existing env vars with --envfile (#5803) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-09-07 02:19:24 +00: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
pistasjis	d8135505d3	cmd: Require config for caddy validate (fix #5612) (#5614) ... * Require config for caddy validate - fixes #5612 Signed-off-by: Pistasj <hi@pistasjis.net> * Try making adjacent Caddyfile check its own function Signed-off-by: Pistasj <hi@pistasjis.net> * add Francis' suggestion Co-authored-by: Francis Lavoie <lavofr@gmail.com> * Refactor * Fix borked commit, sigh --------- Signed-off-by: Pistasj <hi@pistasjis.net> Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2023-08-09 17:40:37 +00:00
Jacob Gadikian	b32f265eca	ci: Use gofumpt to format code (#5707)	2023-08-07 19:40:31 +00:00
Emily	8d304a4566	cmd: Split unix sockets for admin endpoint addresses (#5696) ... * cmd: fix cli when admin endpoint uses new unix socket permission format Fixes a bug where the following Caddyfile ```Caddyfile { admin unix/admin.sock|0660 } ``` and `caddy reload --config Caddyfile` would throw the following error instead of reloading it: ``` INFO using provided configuration {"config_file": "Caddyfile", "config_adapter": ""} Error: sending configuration to instance: performing request: Post "http://127.0.0.1/load": dial unix admin.sock|0660: connect: no such file or directory [ERROR] exit status 1 ``` --- This bug also affected `caddy start` and `caddy stop`. * Move splitter function to internal --------- Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2023-08-06 00:09:16 +00:00
Matt Holt	f66493efef	core: Allow loopback hosts for admin endpoint (fix #5650) (#5664)	2023-08-02 11:13:52 -06:00
Cass C	078f130a51	cmd: Implement storage import/export (#5532) ... * cmd: Implement 'storage import' and 'storage export' CLI commands. These commands use the certmagic.Storage interface. In particular, storage implementations should ensure that their List() functions correctly enumerate all keys when called with an empty prefix and recursive == true. Also, Stat() calls on keys holding values instead of nested keys are expected to set KeyInfo.IsTerminal = true. * remove errors.Join	2023-06-02 13:04:31 -06:00
Matthew Holt	38cb587e0f	cmd: Avoid spammy log messages (fix #5538) ... I forgot there are two calls to LoadConfig() here that needed replacing.	2023-05-17 16:13:15 -06:00
Matthew Holt	5ebb7d496d	cmd: Reduce spammy logs from --watch	2023-05-12 11:04:02 -06:00
Yehonatan Ezron	571fc034d3	feature: watch include directory (#5521) ... Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-05-08 22:49:16 +00:00
Matt Holt	205b142614	cmd: Support ' quotes in envfile parsing (#5437)	2023-04-10 13:55:45 -06:00
Matthew Holt	508cf2aa22	cmd: Create pidfile before config load (close #5477)	2023-04-03 11:57:16 -06:00
Francis Lavoie	9e6919550b	cmd: Expand cobra support, add short flags (#5379) ... * cmd: Expand cobra support * Convert commands to cobra, add short flags * Fix version command typo Co-authored-by: Emily Lange <git@indeednotjames.com> * Apply suggestions from code review Co-authored-by: Matt Holt <mholt@users.noreply.github.com> --------- Co-authored-by: Emily Lange <git@indeednotjames.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-02-24 16:09:12 -07:00
Francis Lavoie	79de6df93d	cmd: Strict unmarshal for validate (#5383)	2023-02-22 11:39:40 -07:00
Emily Lange	bf54892a73	cmd: make caddy fmt hints more clear (#5378)	2023-02-16 16:34:12 -07:00
Francis Lavoie	5ded580444	cmd: Adjust documentation for commands (#5377)	2023-02-16 09:14:07 -07:00
Amis Shokoohi	94b8d56096	cmd: Add --envfile flag to validate command (#5350) ... Fixes https://github.com/caddyserver/caddy/issues/5346	2023-01-31 16:27:35 -05:00
Amis Shokoohi	8c0b49bf03	cmd: fmt exit successfully after overwriting config file (#5351) ... Fixes https://github.com/caddyserver/caddy/issues/5349	2023-01-31 11:24:44 -05:00
Y.Horie	5805b3ca11	cmd: caddy fmt return code is 1 if not formatted (#5297) ... * cmd: Fix caddy fmt if input isn't formatted * Fixes #5294 * return exit 1 with an error message * cmd: Use formattingDifference for caddy fmt * #5294 * expose caddyfile.formattingDifference	2023-01-21 21:28:37 -07:00
Y.Horie	8d6870fd06	chore: Fix typo, coral -> cobra (#5325)	2023-01-21 10:27:58 -05: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
Mohammed Al Sahaf	f20a8e7aa0	cmd: replace deprecate func use (#5170)	2022-10-25 17:56:38 +03:00
BakaFT	a999b70727	cmd: Add missing \n to HelpTemplate (#5151)	2022-10-17 11:51:41 +03:00
Matthew Holt	62b0685375	cmd: Improve error message if config missing	2022-09-14 23:24:16 -06:00
Matthew Holt	0b3161aeea	cmd: Customizable user agent (close #2795)	2022-09-13 17:21:04 -06:00
Matthew Holt	1c9c8f6a13	cmd: Enhance some help text	2022-09-06 14:19:58 -06:00
Matthew Holt	ec2a5762b0	cmd: Don't print long help text on error	2022-09-01 21:43:23 -06:00
Matthew Holt	687a4b9e81	cmd: Enhance CLI docs	2022-08-30 19:15:52 -06:00