github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-06-26 20:01:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,664 Commits 40 Branches 145 Tags
36546cd8b92d683942cda5cf5f9d8f58c08ae9b4
Commit Graph

1664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Holt
36546cd8b9 go.mod: Upgrade several dependencies 2023-05-15 16:56:27 -06:00
Francis Lavoie
75b690d248 reverseproxy: Expand port ranges to multiple upstreams in CLI + Caddyfile (#5494) 
* reverseproxy: Expand port ranges to multiple upstreams in CLI + Caddyfile

* Add clarifying comment
 2023-05-15 12:14:50 -06:00
Matt Holt
52d7335c2b fileserver: Use EscapedPath for browse (#5534) 
* fileserver: Use EscapedPath for browse

Fix #5143

* Fixes if filter element is not present

* Remove extraneous line
 2023-05-15 10:48:05 -06:00
Matt Holt
96919acc9d caddyhttp: Refactor cert Managers (fix #5415) (#5533) 2023-05-15 10:47:30 -06:00
Matthew Holt
e96aafe1ca Slightly more helpful error message 2023-05-13 08:04:42 -06:00
Matt Holt
a02ecb0f88 caddytls: Check for nil ALPN; close #5470 (#5473) 
* Check for nil ALPN; close #5470

* Apply patch

* Actually I want to try this
 2023-05-13 07:09:20 -06:00
Matthew Holt
5ebb7d496d cmd: Reduce spammy logs from --watch 2023-05-12 11:04:02 -06:00
jjiang-stripe
cfc85ae8ca caddyhttp: Add a getter for Server.name (#5531) 2023-05-11 10:34:05 -06:00
Matt Holt
faf0399e80 caddytls: Configurable fallback SNI (#5527) 
* Initial implementation of fallback_sni

* Apply upstream patch
 2023-05-10 14:29:29 -06:00
WeidiDeng
808b05c3b4 caddyhttp: Update quic's TLS configs after reload (#5517) (fix #4849) 
* fix http3 outdated certificates after config reload

* delegate quic tls GetConfigForClient to another struct.

* change type and method names
fix lint

---------

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-05-10 14:25:09 -06:00
Matthew Holt
12b2f22092 Add doc comment about changing admin endpoint 2023-05-09 20:05:27 -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
Mohammed Al Sahaf
bef1a739db chore: remove deprecated linters (#5525) 2023-05-08 13:47:33 -06:00
Matthew Holt
0de6064c3b go.mod: Upgrade CertMagic again 2023-05-07 23:40:30 -06:00
Matthew Holt
774f228868 go.mod: Upgrade CertMagic 2023-05-06 11:30:27 -06:00
Francis Lavoie
b19946f6af reverseproxy: Optimize base case for least_conn and random_choose policies (#5487) 
When only a single request has the least amount of requests, there's no need to compute a random number, because the modulo of 1 will always be 0 anyways.
 2023-05-05 20:53:48 -06:00
Francis Lavoie
335cd2e8a4 reverseproxy: Fix active health check header canonicalization, refactor (#5446) 2023-05-05 15:19:22 -06:00
Francis Lavoie
48598e1f2a reverseproxy: Add fallback for some policies, instead of always random (#5488) 2023-05-05 15:08:10 -06:00
Matthew Holt
cdce452edc logging: Actually honor the SoftStart parameter 2023-05-04 16:30:34 -06:00
Matthew Holt
f3e8b9d95f logging: Soft start for net writer (close #5520) 
If enabled and there is an error when opening the net writer, ignore the
error and report it along with subsequent logs to stderr.
 2023-05-04 16:29:03 -06:00
eanavitarte
c8032867b1 fastcgi: Fix capture_stderr (#5515) 2023-05-04 00:40:49 +00:00
Francis Lavoie
3f20a7c9f3 acmeserver: Configurable resolvers, fix smallstep deprecations (#5500) 
* acmeserver: Configurable `resolvers`, fix smallstep deprecations

* Improve default net/port

* Update proxy resolvers parsing to use the new function

* Update listeners.go

Co-authored-by: itsxaos <33079230+itsxaos@users.noreply.github.com>

---------

Co-authored-by: itsxaos <33079230+itsxaos@users.noreply.github.com>
 2023-05-03 17:07:22 +00:00
Matthew Holt
1af419e7ec go.mod: Update some dependencies 2023-04-28 09:47:28 -06: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
Kévin Dunglas
1c9ea0113d caddyhttp: Impl ResponseWriter.Unwrap(), prep for Go 1.20's ResponseController (#5509) 
* feat: add support for ResponseWriter.Unwrap()

* cherry-pick Francis' code
 2023-04-26 19:44:01 -04:00
Y.Horie
2b04e09fa7 reverseproxy: Fix reinitialize upstream healthy metrics (#5498) 
Co-authored-by: Dávid Szabó <david.szabo97@gmail.com>
 2023-04-25 09:59:26 -06:00
cui fliter
3443a8a056 fix some comments (#5508) 
Signed-off-by: cui fliter <imcusg@gmail.com>
 2023-04-25 09:54:42 -06:00
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
Matthew Holt
c6ac350a3b core: Return default logger if no modules loaded 
Fix report from:
https://caddy.community/t/remote-caddyfile-invalid-memory-address-or-nil-pointer-dereference/19700/3
 2023-04-20 10:27:40 -06:00
Francis Lavoie
b301a3df70 celmatcher: Implement pkix.Name conversion to string (#5492) 2023-04-19 11:55:22 -04:00
Francis Lavoie
998c6e06a7 chore: Adjustments to CI caching (#5495) 2023-04-14 21:38:33 -04:00
Francis Lavoie
4636109ce1 reverseproxy: Remove deprecated lookup_srv (#5396) 2023-04-10 20:08:40 +00:00
Matt Holt
205b142614 cmd: Support ' quotes in envfile parsing (#5437) 2023-04-10 13:55:45 -06:00
Matt Holt
ff35ba9ec3 Update contributing guidelines (#5466) 
* Update contributing guidelines

* Request disclosure as a courtesy
 2023-04-10 13:08:32 -06: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
Matthew Holt
508cf2aa22 cmd: Create pidfile before config load (close #5477) 2023-04-03 11:57:16 -06:00
Kid
f9bd2d3e92 fileserver: Add color-scheme meta tag (#5475) 2023-04-02 22:44:21 -04:00
dependabot[bot]
b1366c7e46 build(deps): bump actions/setup-go from 3 to 4 (#5474) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-04-02 00:36:16 -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
f5a13a4ab4 replacer: Add HTTP time format (#5458) 2023-03-27 20:51:13 +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
Francis Lavoie
330be2d8c7 httpcaddyfile: Adjust path matcher sorting to solve for specificity (#5462) 2023-03-27 15:43:44 -04:00