purgatory/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-25 14:46:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert domain names to lowercase before matching (#195)

Browse Source 
Co-authored-by: RPRX <63339210+rprx@users.noreply.github.com>
This commit is contained in:
Arthur Morgan 2021-01-22 07:37:55 +08:00 committed by GitHub
parent 0b4858d016
commit 5aa053a65f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/dns/server.go
View File

@ -364,6 +364,7 @@ func (s *Server) lookupIPInternal(domain string, option IPOption) ([]net.IP, err
if domain == "" { if domain == "" {
return nil, newError("empty domain name") return nil, newError("empty domain name")
} }
domain = strings.ToLower(domain)
// normalize the FQDN form query // normalize the FQDN form query
if domain[len(domain)-1] == '.' { if domain[len(domain)-1] == '.' {

2
app/router/condition.go
View File

@ -91,7 +91,7 @@ func (m *DomainMatcher) Apply(ctx routing.Context) bool {
if len(domain) == 0 { if len(domain) == 0 {
return false return false
} }
return m.ApplyDomain(domain) return m.ApplyDomain(strings.ToLower(domain))
} }
type MultiGeoIPMatcher struct { type MultiGeoIPMatcher struct {

2
common/protocol/tls/sniff.go
View File

@ -102,7 +102,7 @@ func ReadClientHello(data []byte, h *SniffHeader) error {
return errNotClientHello return errNotClientHello
} }
if nameType == 0 { if nameType == 0 {
serverName := string(d[:nameLen]) serverName := strings.ToLower(string(d[:nameLen]))
// An SNI value may not include a // An SNI value may not include a
// trailing dot. See // trailing dot. See
// https://tools.ietf.org/html/rfc6066#section-3. // https://tools.ietf.org/html/rfc6066#section-3.

2
proxy/trojan/server.go
View File

@ -412,6 +412,8 @@ func (s *Server) fallback(ctx context.Context, sid errors.ExportOption, err erro
newError("realName = " + name).AtInfo().WriteToLog(sid) newError("realName = " + name).AtInfo().WriteToLog(sid)
newError("realAlpn = " + alpn).AtInfo().WriteToLog(sid) newError("realAlpn = " + alpn).AtInfo().WriteToLog(sid)
} }
name = strings.ToLower(name)
alpn = strings.ToLower(alpn)
if len(napfb) > 1 || napfb[""] == nil { if len(napfb) > 1 || napfb[""] == nil {
if name != "" && napfb[name] == nil { if name != "" && napfb[name] == nil {

2
proxy/vless/inbound/inbound.go
View File

@ -232,6 +232,8 @@ func (h *Handler) Process(ctx context.Context, network net.Network, connection i
newError("realName = " + name).AtInfo().WriteToLog(sid) newError("realName = " + name).AtInfo().WriteToLog(sid)
newError("realAlpn = " + alpn).AtInfo().WriteToLog(sid) newError("realAlpn = " + alpn).AtInfo().WriteToLog(sid)
} }
name = strings.ToLower(name)
alpn = strings.ToLower(alpn)
if len(napfb) > 1 || napfb[""] == nil { if len(napfb) > 1 || napfb[""] == nil {
if name != "" && napfb[name] == nil { if name != "" && napfb[name] == nil {