github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-11 00:13:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
2,266 Commits 31 Branches 145 Tags
split-commands
Commit Graph

1140 Commits

Author SHA1 Message Date
Stéphane Mourey
2943c41884 templates: Add fileStat function (#5497) 
* Add isDir template function

* Update modules/caddyhttp/templates/tplcontext.go

Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>

* Fix funcIsDir return value on error

* Fix funcIsDir return false when root file system not specified

* Add stat function, remove isDir function

* Remove isDir function (really)

* Rename stat to fileStat

---------

Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>
 2023-04-24 10:36:37 -06:00
Francis Lavoie
53b6fab125 caddyfile: Stricter parsing, error for brace on new line (#5505) 2023-04-20 18:43:51 +00:00
Francis Lavoie
b301a3df70 celmatcher: Implement pkix.Name conversion to string (#5492) 2023-04-19 11:55:22 -04:00
Francis Lavoie
4636109ce1 reverseproxy: Remove deprecated lookup_srv (#5396) 2023-04-10 20:08:40 +00:00
WeidiDeng
d8d87a378f caddyhttp: Serve http2 when listener wrapper doesn't return *tls.Conn (#4929) 
* Serve http2 when listener wrapper doesn't return *tls.Conn

* close conn when h2server serveConn returns

* merge from upstream

* rebase from latest

* run New and Closed ConnState hook for h2 conns

* go fmt

* fix lint

* Add comments

* reorder import
 2023-04-10 17:05:02 +00:00
Francis Lavoie
f8b59e77f8 reverseproxy: Add query and client_ip_hash lb policies (#5468) 2023-04-04 03:31:47 +00:00
Kid
f9bd2d3e92 fileserver: Add color-scheme meta tag (#5475) 2023-04-02 22:44:21 -04:00
Corin Langosch
b6fe5d4b41 proxyprotocol: Add PROXY protocol support to reverse_proxy, add HTTP listener wrapper (#5424) 
Co-authored-by: WeidiDeng <weidi_deng@icloud.com>
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-03-31 17:44:53 -04:00
Francis Lavoie
66e571e687 reverseproxy: Add mention of which half a copyBuffer err comes from (#5472) 
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-03-31 15:46:29 -04:00
Francis Lavoie
2b3046de36 caddyhttp: Log request body bytes read (#5461) 2023-03-27 22:40:15 +00:00
Mohammed Al Sahaf
1aef807c71 log: Make sink logs encodable (#5441) 
* log: make `sink` encodable

* deduplicate logger fields

* extract common fields into `BaseLog` and embed it into `SinkLog`

* amend godoc on `BaseLog` and `SinkLog`

* minor style change

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-03-27 21:41:24 +00:00
Francis Lavoie
e16a886814 caddytls: Eval replacer on automation policy subjects (#5459) 
Also renamed the field to SubjectsRaw, which can be considered a breaking change but I don't expect this to affect much.
 2023-03-27 21:16:22 +00:00
黑墨水鱼
dd86171d67 headers: Support deleting all headers as first op (#5464) 
* Delete all existing fields when fieldName is `*`

* Rearrange deletion before addition in headers

* Revert "Rearrange deletion before addition in headers"

This reverts commit 1b50eeeccc92ccd660c7896d8283c7d9e5d1fcb0.

* Treat deleting all headers as a special case

* 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>
 2023-03-27 21:05:18 +00:00
Francis Lavoie
10b265d252 reverseproxy: Header up/down support for CLI command (#5460) 2023-03-27 20:35:31 +00:00
Francis Lavoie
05e9974570 caddyhttp: Determine real client IP if trusted proxies configured (#5104) 
* caddyhttp: Determine real client IP if trusted proxies configured

* Support customizing client IP header

* Implement client_ip matcher, deprecate remote_ip's forwarded option
 2023-03-27 20:22:59 +00:00
Trea Hauet
2182270a2c reverseproxy: Reset Content-Length to prevent FastCGI from hanging (#5435) 
Fixes: https://github.com/caddyserver/caddy/issues/5420
 2023-03-16 11:42:16 -06:00
Matt Holt
6cc3cbbc69 fileserver: New file browse template (#5427) 
* fileserver: New file browse template

* Redo extension/icon logic; minor color tweaks

* Fine-tune image display
 2023-03-10 18:19:31 +00:00
Chris Reeves
b420561737 tracing: Support autoprop from OTEL_PROPAGATORS (#5147) 
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-03-09 09:02:35 -07:00
WeidiDeng
b3f0cea2c3 encode: flush status code when hijacked. (#5419) 2023-03-06 09:13:48 -07:00
esell
94d41a9d86 fileserver: Remove trailing slash on fs filenames (#5417) 2023-03-03 14:45:17 -07:00
Matt Holt
99d47050e9 core: Eliminate unnecessary shutdown delay on Unix (#5413) 
* core: Eliminate unnecessary shutdown delay on Unix

Fix #5393, alternate to #5405

* Comments, cleanup, adjust logs

* Fix build constraint
 2023-03-03 04:00:18 +00:00
Francis Lavoie
85375861f6 caddyhttp: Fix vars_regexp matcher with placeholders (#5408) 
Changed to match the `vars` matcher's logic for handling placeholders
 2023-03-02 09:01:54 -07:00
Emily Lange
941eae5f61 reverseproxy: allow specifying ip version for dynamic a upstream (#5401) 
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-02-27 17:23:09 +00:00
Francis Lavoie
960150bb03 caddyfile: Implement heredoc support (#5385) 2023-02-26 00:34:27 +00: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
Mohammed Al Sahaf
e3909cc385 reverseproxy: refactor HTTP transport layer (#5369) 
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
Co-authored-by: Weidi Deng <weidi_deng@icloud.com>
 2023-02-24 19:54:04 +00:00
Francis Lavoie
5ded580444 cmd: Adjust documentation for commands (#5377) 2023-02-16 09:14:07 -07:00
Matt Holt
4b119a475f reverseproxy: Don't buffer chunked requests (fix #5366) (#5367) 
* reverseproxy: Don't buffer chunked requests (fix #5366)

Mostly reverts 845bc4d50b437995d574819850206e4b3db4040d (#5289)

Adds warning for unsafe config.

Deprecates unsafe properties in favor of simpler, safer designed ones.

* Update modules/caddyhttp/reverseproxy/caddyfile.go

Co-authored-by: Y.Horie <u5.horie@gmail.com>

* Update modules/caddyhttp/reverseproxy/reverseproxy.go

Co-authored-by: Y.Horie <u5.horie@gmail.com>

* Update modules/caddyhttp/reverseproxy/reverseproxy.go

Co-authored-by: Y.Horie <u5.horie@gmail.com>

* Remove unused code

---------

Co-authored-by: Y.Horie <u5.horie@gmail.com>
 2023-02-11 17:25:29 -07:00
Francis Lavoie
90798f3eea go.mod: Upgrade various dependencies (#5362) 
* chore: Upgrade various dependencies

* Support CEL file matcher with no args

* Document `http.request.orig_uri.path.*`, reorder placeholders in docs

---------

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-02-08 17:49:17 +00:00
Steffen Brüheim
536c28d4dc core: Support Windows absolute paths for UDS proxy upstreams (#5114) 
* added some tests for parseUpstreamDialAddress

Test 4 fails because it produces "[[::1]]:80" instead of "[::1]:80"

* support absolute windows path in unix reverse proxy address

* make IsUnixNetwork public, support +h2c and reuse it
* add new tests
 2023-02-08 10:05:09 -07:00
WeidiDeng
c77a6bea66 reverseproxy: Log status code and byte count for websockets (#5140) 
* log response size for websocket request

* record size when using hijack bufio.Writer
 2023-02-06 16:14:59 -07:00
Francis Lavoie
12bcbe2c49 caddyhttp: Pluggable trusted proxy IP range sources (#5328) 
* caddyhttp: Pluggable trusted proxy IP range sources

* Add request to the IPRangeSource interface
 2023-02-06 12:44:11 -07:00
Y.Horie
8d3a1b8bcb caddyauth: Use singleflight for basic auth (#5344) 
* caddyauth: Add singleflight for basic auth

* Fixes #5338
* it occurred the thunder herd problem like this https://medium.com/@mhrlife/avoid-duplicate-requests-while-filling-cache-98c687879f59

* Update modules/caddyhttp/caddyauth/basicauth.go

Fix comment

Co-authored-by: Francis Lavoie <lavofr@gmail.com>

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-02-06 18:29:03 +00:00
Francis Lavoie
e62b5fb586 chore: Build with Go 1.20, keep minimum at 1.18 for now (#5353) 2023-02-06 11:29:20 -05:00
Francis Lavoie
201b9b41f9 chore: Fix warning "range variable captured by func literal" (#5348) 2023-01-31 03:07:57 -05:00
Y.Horie
e9d95ab29f reverseproxy: Add flag to short command to disable redirects (#5330) 
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
Fixes undefined
 2023-01-25 09:40:08 -05:00
David Frickert
962310204f tracing: Support placeholders in span name (#5329) 
Fixes https://github.com/caddyserver/caddy/issues/5171
 2023-01-25 02:26:44 -05:00
Francis Lavoie
223cbe3d0b caddyhttp: Add server-level trusted_proxies config (#5103) 2023-01-10 00:08:23 -05:00
Y.Horie
845bc4d50b reverseproxy: Fix hanging for Transfer-Encoding: chunked (#5289) 
* Fixes #5236
* enable request body buffering in reverse proxy
  when the request header has Transfer-Encoding: chunked
 2023-01-09 00:13:34 -07:00
Emily Lange
e450a7377b reverseproxy: Don't enable auto-https when --from flag is http (#5269) 2023-01-06 15:42:07 -05:00
Matt Holt
d74f6fd967 reverseproxy: Set origreq in active health check (#5284) 
* reverseproxy: Set origreq in active health check

Fix #5281

* Oops; dereference Request
 2023-01-06 15:06:38 -05:00
Matthew Holt
4e9ad50f65 fileserver: Add a couple test cases 
With placeholders
 2023-01-04 11:07:27 -07:00
darkweak
dac7cacd4d encode: Respect Cache-Control no-transform (#5257) 
* encode: respect Cache-Control HTTP header no-transform

* encode: switch to strings.Contains
 2022-12-20 13:26:53 -07:00
Matthew Holt
fac35db9dc go.mod: Update quic-go to v0.31.0 
And fix a comment typo
 2022-12-08 08:55:04 -07:00
Alban Lecocq
d4a7d89f56 reverseproxy: Improve hostByHashing distribution (#5229) 
* If upstreams are all using same host but with different ports
ie:
foobar:4001
foobar:4002
foobar:4003
...
Because fnv-1a has not a good enough avalanche effect
Then the hostByHashing result is not well balanced over
all upstreams

As last byte FNV input tend to affect few bits, the idea is to change
the concatenation order between the key and the upstream strings
So the upstream last byte have more impact on hash diffusion
 2022-12-05 11:28:12 -07:00
Matthew Holt
ae77a56ac8 Clarify some docs 2022-11-30 16:03:31 -07: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
Alexander Graf
087f126cf4 caddyhttp: Canonicalize header field names (#5176) 2022-10-29 16:35:44 -04:00
XYenon
ed503118dd caddyhttp: add placeholder {http.request.orig_uri.path.*} (#5161) 2022-10-24 11:57:50 -06:00
Matt Holt
a3ae146cbd fileserver: Reject non-GET/HEAD requests (close #5166) (#5167) 
* fileserver: Reject non-GET/HEAD requests (close #5166)

* Set Allow header according to RFC 9110 10.2.1
 2022-10-24 10:23:57 -06:00