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

784 Commits

Author SHA1 Message Date
snu-ceyda 735c86658d
fileserver: Enable browse pagination with offset parameter (#3542) 
* Update browse.go

* Update browselisting.go

* Update browsetpl.go

* fix linter err

* Update modules/caddyhttp/fileserver/browse.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

* Update modules/caddyhttp/fileserver/browselisting.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

* Update browsetpl.go

change from -> offset

* Update browse.go

* Update browselisting.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2020-07-08 23:56:15 -06:00
Matthew Holt a2dae1d43f
templates: Fix front matter closing fence search 
This makes it choose first matching closing fence instead of last one,
which could appear in document body.
 2020-07-08 16:46:56 -06:00
Matthew Holt efc0cc5e85
caddytls: Move initial storage clean op into goroutine 
Sometimes this operation can take a while (we observed 7 minutes
recently, with a large, globally-distributed storage backend).
 2020-07-08 10:59:49 -06:00
Matthew Holt 0bf2565c37
caddyhttp: Reorder some access log fields; add host matcher test case 
This field order reads a little more naturally.
 2020-07-07 08:11:35 -06:00
Matthew Holt 7bfe5b6c95
httpcaddyfile: Reorder automation policy logic (close #3550) 2020-07-07 08:10:37 -06:00
Matthew Holt 2a5599e2ad
go.mod: Upgrade and downgrade smallstep, quic-go, and cpuid 
Closes #3537 and fixes #3535
 2020-07-06 12:10:35 -06:00
Greg Anders c35820012b
templates: Disable hard wraps in Markdown rendering (#3553) 2020-07-06 11:53:40 -06:00
Francis Lavoie 2d0f8831f8
ci: Fix another oops with publish workflow (#3536) 2020-06-30 15:36:17 -04:00
Mohammed Al Sahaf d7dbf85525
cel: fix validation of expression result type (#3526) 
* cel: fix validation of expression result type

The earlier code used the proto.Equals from github.com/gogo/protobuf, which failed to compare two messages of the same type for some reason. Switching to proto.Equal from the canonical github.com/golang/protobuf fixes the issue.

* deps: remove deprecated github.com/golang/protobuf in favor of google.golang.org/protobuf

* downgrade github.com/smallstep/nosql to resolve warning pb.proto warning
 2020-06-30 11:53:29 -06:00
Matthew Holt 77f233a484 caddyhttp: Corrected host label index check (fix #3502) 2020-06-30 11:43:01 -06:00
James Birtles ddd690de4c
caddyhttp: Support placeholders in query matcher (#3521) 2020-06-26 15:14:47 -06:00
Mark Sargent 6004d3f779
caddyhttp: Add 'map' handler (#3199) 
* inital map implementation

* resolve the value during middleware execution

* use regex instead

* pr feedback

* renamed mmap to maphandler

* refactored GetString implementation

* fixed mispelling

* additional feedback
 2020-06-26 15:12:37 -06:00
Francis Lavoie caca55e582
ci: Fix release publish trigger (#3524) 
Looks like event payloads need to be prefixed with `github.event` to get the actual payload contents. Didn't dig deep enough.

https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#github-context
 2020-06-26 16:00:54 -04:00
Matthew Holt c9049bdc24
go.mod: Minor dependency updates 2020-06-26 12:19:51 -06:00
Matt Holt 21c00a3cd2
caddyhttp: Better host matching for logger names (fix #3488) (#3522) 
First try an exact lookup like before, but if it fails, strip the port
and try again. example.com:1234 should still use a logger keyed for
example.com if there is no key example.com:1234.
 2020-06-26 12:01:50 -06:00
Francis Lavoie 61b7002d26
ci: Apparently only single-quote strings are supported (#3523) 
https://help.github.com/en/actions/reference/context-and-expression-syntax-for-github-actions#literals

https://github.com/caddyserver/caddy/actions/runs/147953515
 2020-06-25 21:58:44 +00:00
Francis Lavoie b1480eb52f
fastcgi: Fix php_fastcgi matcher regression (#3512) 2020-06-22 11:45:18 -06:00
Xiuming Chen 5bc4777be9
chore: Fix typo in reverse-proxy subcommand help message (#3513) 2020-06-22 00:40:54 -04:00
Matthew Holt 3af15c0725
caddyhttp: Empty, not nil, query matcher matches empty query string 2020-06-16 12:02:23 -06:00
Matthew Holt 6db3615547
caddyhttp: Enable matching empty query string 
Caddyfile syntax: query ""

Or a nil matcher in the JSON should also match an empty query string.

See https://caddy.community/t/v2-match-empty-query/8708?u=matt
 2020-06-16 10:41:37 -06:00
Matthew Holt 32cafbb630
httpcaddyfile: Fix ordering of catch-all site blocks 
Catch-alls should always go last. Normally this is the case, but we have
a special case for comparing one wildcard-host site block to another
non-wildcard host site block; and a catch-all site block is also a
non-wildcard host site block, so now we have to special-case the
catch-all site block. Sigh.

This could be reproduced with a Caddyfile that has two site blocks:
":80" and "*.example.com", in that order.
 2020-06-16 10:02:06 -06:00
Francis Lavoie 003403ecbc
templates: Add support for dots to close yaml frontmatter (#3498) 
* templates: Add support for dots to close yaml frontmatter

* templates: Fix regression in body output
 2020-06-15 12:38:51 -06:00
Mohammed Al Sahaf 5b48f784ae
ci: don't run s390x tests on PRs of forks (#3494) 
* ci: don't run s390x tests on PRs of forks

* ci: check if fork by matchinging name from event against name of repo
 2020-06-12 19:51:04 +00:00
Chris Ortman d84a5d8427
httpcaddyfile: New `acme_eab` option (#3492) 
* Adds global options for external account bindings

* Maybe other people use ctags too?

* Use nested block to configure external account

* go format files

* Restore acme_ca directive in test file

* Change Caddyfile config syntax for acme_eab

* Update test

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2020-06-12 13:37:56 -06:00
Mohammed Al Sahaf 7da32f493a
ci: skip s390x tests on forks (#3493) 2020-06-12 18:03:29 +00:00
Matthew Holt cb0d9838cb
go.mod: Update quic-go to 0.17.1 (draft 29) and certmagic 0.11.2 (eab) 2020-06-12 11:52:12 -06:00
Matthew Holt d81a69ef16 Merge branch 'eab-fix' 2020-06-12 11:49:45 -06:00
Mohammed Al Sahaf 99dcc10f31
ci: add CI on s390x (#3463) 
* ci: lay out foundation for s390x tests

* ci: uncomment the s390x test script & replace placeholders with real values

* ci: amend the s390x test job name to be more consistent with others
 2020-06-12 17:11:46 +00: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
Matthew Holt d55c3b31eb
caddyhttp: Add client cert SAN placeholders 2020-06-11 16:19:07 -06:00
Matthew Holt 6d03fb48f9
caddytls: Don't decode HMAC 
https://caddy.community/t/trouble-with-external-account-hmac/8600?u=matt
 2020-06-11 15:33:27 -06:00
Matthew Holt b3bff13f7d
reverseproxy: Close websocket conn if req context cancels 
This is a recent patch in the Go standard library
 2020-06-11 15:25:26 -06:00
Francis Lavoie 7211101c52
ci: Fix gemfury upload condition, move triggers to publish event (#3483) 2020-06-08 12:21:20 -06:00
Mohammed Al Sahaf 90dba172cb
ci: fix an oopsie in the release script (#3482) 2020-06-08 11:10:28 -06:00
Matthew Holt 4b10ae5ce6
reverseproxy: Add Caddyfile support for ClientCertificateAutomate 2020-06-08 10:30:26 -06:00
NWHirschfeld 1dfb11486e
httpcaddyfile: Add client_auth options to tls directive (#3335) 
* reading client certificate config from Caddyfile

Signed-off-by: NWHirschfeld <Niclas@NWHirschfeld.de>

* Update caddyconfig/httpcaddyfile/builtins.go

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

* added adapt test for parsing client certificate configuration from Caddyfile

Signed-off-by: NWHirschfeld <Niclas@NWHirschfeld.de>

* read client ca and leaf certificates from file https://github.com/caddyserver/caddy/pull/3335#discussion_r421633844

Signed-off-by: NWHirschfeld <Niclas@NWHirschfeld.de>

* Update modules/caddytls/connpolicy.go

* Make review adjustments

Co-authored-by: Francis Lavoie <lavofr@gmail.com>
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2020-06-05 12:19:36 -06:00
Matthew Holt 11a132d48b
caddytls: Configurable cache size limit 2020-06-05 11:14:39 -06:00
Matthew Holt 9dafa63933
go.mod: Update dependencies 2020-06-05 11:14:09 -06:00
Francis Lavoie 21c1da101c
ci: Disable publishing .deb on beta tags (#3473) 2020-06-05 10:23:15 -06:00
Matthew Holt 7a99835dab
reverseproxy: Enable changing only the status code (close #2920) 2020-06-04 12:06:38 -06:00
Matthew Holt 7b0962ba4d
caddyhttp: Default to error status if found in context 
This is just a convenience if using a static_response handler in an
error route, by setting the default status code to the same one as
the error status.
 2020-06-04 10:32:01 -06:00
Matthew Holt 2d1f7b9da8
caddyhttp: Auto-redirects from all bind addresses (fix #3443) 2020-06-03 10:56:26 -06:00
Matthew Holt a285fe4129
caddypki: Add 'acme_server' Caddyfile directive 2020-06-03 09:59:36 -06:00
Matthew Holt 97e61c16a3
httpcaddyfile: Sort site blocks with wildcards last (fix #3410) 2020-06-03 09:35:13 -06:00
Matthew Holt 83551edf3e
cmd: Only stop admin server on signal if it exists (fix #3470) 2020-06-03 07:31:31 -06:00
Matthew Holt e18c373064
caddytls: Actually use configured test CA 2020-06-02 11:13:44 -06:00
Matt Holt 9a7756c6e4
caddyauth: Cache basicauth results (fixes #3462) (#3465) 
Cache capacity is currently hard-coded at 1000 with random eviction.
It is enabled by default from Caddyfile configurations because I assume
this is the most common preference.
 2020-06-01 23:56:47 -06:00
Francis Lavoie fdf2a77feb
caddyfile: Add args on imports (#3423) 
* caddyfile: Add support for args on imports

* caddyfile: Add more import args tests
 2020-06-01 10:43:06 -06:00
Georges Haidar a496308f6e
httpcaddyfile: Let modules add listener wrappers (#3397) 
* httpcaddyfile: allow modules to customize listener wrappers

* Update caddyconfig/httpcaddyfile/httptype.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

* Update caddyconfig/httpcaddyfile/httptype.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

* Update caddyconfig/httpcaddyfile/httptype.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

* Update caddyconfig/httpcaddyfile/httptype.go

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2020-06-01 09:50:00 -06:00
Matthew Holt d5d7fb5954
go.mod: Update dependencies 2020-06-01 09:31:08 -06:00