Remzona54/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2026-05-13 13:57:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix Tailscale search domain response name mismatch

Browse source
This commit is contained in:
世界 2026-04-21 14:41:02 +08:00
parent 6b51bd6778
commit acfb90a38e
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
protocol/tailscale/dns_transport.go
View file

@ -272,11 +272,13 @@ func (t *DNSTransport) exchangeWithSearchDomains(ctx context.Context, message *m
t.access.RLock()
searchDomains := t.searchDomains
t.access.RUnlock()
singleLabel := strings.TrimSuffix(message.Question[0].Name, ".")
originalQuestion := message.Question[0]
singleLabel := strings.TrimSuffix(originalQuestion.Name, ".")
var lastErr error
for _, searchDomain := range searchDomains {
question := message.Question[0]
question.Name = singleLabel + "." + searchDomain
expandedName := singleLabel + "." + searchDomain
question := originalQuestion
question.Name = expandedName
rewritten := *message
rewritten.Question = []mDNS.Question{question}
response, err := t.exchangeOnce(ctx, &rewritten, false)
@ -284,6 +286,7 @@ func (t *DNSTransport) exchangeWithSearchDomains(ctx context.Context, message *m
if response.Rcode == mDNS.RcodeNameError {
continue
}
restoreOriginalQuestion(response, expandedName, originalQuestion)
return response, nil
}
if errors.Is(err, dns.RcodeNameError) {
@ -297,6 +300,17 @@ func (t *DNSTransport) exchangeWithSearchDomains(ctx context.Context, message *m
return nil, dns.RcodeNameError
}
// RFC 1035 §4.1.1 requires the response Question to match the request byte-for-byte,
// and stub resolvers discard Answer RRs whose owner name does not match the question.
func restoreOriginalQuestion(response *mDNS.Msg, expandedName string, originalQuestion mDNS.Question) {
response.Question = []mDNS.Question{originalQuestion}
for _, rr := range response.Answer {
if strings.EqualFold(rr.Header().Name, expandedName) {
rr.Header().Name = originalQuestion.Name
}
}
}
func (t *DNSTransport) exchangeOnce(ctx context.Context, message *mDNS.Msg, allowDefaultResolvers bool) (*mDNS.Msg, error) {
question := message.Question[0]