- Sponsor
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
httpcaddyfile, caddytls: Multiple edge case fixes; add tests
- Create two default automation policies; if the TLS app is used in isolation with the 'automate' certificate loader, it will now use an internal issuer for internal-only names, and an ACME issuer for all other names by default. - If the HTTP Caddyfile adds an 'automate' loader, it now also adds an automation policy for any names in that loader that do not qualify for public certificates so that they will be issued internally. (It might be nice if this wasn't necessary, but the alternative is to either make auto-HTTPS logic way more complex by scanning the names in the 'automate' loader, or to have an automation policy without an issuer switch between default issuer based on the name being issued a certificate - I think I like the latter option better, right now we do something kind of like that but at a level above each individual automation policies, we do that switch only when no automation policies match, rather than when a policy without an issuer does match.) - Set the default LoggerName rather than a LoggerNames with an empty host value, which is now taken literally rather than as a catch-all. - hostsFromKeys, the function that gets a list of hosts from server block keys, no longer returns an empty string in its resulting slice, ever.
- Loading branch information
Showing
6 changed files
with
186 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
package httpcaddyfile | ||
|
||
import ( | ||
"reflect" | ||
"sort" | ||
"testing" | ||
) | ||
|
||
func TestHostsFromKeys(t *testing.T) { | ||
for i, tc := range []struct { | ||
keys []Address | ||
expectNormalMode []string | ||
expectLoggerMode []string | ||
}{ | ||
{ | ||
[]Address{ | ||
Address{Original: "foo", Host: "foo"}, | ||
}, | ||
[]string{"foo"}, | ||
[]string{"foo"}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: "foo", Host: "foo"}, | ||
Address{Original: "bar", Host: "bar"}, | ||
}, | ||
[]string{"bar", "foo"}, | ||
[]string{"bar", "foo"}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: ":2015", Port: "2015"}, | ||
}, | ||
[]string{}, []string{}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: ":443", Port: "443"}, | ||
}, | ||
[]string{}, []string{}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: "foo", Host: "foo"}, | ||
Address{Original: ":2015", Port: "2015"}, | ||
}, | ||
[]string{}, []string{"foo"}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: "example.com:2015", Host: "example.com", Port: "2015"}, | ||
}, | ||
[]string{"example.com"}, | ||
[]string{"example.com:2015"}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: "example.com:80", Host: "example.com", Port: "80"}, | ||
}, | ||
[]string{"example.com"}, | ||
[]string{"example.com"}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: "https://:2015/foo", Scheme: "https", Port: "2015", Path: "/foo"}, | ||
}, | ||
[]string{}, | ||
[]string{}, | ||
}, | ||
{ | ||
[]Address{ | ||
Address{Original: "https://example.com:2015/foo", Scheme: "https", Host: "example.com", Port: "2015", Path: "/foo"}, | ||
}, | ||
[]string{"example.com"}, | ||
[]string{"example.com:2015"}, | ||
}, | ||
} { | ||
sb := serverBlock{keys: tc.keys} | ||
|
||
// test in normal mode | ||
actual := sb.hostsFromKeys(false) | ||
sort.Strings(actual) | ||
if !reflect.DeepEqual(tc.expectNormalMode, actual) { | ||
t.Errorf("Test %d (loggerMode=false): Expected: %v Actual: %v", i, tc.expectNormalMode, actual) | ||
} | ||
|
||
// test in logger mode | ||
actual = sb.hostsFromKeys(true) | ||
sort.Strings(actual) | ||
if !reflect.DeepEqual(tc.expectLoggerMode, actual) { | ||
t.Errorf("Test %d (loggerMode=true): Expected: %v Actual: %v", i, tc.expectLoggerMode, actual) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters