208 Commits

Author	SHA1	Message	Date
Mohammed Al Sahaf	111fcddd56	Merge branch 'master' into golangcilint-v2 ... Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2025-05-02 20:43:03 +03:00
Steffen Busch	54d03ced48	fileserver: Add support for .avif image format (#6988)	2025-04-28 08:32:59 -06:00
Mohammed Al Sahaf	924273f6a3	Merge branch 'master' into golangcilint-v2	2025-04-03 02:56:36 +04:00
Matt Holt	5a6b2f8d1d	events: Refactor; move Event into core, so core can emit events (#6930) ... * events: Refactor; move Event into core, so core can emit events Requires some slight trickery to invert dependencies. We can't have the caddy package import the caddyevents package, because caddyevents imports caddy. Interface to the rescue! Also add two new events, experimentally: started, and stopping. At the request of a sponsor. Also rename "Filesystems" to "FileSystems" to match Go convention (unrelated to events, was just bugging me when I noticed it). * Coupla bug fixes * lol whoops	2025-03-29 08:15:43 -06:00
Mohammed Al Sahaf	9e284a5b0b	run golangci-lint run --fix ... Signed-off-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2025-03-25 22:55:56 +03:00
WeidiDeng	22563a70eb	file_server: use the UTC timezone for modified time (#6830) ... * use UTC timezone for modified time * use http.ParseTime to handle If-Modified-Since * use time.Compare to simplify comparison * take the directory's modtime into consideration when calculating lastModified * update comments about If-Modified-Since's handling	2025-02-10 08:39:43 -07:00
Kévin Dunglas	5c2617ebf9	fileserver: good default for precompressed (#6736)	2024-12-10 08:31:43 -07:00
Francis Lavoie	d0123bd760	fileserver: Fix policy Validate() oversight (#6727)	2024-12-04 14:01:58 -05:00
Kévin Dunglas	efd9251ad3	fileserver: Add first_exist_fallback strategy for try_files (#6699) ... * feat: add first_exist_or_fallback strategy for try_files * fix tests * linter	2024-12-03 05:44:49 -07:00
Francis Lavoie	315715e90f	core: Implement FastAbs to avoid repeated os.Getwd calls (#6687) ... * core: Implement FastAbs to avoid repeated os.Getwd calls * Lint * Rename files	2024-11-13 03:55:51 -05:00
Atakan Yenel	cc23ad6402	fileserver: Add file_limit option for browse (to be experimental) (#6648) ... * Add file_limit option for file_server browse * Move file_limit inside browse. * add file_server_file_limit caddyfile adapt test.	2024-11-05 09:35:32 -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
Matthew Holt	350ad38f63	fileserver: Fix Caddyfile parsing ... Reported at https://github.com/mholt/caddy-sqlite-fs/issues/3	2024-10-31 10:37:37 -06:00
Logan Fleur	9753c44510	fileserver: fix try_policy when instantiating file matcher from CEL (#6624) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2024-10-20 14:08:30 +00:00
Francis Lavoie	792f1c7ed7	caddyhttp: Escaping placeholders in CEL, add vars and vars_regexp (#6594) ... * caddyhttp: Escaping placeholders in CEL * Simplify some of the test cases * Implement vars and vars_regexp in CEL * dupl lint is dumb * Better consts for the placeholder CEL shortcut * Bump CEL version, register a few extensions * Refactor s390x test script for readability * Add retries for s390x to smooth over flakiness * Switch to `ph` for the CEL shortcut (match it in templates cause why not)	2024-10-02 06:34:04 -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
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
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
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
Francis Lavoie	9338741ca7	browse: Exclude symlink target size from total, show arrow on size (#6412) ... * fileserver: Exclude symlink target size from total, show arrow on size * Keep both totals * Linter doesn't like my spelling :( * Stop parallelizing tests for now * Update modules/caddyhttp/fileserver/browse.html * Minor renamings --------- Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2024-07-07 07:01:07 -06:00
Steffen Busch	88c7e53da5	browse: fix Content-Security-Policy warnings in Firefox (#6443) ... * Remove 'strict-dynamic' + block-all-mixed-content * CSP: remove 'unsafe-inline' from script-src	2024-07-07 06:56:47 -06:00
Steffen Busch	4ef360745d	browse: add Content-Security-Policy w/ nonce (#6425) ... * browse: add Content-Security-Policy w/ nonce * Add backward-compat values to script-src * Remove dummy "#" href from layout anchors	2024-07-06 10:46:08 -06:00
Aziz Rmadi	c2ccf8690f	fileserver: Remove newline characters from precomputed etags (#6394) ... * Removed newline characters from precomputed etags * Update modules/caddyhttp/fileserver/staticfiles.go --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-06-19 13:27:10 +00:00
deneb	f98f449f05	templates: Add pathEscape template function and use it in file browser (#6278) ... * use url.PathEscape in file-server browse template - add `pathEscape` to c.tpl.Funcs, using `url.PathEscape` - use `pathEscape` in browse.html in place of `replace` * document `pathEscape` * Remove unnecessary pipe of img src to `html`	2024-05-18 12:55:36 -06:00
Viktor Szépe	d7e3a1974b	Fix typos (#6311) ... * Fix typos * Revert * Revert to "htlm" * fix indentations	2024-05-10 08:08:54 -06:00
Matthew Holt	cabb5d71c4	fileserver: Set "Vary: Accept-Encoding" header (see #5849)	2024-04-26 19:38:45 -06:00
Matthew Holt	d00824f4a6	fileserver: Improve Vary handling (#5849)	2024-04-19 13:43:13 -06:00
Matthew Holt	3067074d9c	encode: Improve Etag handling (fix #5849) ... We also improve Last-Modified handling in the file server. Both changes should be more compliant with RFC 9110.	2024-04-17 19:12: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
coderwander	eafc875ea9	chore: fix some typos in comments (#6243)	2024-04-16 04:10:11 +00:00
Aziz Rmadi	567d96c624	fileserver: read etags from precomputed files (#6222)	2024-04-13 06:49:55 -04:00
Matthew Holt	5d8b45c9fb	fileserver: Escape # and ? in img src (fix #6237)	2024-04-12 15:59:59 -06:00
kylosus	45132c5b24	caddyhttp: Add plaintext response to file_server browse (#6093) ... * Added plaintext support to file_server browser This commit is twofold: First it adds a new optional field, `return_type`, to `browser` for setting the default format of the returned index (html, json or plaintext). This is used when the `Accept` header is set to `/*`. Second, it adds a preliminary `text/plain` support to the `file_server` browser that returns a text representation of the file system, when an `Accept: text/plain` header is present, with the behavior discussed above. * Added more details and better formatting to plaintext browser * Replaced returnType conditions with a switch statement * Simplify --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-04-01 18:12:40 +00:00
jbrown-stripe	52822a41cb	caddyhttp: upgrade to cel v0.20.0 (#6161) ... * upgrade to cel v0.20.0 * Attempt to address feedback and fix linter * Let's try this * Take that, you linter! * Oh there's more --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com> Co-authored-by: Tristan Swadell @TristonianJones	2024-03-13 21:32:42 -06:00
Francis Lavoie	5a4374bea0	fileserver: Preserve query during canonicalization redirect (#6109) ... * fileserver: Preserve query during canonicalization redirect * Clarify that only a path should be passed	2024-03-05 22:51:26 -07:00
Aziz Rmadi	feb07a7b59	fileserver: Browse can show symlink target if enabled (#5973) ... * Added optional subdirective to browse allowing to reveal symlink paths. * Update modules/caddyhttp/fileserver/browsetplcontext.go --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2024-02-06 04:31:26 +00:00
Francis Lavoie	750d0b8331	caddyfile: Normalize & flatten all unmarshalers (#6037)	2024-01-23 19:36:59 -05:00
Francis Lavoie	f3e849e49f	fileserver: Implement caddyfile.Unmarshaler interface (#5850)	2024-01-13 21:32:44 +00:00
a	c839a98ff5	filesystem: Globally declared filesystems, fs directive (#5833)	2024-01-13 20:12:43 +00: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
Steffen Busch	8f9ffc587e	fileserver: Add total file size to directory listing (#6003) ... * browse: Add total file size to directory listing * Apply suggestion to remove "in " Co-authored-by: Matt Holt <mholt@users.noreply.github.com> --------- Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-12-30 18:47:13 +00:00
Kévin Dunglas	b16aba5c27	fileserver: Enable compression for command by default (#5855) ... * feat: enable compression for file-server * refactor * const * Update help text * Update modules/caddyhttp/fileserver/command.go --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-12-13 20:44:22 -07:00
David DeMoss	362f33daae	fileserver: New --precompressed flag (#5880) ... exposes the file_server precompressed functionality to be used with the file-server command Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2023-12-13 20:26:20 -07:00
Matthew Holt	7e52db8280	fileserver: Add .m4v for browse template icon	2023-11-14 13:39:57 -07:00
Forza	130f6d1f83	fileserver: Set canonical URL on browse template (#5867) ... * Browse.html: Add canonical URL and home-link When contents are equal, but maybe just a sort order is different, it is good to add `<link rel="canonical" href="base-path/" />`. This helps search engines propeely index the page. I also added a link to the home page with the name of `{{.Host}}` just above the bread crumbs to make the page clearer. https://paste.tnonline.net/files/28Wun5CQZiqA_Screenshot_20231007_134435_Opera.png * Update browse.html	2023-10-11 13:47:38 -06:00
Kévin Dunglas	fa5a579b60	fileserver: Add command shortcuts -l and -a (#5854)	2023-10-10 20:57:18 +00:00
glowinthedark	a306c5f769	fileserver: browse template SVG icons and UI tweaks (#5812) ... * fileserver browse.html UI tweaks: folder-symlink icon, search fileserver browse.html UI tweaks: folder-symlink icon, search - ui - add folder-symlink SVG icon - search: use `<input type="search">` instead of `text` - fix npe with `sizebar.style.width` = null in grid mode * tabify whitespace Co-authored-by: Francis Lavoie <lavofr@gmail.com> --------- Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-09-15 19:05:45 -06:00
Matthew Holt	ed8bb13c5d	fileserver: Export BrowseTemplate ... This allows programs embedding Caddy to customize the browse template.	2023-08-29 09:34:20 -06:00
Mohammed Al Sahaf	0a6d3333b2	fileserver: docs: clarify the ability to produce JSON array with browse (#5751)	2023-08-18 19:04:08 +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