OrgGo
/
caddy
mirror of https://github.com/caddyserver/caddy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,868 Commits 30 Branches 138 Tags 28 MiB
Commit Graph

1124 Commits

Author SHA1 Message Date
Kévin Dunglas fa5a579b60
fileserver: Add command shortcuts `-l` and `-a` (#5854) 2023-10-10 20:57:18 +00:00
Thanmay Nath 5653c36bc2
templates: Add dummy `RemoteAddr` to `httpInclude` request, proxy compatibility (#5845) 
* Enhancement: Allow X-Forwarded-For Header in httpInclude Virtual Requests

The goal of this enhancement is to modify the funcHTTPInclude function in the Caddy codebase to include the X-Forwarded-For header in the virtual request. This change will enable reverse proxies to set the X-Forwarded-For header, ensuring that the client's IP address is correctly provided to the target endpoint. This modification is essential for applications that depend on the X-Forwarded-For header for various functionalities, such as authentication, logging, or content customization.

* Updated tplcontext.go - set `virtReq.RemoteAddr = "127.0.0.1"`

i have made the suggested changes

* Apply suggestions from code review

* Update modules/caddyhttp/templates/tplcontext.go

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-10-07 20:47:34 +00:00
Patrick Koenig 4feac4d83c
reverseproxy: Allow fallthrough for response handlers without routes (#5780) 2023-10-05 23:15:26 -04:00
Matthew Holt 58ab3a01a0
caddyhttp: Use LimitedReader for HTTPRedirectListener 2023-09-26 07:32:46 -06: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
Pascal Vorwerk 1e0dea59ef
reverseproxy: fix nil pointer dereference in AUpstreams.GetUpstreams (#5811) 
fix a nil pointer dereference in AUpstreams.GetUpstreams when AUpstreams.Versions is not set (fixes caddyserver#5809)

Signed-off-by: Pascal Vorwerk <info@fossores.de>
 2023-09-10 19:08:02 -04:00
Paul Jeannot 1b73e3862d
logging: query filter for array of strings (#5779) 
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-08-29 22:59:43 +00:00
Francis Lavoie c46ec3b500
logging: Clone array on log filters, prevent side-effects (#5786) 
Fixes https://caddy.community/t/is-caddy-mutating-header-content-from-logging-settings/20947
 2023-08-29 11:41:39 -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
Matt Holt b377208ede
chore: Appease gosec linter (#5777) 
These happen to be harmless memory aliasing
but I guess the linter can't know that and we
can't really prove it in general.
 2023-08-23 20:47:54 -06:00
Karun Agarwal 288216e1fb
httpcaddyfile: Stricter errors for site and upstream address schemes (#5757) 
Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com>
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-08-19 07:28:25 -04: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
Matt Holt 936ee918ee
reverseproxy: Always return new upstreams (fix #5736) (#5752) 
* reverseproxy: Always return new upstreams (fix #5736)

* Fix healthcheck logger race
 2023-08-17 11:33:40 -06: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
Matthew Holt 2d7d806fcf
fileserver: Slightly more fitting icons 2023-08-11 20:53:11 -06:00
Matthew Holt 080db93817
caddytls: Update docs for on-demand config 2023-08-09 11:15:01 -06:00
Francis Lavoie a8492c064d
fileserver: Don't repeat error for invalid method inside error context (#5705) 2023-08-09 17:12:09 +00:00
Matt Holt 6cdcc2a782
ci: Update to Go 1.21 (#5719) 
* ci: Update to Go 1.21

* Bump quic-go to v0.37.4

* Check EnableFullDuplex err

* Linter bug suppression

See https://github.com/timakin/bodyclose/issues/52

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-08-09 12:34:28 -04:00
Jacob Gadikian b32f265eca
ci: Use gofumpt to format code (#5707) 2023-08-07 19:40:31 +00:00
Matthew Holt 431adc0980
templates: Fix httpInclude (fix #5698) 
Allowable during feature freeze because this is a simple, non-invasive
bug fix only.
 2023-08-07 12:53:21 -06:00
Mohammed Al Sahaf 65e33fc1ee
reverseproxy: do not parse upstream address too early if it contains replaceble parts (#5695) 
* reverseproxy: do not parse upstream address too early if it contains replaceble parts

* remove unused method

* cleanup

* accommodate partially replaceable port
 2023-08-05 23:30:02 +02:00
Matthew Holt c049bab458
fileserver: browse: Render SVG images in grid 2023-08-03 12:53:47 -06:00
WeidiDeng e2fc08bd34
reverseproxy: Fix hijack ordering which broke websockets (#5679) 2023-08-03 04:08:12 +00:00
Francis Lavoie 1913930783
encode: Fix infinite recursion (#5672) 2023-08-02 18:21:11 -06:00
Francis Lavoie cd486c25d1
caddyhttp: Make use of `http.ResponseController` (#5654) 
* caddyhttp: Make use of http.ResponseController

Also syncs the reverseproxy implementation with stdlib's which now uses ResponseController as well 2449bbb5e6

* Enable full-duplex for HTTP/1.1

* Appease linter

* Add warning for builds with Go 1.20, so it's less surprising to users

* Improved godoc for EnableFullDuplex, copied text from stdlib

* Only wrap in encode if not already wrapped
 2023-08-02 20:03:26 +00:00
mmm444 da23501457
reverseproxy: Connection termination cleanup (#5663) 2023-08-01 14:01:12 +00:00
Omar Ramadan d7d16360d4
reverseproxy: Export ipVersions type (#5648) 
allows AUpstreams to be instantiated externally
 2023-07-25 12:50:21 -06:00
Matthew Holt 18c309b5fa
caddyhttp: Preserve original error (fix #5652) 2023-07-25 09:41:56 -06:00
ydylla e041962b66
fileserver: add lazy image loading (#5646) 2023-07-22 15:50:36 +00:00
Marten Seemann f45a6de20d
go.mod: Update quic-go to v0.37.0, bump to Go 1.20 minimum (#5644) 
* update quic-go to v0.37.0

* Bump to Go 1.20

* Bump golangci-lint version, yml syntax consistency

* Use skip-pkg-cache workaround

* Workaround needed for both?

* Seeding weakrand is no longer necessary

---------

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-07-21 22:00:48 -06:00
Matthew Holt 4e36b4c9d1
fileserver: Tweak grid view of browse template 
All cells on row have same height.
Center-align vertically.
 2023-07-17 11:18:40 -06:00
Mohammed Al Sahaf 27bc16abed
fileserver: add `export-template` sub-command to `file-server` (#5630) 2023-07-13 15:54:48 -06:00
Matt Holt 0e2c7e1d35
caddytls: Reuse certificate cache through reloads (#5623) 
* caddytls: Don't purge cert cache on config reload

* Update CertMagic

This actually avoids reloading managed certs from storage
when already in the cache, d'oh.

* Fix bug; re-implement HasCertificateForSubject

* Update go.mod: CertMagic tag
 2023-07-11 19:10:58 +00:00
Matthew Holt 5dec11f2a0
reverseproxy: Pointer receiver 
This avoids copying the Upstream, which has an atomically-accessed value
in it.
 2023-07-08 13:42:51 -06:00
Matthew Holt 66114cb155
caddyhttp: Trim dot/space only on Windows (fix #5613) 
Follow-up to #2917. Path matcher needs to trim dots and spaces but only
on Windows.
 2023-07-08 13:42:13 -06:00
Francis Lavoie 7a69ae7571
reverseproxy: Honor `tls_except_port` for active health checks (#5591) 2023-06-22 16:20:30 -06:00
Saber Haj Rabiee 361946eb0c
reverseproxy: weighted_round_robin load balancing policy (#5579) 
* added weighted round robin algorithm to load balancer

* added an adapt integration test for wrr and fixed a typo

* changed args format to Caddyfile args convention

* added provisioner and validator for wrr

* simplified the code and improved doc
 2023-06-20 11:42:58 -06:00
mmm444 424ae0f420
reverseproxy: Experimental streaming timeouts (#5567) 
* reverseproxy: WIP streaming timeouts

* More verbose logging by using the child logger

* reverseproxy: Implement streaming timeouts

* reverseproxy: Refactor cleanup

* reverseproxy: Avoid **time.Timer

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-06-19 15:54:43 -06:00
guangwu 4548b7de8e
chore: remove refs of deprecated io/ioutil (#5576) 2023-06-16 21:27:57 -06:00
Francis Lavoie 3b19aa2b5a
headers: Allow `>` to defer shortcut for replacements (#5574) 2023-06-15 17:18:55 -06:00
Dominik Roos 6a41b62e70
caddyhttp: Support custom network for HTTP/3 (#5573) 
Allow registering a custom network mapping for HTTP/3. This is useful
if the original network for HTTP/1.1 and HTTP/2 is not a standard `unix`,
`tcp4`, or `tcp6` network. To keep backwards compatibility, we fall back
to `udp` if the original network is not registered in the mapping.

Fixes #5555
 2023-06-13 19:33:39 -06:00
Corin Langosch 2ddb717144
reverseproxy: Fix parsing of source IP in case it's an ipv6 address (#5569) 2023-06-12 09:35:22 -06:00
365cent 56af1ceb32
fileserver: browse: Better grid layout (#5564) 
* feat: better implementation of grid layout

* fix: vertical alignment
 2023-06-05 07:39:57 +00:00
Matthew Holt 4ba03c9d38
caddytls: Clarify some JSON config docs 2023-06-04 22:15:50 -06:00
kassienull 31d75acc9c
templates: Add `readFile` action that does not evaluate templates (#5553) 
* Create an includeRaw template function to include a file without parsing it as a template.

Some formatting fixes

* Rename to readFile, various docs adjustments

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-05-26 10:16:28 -06:00
Matt Holt 5bd9c49042
fileserver: Don't set Etag if mtime is 0 or 1 (close #5548) (#5550) 2023-05-22 14:17:15 -06:00
pistasjis cdd3884b32
fileserver: browse: minor tweaks for grid view, dark mode (#5545) 
* Make grid entries take up full width on mobile and fix breadcrumb color issue in dark mode

Signed-off-by: Pistasj <odyssey346@disroot.org>

* Do mholt's suggestions

Signed-off-by: Pistasj <odyssey346@disroot.org>

---------

Signed-off-by: Pistasj <odyssey346@disroot.org>
 2023-05-20 17:23:17 -06:00
Charles Duffy 2615c9c524
fileserver: Only set Etag if not already set (fix #5546) (#5547) 2023-05-20 17:21:43 -06:00
pistasjis 5336bc0fb6
fileserver: Fix file browser breadcrumb font (#5543) 
Signed-off-by: Pistasj <odyssey346@disroot.org>
 2023-05-19 11:08:47 -06:00
WeidiDeng 29452647d8
caddyhttp: Fix h3 shutdown (#5541) 
* swap h3server close and listener close, avoid quic-listener not closing

* fix typo
 2023-05-19 10:00:00 -06:00
Matthew Holt bd34cb6b4e fileserver: More filetypes for browse icons 2023-05-19 09:59:44 -06:00
pistasjis 2d236ead3e
fileserver: Fix file browser footer in grid mode (#5536) 
* Fix file browser footer in grid

Signed-off-by: Odyssey <odyssey346@disroot.org>

* Fix file browser footer while in grid mode

Signed-off-by: Pistasj <odyssey346@disroot.org>

* Do mholt's suggestions

Signed-off-by: Odyssey <odyssey346@disroot.org>

---------

Signed-off-by: Odyssey <odyssey346@disroot.org>
Signed-off-by: Pistasj <odyssey346@disroot.org>
 2023-05-19 09:51:21 -06:00
Francis Lavoie cbf16f6d9e
caddyhttp: Implement named routes, `invoke` directive (#5107) 
* caddyhttp: Implement named routes, `invoke` directive

* gofmt

* Add experimental marker

* Adjust route compile comments
 2023-05-16 15:27:52 +00:00
Tran Phong 13a37688dc
rewrite: use escaped path, fix #5278 (#5504) 
* use escaped path while rewriting

Signed-off-by: TP-O <letranphong2k1@gmail.com>

* restore line break

---------

Signed-off-by: TP-O <letranphong2k1@gmail.com>
 2023-05-16 09:16:07 -06:00
Francis Lavoie e8352aef38
headers: Add > Caddyfile shortcut for enabling defer (#5535) 2023-05-16 01:18:13 -04: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
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
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
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
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
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
Matt Holt 0cc49c053f
caddytls: Zero out throttle window first (#5443) 
* caddytls: Zero out throttle window first

* Don't error for on-demand 

Fixes b97c76fb47

---------

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
 2023-03-20 12:06:00 -06: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
Matthew Holt a7af7c486e
caddytls: Allow on-demand w/o ask for internal-only 2023-03-14 10:29:27 -06:00
Matthew Holt b97c76fb47
caddytls: Require 'ask' endpoint for on-demand TLS 2023-03-14 10:02:44 -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
Francis Lavoie f6bab8ba85
context: Rename func to `AppIfConfigured` (#5397) 2023-02-27 18:58:27 +00: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