dnsx: add uidself for internally originated queries

Author: ignoramous

intra/dns53/ipmapper.go

@@ -100,7 +100,7 @@ func (m *ipmapper) LookupNetIPFor(ctx context.Context, network, host, uid string
 
 // Implements IPMapper.
 func (m *ipmapper) LookupNetIPOn(ctx context.Context, network, host string, tid ...string) ([]netip.Addr, error) {
-	return m.queryIP2(ctx, network, host, core.UNKNOWN_UID_STR, tid...)
+	return m.queryIP2(ctx, network, host, protect.UidSelf, tid...)
 }
 
 func (m *ipmapper) queryIP(ctx context.Context, network, host string, uid string) ([]netip.Addr, error) {
@@ -258,6 +258,7 @@ func (m *ipmapper) lookupfor(q []byte, uid string) func() (answer, error) {
 // lookupon always resolves on one of the chosen tids
 // (if empty, it may or may not use dnsx.Default;
 // see: dnsx.transport.go:determineTransport)
+// uid may be protect.UidSelf or unknown
 func (m *ipmapper) lookupon(q []byte, uid string, tids ...string) func() (answer, error) {
 	return func() (answer, error) {
 		a, tid, err := m.r.LookupFor2(q, uid, tids...)

intra/dnsx/rethinkdns.go

@@ -75,7 +75,7 @@ type ResolverSelf interface {
 	LocalLookup(q []byte) (a []byte, tid string, err error)
 	// LookupFor performs resolution for uid.
 	LookupFor(q []byte, uid string) (a []byte, tid string, err error)
-	// Lookup performs resolution on chosen Transport.
+	// Lookup performs resolution on chosen Transport for uid.
 	LookupFor2(q []byte, uid string, chosen ...string) (a []byte, tid string, err error)
 }
 

intra/dnsx/transport.go

@@ -472,6 +472,9 @@ func (r *resolver) LookupFor2(q []byte, uid string, tids ...string) ([]byte, str
 	if len(q) <= 0 {
 		return nil, NoDNS, errNoQuestion
 	}
+	if uid == core.UNKNOWN_UID_STR {
+		uid = protect.UidSelf
+	}
 	// if len(tids) == 0, use transport from preferences
 	return r.forward(q, OriginInternal, uid, tids...)
 }
@@ -594,7 +597,7 @@ runagain:
 	if t == nil || core.IsNil(t) {
 		smm.Latency = time.Since(starttime).Seconds()
 		smm.Status = TransportError
-		smm.Msg = strings.Join([]string{id, sid, chosenids, errNoSuchTransport.Error()}, ";")
+		smm.Msg = strings.Join(append(chosenids, id, sid, errNoSuchTransport.Error()), ";")
 		return nil, NoDNS, errNoSuchTransport
 	}
 	var t2 Transport

intra/doh/doh.go

@@ -372,7 +372,7 @@ func (t *transport) httpClientsFor(p ipn.Proxy) (c3, c *http.Client) {
 	t.pxcmu.RUnlock()
 
 	pdial := p.Dialer().Dial
-	if c != nil {
+	if c != nil { // use existing clients
 		if c3 == nil {
 			if echcfg := t.getOrCreateEchConfigIfNeeded(); echcfg != nil {
 				c3 = new(http.Client)
@@ -505,7 +505,7 @@ func (t *transport) multifetch(req *http.Request, pid string) (res *http.Respons
 	c3, c0 := t.httpClientsFor(px) // c3 may be nil
 
 	if settings.Debug {
-		log.VV("doh: using proxy %s+%s:%s ech? %t / other? %t",
+		log.VV("doh: using proxy %s+%s@%s ech? %t / other? %t",
 			px.ID(), rpid, px.GetAddr(), c3 != nil, c0 != nil)
 	}
 

intra/protect/ipmap/ipmap.go

@@ -95,7 +95,8 @@ type IPMapper interface {
 	LookupNetIP(ctx context.Context, network, host string) ([]netip.Addr, error)
 	// LookupNetIPFor is like LookupFor
 	LookupNetIPFor(ctx context.Context, network, host, uid string) ([]netip.Addr, error)
-	// LookupNetIPOn is like Lookup but with tids set to some preset IDs.
+	// LookupNetIPOn is like Lookup but with tids set to some preset IDs
+	// on behalf of protect.UidSelf (rethink).
 	LookupNetIPOn(ctx context.Context, network, host string, tids ...string) ([]netip.Addr, error)
 }