mirror of
https://github.com/tailscale/tailscale.git
synced 2026-11-21 17:21:18 -08:00
ipn/ipnlocal,ipn/localapi: propagate context through DNS queries
Accept a caller context in LocalBackend.QueryDNS and pass it to the internal resolver. Use the HTTP request context for localapi DNS queries so cancellation and deadlines bound the lookup. Updates #8338 Change-Id: I1bb8ec0b779c883ec40d52063adf25ff36cf43e3 Signed-off-by: James Tucker <[email protected]>
This commit is contained in:
1 parent
d064d751fb
commit
7623e71e9c
2 files changed
+6
-6
No files matched your search
@@ -961,10 +961,10 @@ func (b *LocalBackend) GetDNSOSConfig() (dns.OSConfig, error) {
|
||||
return manager.GetBaseConfig()
|
||||
}
|
||||
|
||||
// QueryDNS performs a DNS query for name and queryType using the built-in DNS resolver, and returns
|
||||
// the raw DNS response and the resolvers that are were able to handle the query (the internal forwarder
|
||||
// may race multiple resolvers).
|
||||
func (b *LocalBackend) QueryDNS(name string, queryType dnsmessage.Type) (res []byte, resolvers []*dnstype.Resolver, err error) {
|
||||
// QueryDNS queries name and queryType using the built-in DNS resolver.
|
||||
// It returns the wire-format response and the resolvers handling the query.
|
||||
// ctx bounds the query duration. Truncated responses are retried over TCP.
|
||||
func (b *LocalBackend) QueryDNS(ctx context.Context, name string, queryType dnsmessage.Type) (res []byte, resolvers []*dnstype.Resolver, err error) {
|
||||
if !buildfeatures.HasDNS {
|
||||
return nil, nil, feature.ErrUnavailable
|
||||
}
|
||||
@@ -999,7 +999,7 @@ func (b *LocalBackend) QueryDNS(name string, queryType dnsmessage.Type) (res []b
|
||||
b.logf("DNSQuery: failed to build query: %v", err)
|
||||
return nil, nil, err
|
||||
}
|
||||
res, err = manager.Query(b.ctx, q, "tcp", from)
|
||||
res, err = manager.Query(ctx, q, "tcp", from)
|
||||
if err != nil {
|
||||
b.logf("DNSQuery: failed to query %q: %v", name, err)
|
||||
return nil, nil, err
|
||||
|
||||
@@ -1759,7 +1759,7 @@ func (h *Handler) serveDNSQuery(w http.ResponseWriter, r *http.Request) {
|
||||
qt = t
|
||||
}
|
||||
|
||||
res, rrs, err := h.b.QueryDNS(name, qt)
|
||||
res, rrs, err := h.b.QueryDNS(r.Context(), name, qt)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
|
||||
Reference in new issue
Block a user