summaryrefslogtreecommitdiff
path: root/caddytest
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2020-04-01 20:49:35 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2020-04-01 20:49:35 -0600
commit6ca5828221b25cb781932836d9c6959af857196c (patch)
tree5c47bfd57d1dfc283a5d2f9d59a666ad272e5975 /caddytest
parent6fe04a30b102cc9aaa9d0df717c9fbb73f276139 (diff)
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.
Diffstat (limited to 'caddytest')
-rw-r--r--caddytest/integration/sni_test.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/caddytest/integration/sni_test.go b/caddytest/integration/sni_test.go
index d329782..e48346d 100644
--- a/caddytest/integration/sni_test.go
+++ b/caddytest/integration/sni_test.go
@@ -57,8 +57,7 @@ func TestDefaultSNI(t *testing.T) {
"tls_connection_policies": [
{
"certificate_selection": {
- "policy": "custom",
- "tag": "cert0"
+ "any_tag": ["cert0"]
},
"match": {
"sni": [
@@ -155,8 +154,7 @@ func TestDefaultSNIWithNamedHostAndExplicitIP(t *testing.T) {
"tls_connection_policies": [
{
"certificate_selection": {
- "policy": "custom",
- "tag": "cert0"
+ "any_tag": ["cert0"]
},
"default_sni": "a.caddy.localhost",
"match": {
@@ -238,8 +236,7 @@ func TestDefaultSNIWithPortMappingOnly(t *testing.T) {
"tls_connection_policies": [
{
"certificate_selection": {
- "policy": "custom",
- "tag": "cert0"
+ "any_tag": ["cert0"]
},
"default_sni": "a.caddy.localhost"
}