From d89ad2fd5ba8de6dee0ff420458b634431da9b89 Mon Sep 17 00:00:00 2001 From: Matt Holt Date: Thu, 9 Apr 2020 12:39:05 -0600 Subject: 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 --- caddytest/integration/sni_test.go | 43 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'caddytest/integration') diff --git a/caddytest/integration/sni_test.go b/caddytest/integration/sni_test.go index e48346d..f26131e 100644 --- a/caddytest/integration/sni_test.go +++ b/caddytest/integration/sni_test.go @@ -272,3 +272,46 @@ func TestDefaultSNIWithPortMappingOnly(t *testing.T) { // makes a request with no sni caddytest.AssertGetResponse(t, "https://127.0.0.1:9443/version", 200, "hello from a") } + +func TestHttpOnlyOnDomainWithSNI(t *testing.T) { + caddytest.AssertAdapt(t, ` + { + default_sni a.caddy.localhost + } + :80 { + respond /version 200 { + body "hello from localhost" + } + } + `, "caddyfile", `{ + "apps": { + "http": { + "servers": { + "srv0": { + "listen": [ + ":80" + ], + "routes": [ + { + "match": [ + { + "path": [ + "/version" + ] + } + ], + "handle": [ + { + "body": "hello from localhost", + "handler": "static_response", + "status_code": 200 + } + ] + } + ] + } + } + } + } +}`) +} -- cgit v1.2.3