mirror of
https://github.com/XTLS/Xray-core.git
synced 2024-12-23 11:53:33 +02:00
cd4631ce99
* DNS: add clientip for specific nameserver * Refactoring: DNS App * DNS: add DNS over QUIC support * Feat: add disableCache option for DNS * Feat: add queryStrategy option for DNS * Feat: add disableFallback & skipFallback option for DNS * Feat: DNS hosts support multiple addresses * Feat: DNS transport over TCP * DNS: fix typo & refine code * DNS: refine code * Add disableFallbackIfMatch dns option * Feat: routing and freedom outbound ignore Fake DNS Turn off fake DNS for request sent from Routing and Freedom outbound. Fake DNS now only apply to DNS outbound. This is important for Android, where VPN service take over all system DNS traffic and pass it to core. "UseIp" option can be used in Freedom outbound to avoid getting fake IP and fail connection. * Fix test * Fix dns return * Fix local dns return empty * Apply timeout to dns outbound * Update app/dns/config.go Co-authored-by: Loyalsoldier <10487845+loyalsoldier@users.noreply.github.com> Co-authored-by: Ye Zhihao <vigilans@foxmail.com> Co-authored-by: maskedeken <52683904+maskedeken@users.noreply.github.com> Co-authored-by: V2Fly Team <51714622+vcptr@users.noreply.github.com> Co-authored-by: CalmLong <37164399+calmlong@users.noreply.github.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com> Co-authored-by: 秋のかえで <autmaple@protonmail.com> Co-authored-by: 朱聖黎 <digglife@gmail.com> Co-authored-by: rurirei <72071920+rurirei@users.noreply.github.com> Co-authored-by: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Co-authored-by: Arthur Morgan <4637240+badO1a5A90@users.noreply.github.com>
63 lines
2.1 KiB
Go
63 lines
2.1 KiB
Go
package dns
|
|
|
|
import (
|
|
"github.com/xtls/xray-core/common/net"
|
|
"github.com/xtls/xray-core/common/strmatcher"
|
|
"github.com/xtls/xray-core/common/uuid"
|
|
)
|
|
|
|
var typeMap = map[DomainMatchingType]strmatcher.Type{
|
|
DomainMatchingType_Full: strmatcher.Full,
|
|
DomainMatchingType_Subdomain: strmatcher.Domain,
|
|
DomainMatchingType_Keyword: strmatcher.Substr,
|
|
DomainMatchingType_Regex: strmatcher.Regex,
|
|
}
|
|
|
|
// References:
|
|
// https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml
|
|
// https://unix.stackexchange.com/questions/92441/whats-the-difference-between-local-home-and-lan
|
|
var localTLDsAndDotlessDomains = []*NameServer_PriorityDomain{
|
|
{Type: DomainMatchingType_Regex, Domain: "^[^.]+$"}, // This will only match domains without any dot
|
|
{Type: DomainMatchingType_Subdomain, Domain: "local"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "localdomain"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "localhost"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "lan"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "home.arpa"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "example"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "invalid"},
|
|
{Type: DomainMatchingType_Subdomain, Domain: "test"},
|
|
}
|
|
|
|
var localTLDsAndDotlessDomainsRule = &NameServer_OriginalRule{
|
|
Rule: "geosite:private",
|
|
Size: uint32(len(localTLDsAndDotlessDomains)),
|
|
}
|
|
|
|
func toStrMatcher(t DomainMatchingType, domain string) (strmatcher.Matcher, error) {
|
|
strMType, f := typeMap[t]
|
|
if !f {
|
|
return nil, newError("unknown mapping type", t).AtWarning()
|
|
}
|
|
matcher, err := strMType.New(domain)
|
|
if err != nil {
|
|
return nil, newError("failed to create str matcher").Base(err)
|
|
}
|
|
return matcher, nil
|
|
}
|
|
|
|
func toNetIP(addrs []net.Address) ([]net.IP, error) {
|
|
ips := make([]net.IP, 0, len(addrs))
|
|
for _, addr := range addrs {
|
|
if addr.Family().IsIP() {
|
|
ips = append(ips, addr.IP())
|
|
} else {
|
|
return nil, newError("Failed to convert address", addr, "to Net IP.").AtWarning()
|
|
}
|
|
}
|
|
return ips, nil
|
|
}
|
|
|
|
func generateRandomTag() string {
|
|
id := uuid.New()
|
|
return "xray.system." + id.String()
|
|
}
|