84 Commits

Author	SHA1	Message	Date
tongjicoder	5b2eb66418	Use slices.Contains to simplify code (#7039) ... Signed-off-by: tongjicoder <tongjicoder@icloud.com>	2025-05-31 12:03:06 -06:00
Kévin Dunglas	1f35a8a402	fastcgi: improve parsePHPFastCGI docs (#6779)	2025-01-09 11:54:44 -07:00
WeidiDeng	6790c0e38a	fastcgi: check for CONTENT_LENGTH when sending requests (#6661) ... * fastcgi: check for CONTENT_LENGTH when sending requests * order imports * use strconv.ParseUint instead of strconv.ParseInt Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> --------- Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>	2024-12-18 00:22:12 +00: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	b116dcea3d	caddyhttp: Add {?query} placeholder (#6714) ... * caddyhttp: Add `{prefixed_query}` placeholder * fastcgi: Preserve query during canonical redirect * Use orig_uri instead for the redirect, shorter Caddyfile shortcut	2024-12-02 08:06:38 -05:00
Kévin Dunglas	eddbccd298	fastcgi: remove dir redirection when useless in php_fastcgi (#6698) ... * perf: remove dir redirection when useless in php_fastcgi * fix test * review * fix * fix * simplify * simplify again * restore test * add test	2024-11-21 10:38:31 -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
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
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
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
Francis Lavoie	750d0b8331	caddyfile: Normalize & flatten all unmarshalers (#6037)	2024-01-23 19:36:59 -05:00
a	c839a98ff5	filesystem: Globally declared filesystems, fs directive (#5833)	2024-01-13 20:12:43 +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
Jacob Gadikian	b32f265eca	ci: Use gofumpt to format code (#5707)	2023-08-07 19:40:31 +00:00
eanavitarte	c8032867b1	fastcgi: Fix capture_stderr (#5515)	2023-05-04 00:40:49 +00:00
Dave Henderson	f0e3981774	logging: Add traceID field to access logs when tracing is active (#5507) ... Co-authored-by: Francis Lavoie <lavofr@gmail.com>	2023-04-27 02:46:41 +00:00
Francis Lavoie	53b6fab125	caddyfile: Stricter parsing, error for brace on new line (#5505)	2023-04-20 18:43:51 +00:00
Francis Lavoie	960150bb03	caddyfile: Implement heredoc support (#5385)	2023-02-26 00:34:27 +00:00
Matthew Holt	e07a267276	caddytest: Revise sleep durations ... Attempt to reduce flakiness a bit more Test suite needs to be rewritten.	2022-10-05 11:40:41 -06:00
Matthew Holt	f7c1a51efb	fastcgi: Redirect using original URI path (fix #5073)	2022-09-23 14:36:38 -06:00
Matthew Holt	e43b6d8178	core: Variadic Context.Logger(); soft deprecation ... Ideally I'd just remove the parameter to caddy.Context.Logger(), but this would break most Caddy plugins. Instead, I'm making it variadic and marking it as partially deprecated. In the future, I might completely remove the parameter once most plugins have updated.	2022-09-16 16:55:36 -06:00
WeidiDeng	83b26975bd	fastcgi: Optimize FastCGI transport (#4978) ... * break up code and use lazy reading and pool bufio.Writer * close underlying connection when operation failed * allocate bufWriter and streamWriter only once * refactor record writing * rebase from master * handle err * Fix type assertion Also reduce some duplication * Refactor client and clientCloser for logging Should reduce allocations * Minor cosmetic adjustments; apply Apache license * Appease the linter Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2022-09-02 16:57:55 -06:00
fleandro	f2a7e7c966	fastcgi: allow users to log stderr output (#4967) (#5004) ... Co-authored-by: flga <flga@users.noreply.github.com>	2022-09-02 00:02:48 -04:00
WilczyńskiT	2642bd72b7	Replace strings.Index usages with strings.Cut (#4930)	2022-08-04 11:17:35 -06:00
Matt Holt	17ae5acaba	cmd: Use newly-available version information (#4931)	2022-08-04 11:16:59 -06:00
Francis Lavoie	f6900fcf53	reverseproxy: Support performing pre-check requests (#4739)	2022-05-06 10:50:26 -04:00
Francis Lavoie	c8f2834b51	fastcgi: Protect against requests with null bytes in the path (#4614)	2022-03-07 10:06:33 -07:00
ttys3	de490c7cad	fastcgi: Set SERVER_PORT to 80 or 443 depending on scheme (#4572)	2022-03-02 11:24:16 -07:00
Francis Lavoie	8e5aafa5cd	fastcgi: Fix a TODO, prevent zap using reflection for logging env (#4437) ... * fastcgi: Fix a TODO, prevent zap using reflection for logging env * Update modules/caddyhttp/reverseproxy/fastcgi/fastcgi.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>	2021-12-02 13:23:19 -07:00
Francis Lavoie	9ee68c1bd5	reverseproxy: Adjust defaults, document defaults (#4436) ... * reverseproxy: Adjust defaults, document defaults Related to some of the issues in https://github.com/caddyserver/caddy/issues/4245, a complaint about the proxy transport defaults not being properly documented in https://caddy.community/t/default-values-for-directives/14254/6. - Dug into the stdlib to find the actual defaults for some of the timeouts and buffer limits, documenting them in godoc so the JSON docs get them next release. - Moved the keep-alive and dial-timeout defaults from `reverseproxy.go` to `httptransport.go`. It doesn't make sense to set defaults in the proxy, because then any time the transport is configured with non-defaults, the keep-alive and dial-timeout defaults are lost! - Sped up the dial timeout from 10s to 3s, in practice it rarely makes sense to wait a whole 10s for dialing. A shorter timeout helps a lot with the load balancer retries, so using something lower helps with user experience. * reverseproxy: Make keepalive interval configurable via Caddyfile * fastcgi: DialTimeout default for fastcgi transport too	2021-11-24 01:32:25 -05:00
KallyDev	c48fadc4a7	Move from deprecated ioutil to os and io packages (#4364)	2021-09-29 11:17:48 -06:00
Francis Lavoie	3f2c3ecf85	fastcgi: Implement try_files override in Caddyfile directive (#4347)	2021-09-17 08:23:06 -06:00
Francis Lavoie	a779e1b383	fastcgi: Fix Caddyfile parsing when handle_response is used (#4342)	2021-09-11 14:12:21 -06:00
Matt Holt	9d4ed3a323	caddyhttp: Refactor and export SanitizedPathJoin for use in fastcgi (#4207)	2021-06-17 09:59:08 -06:00
Matthew Holt	238914d70b	Some misc. cleanup ... The fastcgi changes came from v1 which don't make sense in v2. Fix comment about default value in reverse proxy keep alive.	2021-06-16 14:29:42 -06:00
Francis Lavoie	e4a22de9d1	reverseproxy: Add handle_response blocks to reverse_proxy (#3710) (#4021) ... * reverseproxy: Add `handle_response` blocks to `reverse_proxy` (#3710) * reverseproxy: complete handle_response test * reverseproxy: Change handle_response matchers to use named matchers reverseproxy: Add support for changing status code * fastcgi: Remove obsolete TODO We already have d.Err("transport already specified") in the reverse_proxy parsing code which covers this case * reverseproxy: Fix support for "4xx" type status codes * Apply suggestions from code review Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * caddyhttp: Reorganize response matchers * reverseproxy: Reintroduce caddyfile.Unmarshaler * reverseproxy: Add comment mentioning Finalize should be called Co-authored-by: Maxime Soulé <btik-git@scoubidou.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2021-05-02 12:39:06 -06:00
Francis Lavoie	6e9ac248dd	fastcgi: Set PATH_INFO to file matcher remainder as fallback (#3739) ... * fastcgi: Set PATH_INFO to file matcher remainder as fallback * fastcgi: Avoid changing scriptName when not necessary * Stylistic tweaks Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2020-12-04 17:12:13 -07:00
Dave Henderson	bd17eb205d	ci: Use golangci's github action for linting (#3794) ... * ci: Use golangci's github action for linting Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix most of the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the prealloc lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the misspell lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the varcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the errcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the bodyclose lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the deadcode lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the unused lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosec lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosimple lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the ineffassign lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert the misspell change, use a neutral English Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove broken golangci-lint CI job Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Re-add errantly-removed weakrand initialization Signed-off-by: Dave Henderson <dhenderson@gmail.com> * don't break the loop and return * Removing extra handling for null rootKey * unignore RegisterModule/RegisterAdapter Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> * single-line log message Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Fix lint after a1808b0dbf209c615e438a496d257ce5e3acdce2 was merged Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert ticker change, ignore it instead Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Ignore some of the write errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove blank line Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Use lifetime Signed-off-by: Dave Henderson <dhenderson@gmail.com> * close immediately Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Preallocate configVals Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Update modules/caddytls/distributedstek/distributedstek.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>	2020-11-22 14:50:29 -07:00
Francis Lavoie	eda9a1b377	fastcgi: Add timeouts support to Caddyfile adapter (#3842) ... * fastcgi: Add timeouts support to Caddyfile adapter * fastcgi: Use tabs instead of spaces	2020-11-02 15:11:17 -07:00
Francis Lavoie	0279a57ac4	ci: Upgrade to Go 1.15 (#3642) ... * ci: Try Go 1.15 RC1 out of curiosity * Go 1.15 was released; let's try it * Update to latest quic-go * Attempt at fixing broken test Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>	2020-08-20 14:04:10 -06:00
Manuel Dalla Lana	2ae8c11927	fastcgi: Add resolve_root_symlink (#3587)	2020-07-20 12:16:13 -06:00
Francis Lavoie	0665a86eb7	fastcgi: Ensure leading slash, omit SERVER_PORT if empty for compliance (#3570) ... See https://tools.ietf.org/html/rfc3875#section-4.1.13 for SCRIPT_NAME requiring leading slash See https://tools.ietf.org/html/rfc3875#section-4.1.15 for SERVER_PORT requiring omission if empty	2020-07-17 14:48:50 -06:00
Francis Lavoie	3fdaf50785	fastcgi: Fill REMOTE_USER with http.auth.user.id placeholder (#3577) ... Completing a TODO!	2020-07-17 13:33:40 -06:00
Francis Lavoie	b1480eb52f	fastcgi: Fix php_fastcgi matcher regression (#3512)	2020-06-22 11:45:18 -06:00
Wynn Wolf Arbor	fa4cdde7d8	fastcgi: Make sure splitPos handles empty SplitPath correctly (#3491) ... In commit f2ce81c, support for multiple path splitters was added. The type of SplitPath changed from string to []string, and splitPos was changed to loop through all values in SplitPath. Before that commit, if SplitPath was empty, strings.Index returned 0 and PATH_INFO was set correctly in buildEnv. Currently, however, splitPos returns -1 for empty values of SplitPath, behaving as if a split position could not be found at all. PATH_INFO is then never set in buildEnv and remains empty. Restore the old behaviour by explicitly checking whether SplitPath is empty and returning 0 in splitPos. Closes #3490	2020-06-12 10:07:59 -06:00
Francis Lavoie	7243454a96	fastcgi: php_fastcgi subdirectives to override shortcut behaviour (#3255) ... * fastcgi: Add new php_fastcgi subdirectives to override the shortcut * fastcgi: Support "index off" to disable redir and try_files * fastcgi: Remove whitespace to satisfy linter * fastcgi: Run gofmt * fastcgi: Make a new dispenser instead of using rewind * fastcgi: Some fmt * fastcgi: Add a couple adapt tests * fastcgi: Clean up for loops * fastcgi: Move adapt tests to separate files	2020-05-18 12:15:38 -06:00
Francis Lavoie	5ae1a5617c	caddyhttp: Add split_path to file matcher (used by php_fastcgi) (#3302) ... * matcher: Add `split_path` option to file matcher; used in php_fastcgi * matcher: Skip try_files split if not the final part of the filename * matcher: Add MatchFile tests * matcher: Clarify SplitPath godoc	2020-04-27 14:46:46 -06:00
Matthew Holt	02845bc9fd	docs: Improve template documentation slightly; use const, not literal	2020-04-24 21:05:09 -06:00
Matthew Holt	1e8af27329	fastcgi: Account for lack of split path configuration (fix #3221)	2020-04-03 10:25:25 -06:00
Matthew Holt	ce3ca541d8	caddytls: Update cipher suite names and curve names ... Now using IANA-compliant names and Go 1.14's CipherSuites() function so we don't have to maintain our own mapping of currently-secure cipher suites.	2020-04-01 14:09:29 -06:00