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

9 Commits

Author SHA1 Message Date
Matt Holt d89ad2fd5b
caddytls: Fix for TLS conn policy being applied to HTTP-only servers (#3243) 
* httpcaddyfile: Don't add TLS policy to HTTP-only server (#3193, #3223)

* Account for HTTP port

* Add integration test written by @sarge
 2020-04-09 12:39:05 -06:00
Mohammed Al Sahaf 7dfd69cdc5
chore: make the linter happier (#3245) 
* chore: make the linter happier

* chore: remove reference to maligned linter in .golangci.yml
 2020-04-08 15:31:51 -06:00
Mark Sargent 78717ce5b0
chore: add adapt tests. fix load failure not failing tests (#3222) 
* add adaption tests. fix load failure not failing tests

* removed unnecessary assignment
 2020-04-03 21:02:46 -06:00
Matthew Holt 6ca5828221
caddytls: Refactor certificate selection policies (close #1575) 
Certificate selection used to be a module, but this seems unnecessary,
especially since the built-in CustomSelectionPolicy allows quite complex
selection logic on a number of fields in certs. If we need to extend
that logic, we can, but I don't think there are SO many possibilities
that we need modules.

This update also allows certificate selection to choose between multiple
matching certs based on client compatibility and makes a number of other
improvements in the default cert selection logic, both here and in the
latest CertMagic.

The hardest part of this was the conn policy consolidation logic
(Caddyfile only, of course). We have to merge connection policies that
we can easily combine, because if two certs are manually loaded in a
Caddyfile site block, that produces two connection policies, and each
cert is tagged with a different tag, meaning only the first would ever
be selected. So given the same matchers, we can merge the two, but this
required improving the Tag selection logic to support multiple tags to
choose from, hence "tags" changed to "any_tag" or "all_tags" (but we
use any_tag in our Caddyfile logic).

Combining conn policies with conflicting settings is impossible, so
that should return an error if two policies with the exact same matchers
have non-empty settings that are not the same (the one exception being
any_tag which we can merge because the logic for them is to OR them).

It was a bit complicated. It seems to work in numerous tests I've
conducted, but we'll see how it pans out in the release candidates.
 2020-04-01 20:49:35 -06:00
Mark Sargent ba08833b2a
ci: exclude integration tests for now (#3188) 
A workaround for inconsistent results on Windows
 2020-03-25 08:55:14 -06:00
Mark Sargent d08cbefff8
report error on failed location response (#3184) 
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2020-03-23 21:18:53 -06:00
Mark Sargent 8cc60e6896
ci: test local CA and update SNI tests (#3145) 
* run caddy tests in process

* call main with run args

* exclude tests - windows

* include json example

* disable caddyfile tests, include json test with non trusted local ca

* converted SNI tests to json syntax
 2020-03-22 18:08:02 -06:00
Mark Sargent 3f48a2eb45
caddyhttp: Add default SNI tests (#3146) 
* added sni tests

* set the default sni when there is no host to match

* removed invalid sni test. Disabled tests that rely on host headers.

* readded SNI tests. Added logging of config load times
 2020-03-17 12:39:01 -06:00
Mark Sargent c447236357
caddyhttp: Fix default SNI for default conn policy (#3141) 
* add integration tests

* removed SNI test

* remove integration test condition

* minor edit

* fix sni when using static certificates

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2020-03-13 11:32:53 -06:00