github-mirror/caddy
github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-04-25 06:14:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

caddytls: Fix sni_regexp matcher

Browse Source
This commit is contained in:
vnxme 2025-01-24 10:28:26 +03:00
parent 8d748bee71
commit 5b13c65a82
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/caddytls/matchers.go
View File

@ -15,6 +15,7 @@
package caddytls
import (
"context"
"crypto/tls"
"fmt"
"net"
@ -224,13 +225,26 @@ func (MatchServerNameRE) CaddyModule() caddy.ModuleInfo {
// Match matches hello based on SNI using a regular expression.
func (m MatchServerNameRE) Match(hello *tls.ClientHelloInfo) bool {
repl := caddy.NewReplacer()
var repl *caddy.Replacer
// caddytls.TestServerNameMatcher calls this function without any context
if ctx := hello.Context(); ctx != nil {
// In some situations the existing context may have no replacer
if replAny := ctx.Value(caddy.ReplacerCtxKey); replAny != nil {
repl = replAny.(*caddy.Replacer)
}
} else if mayHaveContext, ok := hello.Conn.(interface{ GetContext() context.Context }); ok {
// layer4.Connection implements GetContext() to pass its context here,
// since hello.Context() returns nil
if ctx = mayHaveContext.GetContext(); ctx != nil {
// In some situations the existing context may have no replacer
if replAny := ctx.Value(caddy.ReplacerCtxKey); replAny != nil {
repl = replAny.(*caddy.Replacer)
}
}
}
if repl == nil {
repl = caddy.NewReplacer()
}
return m.MatchRegexp.Match(hello.ServerName, repl)