serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 14:13:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

matchers: fix a regression in #6480 (#6510)

Browse source 
The context may have no replacer
This commit is contained in:
vnxme 2024-08-12 10:01:09 +03:00 committed by GitHub
parent 21af88fefc
commit 7cf8376e63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
modules/caddytls/matchers.go
View file

@ -50,12 +50,13 @@ func (MatchServerName) CaddyModule() caddy.ModuleInfo {
// Match matches hello based on SNI. // Match matches hello based on SNI.
func (m MatchServerName) Match(hello *tls.ClientHelloInfo) bool { func (m MatchServerName) Match(hello *tls.ClientHelloInfo) bool {
repl := caddy.NewReplacer()
// caddytls.TestServerNameMatcher calls this function without any context // caddytls.TestServerNameMatcher calls this function without any context
var repl *caddy.Replacer
if ctx := hello.Context(); ctx != nil { if ctx := hello.Context(); ctx != nil {
repl = ctx.Value(caddy.ReplacerCtxKey).(*caddy.Replacer) // In some situations the existing context may have no replacer
} else { if replAny := ctx.Value(caddy.ReplacerCtxKey); replAny != nil {
repl = caddy.NewReplacer() repl = replAny.(*caddy.Replacer)
}
} }
for _, name := range m { for _, name := range m {