diff --git a/app/proxyman/outbound/handler.go b/app/proxyman/outbound/handler.go index 5d49c92e1..5ed5eff94 100644 --- a/app/proxyman/outbound/handler.go +++ b/app/proxyman/outbound/handler.go @@ -181,25 +181,29 @@ func (h *Handler) Tag() string { func (h *Handler) Dispatch(ctx context.Context, link *transport.Link) { outbounds := session.OutboundsFromContext(ctx) ob := outbounds[len(outbounds)-1] - if h.senderSettings != nil && h.senderSettings.TargetStrategy.HasStrategy() && ob.Target.Address.Family().IsDomain() && !session.SkipDNSResolveFromContext(ctx) { - strategy := h.senderSettings.TargetStrategy - if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil { - strategy = strategy.GetDynamicStrategy(ob.OriginalTarget.Address.Family()) - } - ips, err := internet.LookupForIP(ob.Target.Address.Domain(), strategy, nil) - if err != nil { - errors.LogInfoInner(ctx, err, "failed to resolve ip for target ", ob.Target.Address.Domain()) - if h.senderSettings.TargetStrategy.ForceIP() { - err := errors.New("failed to resolve ip for target ", ob.Target.Address.Domain()).Base(err) - session.SubmitOutboundErrorToOriginator(ctx, err) - common.Interrupt(link.Writer) - common.Interrupt(link.Reader) - return - } + if h.senderSettings != nil && h.senderSettings.TargetStrategy.HasStrategy() && ob.Target.Address.Family().IsDomain() { + if session.SkipDNSResolveFromContext(ctx) { + errors.LogInfo(ctx, "bypassing targetStrategy ", h.senderSettings.TargetStrategy, " for ", ob.Target, "; preserving target domain") } else { - unchangedDomain := ob.Target.Address.Domain() - ob.Target.Address = net.IPAddress(ips[dice.Roll(len(ips))]) - errors.LogInfo(ctx, "target: ", unchangedDomain, " resolved to: ", ob.Target.Address.String()) + strategy := h.senderSettings.TargetStrategy + if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil { + strategy = strategy.GetDynamicStrategy(ob.OriginalTarget.Address.Family()) + } + ips, err := internet.LookupForIP(ob.Target.Address.Domain(), strategy, nil) + if err != nil { + errors.LogInfoInner(ctx, err, "failed to resolve ip for target ", ob.Target.Address.Domain()) + if h.senderSettings.TargetStrategy.ForceIP() { + err := errors.New("failed to resolve ip for target ", ob.Target.Address.Domain()).Base(err) + session.SubmitOutboundErrorToOriginator(ctx, err) + common.Interrupt(link.Writer) + common.Interrupt(link.Reader) + return + } + } else { + unchangedDomain := ob.Target.Address.Domain() + ob.Target.Address = net.IPAddress(ips[dice.Roll(len(ips))]) + errors.LogInfo(ctx, "target: ", unchangedDomain, " resolved to: ", ob.Target.Address.String()) + } } } if ob.Target.Network == net.Network_UDP && ob.OriginalTarget.Address != nil && ob.OriginalTarget.Address != ob.Target.Address { diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go index cc54dcce9..7c07bfc18 100644 --- a/proxy/freedom/freedom.go +++ b/proxy/freedom/freedom.go @@ -286,12 +286,6 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte ob.Name = "freedom" ob.CanSpliceCopy = 1 - if session.SkipDNSResolveFromContext(ctx) { - handler := *h - handler.resolveStrategy = internet.DomainStrategy_AS_IS - h = &handler - } - inbound := session.InboundFromContext(ctx) var defaultRule *FinalRule if !h.usesDialerProxy { // freedom is not the final outbound, final rules do not apply (and the domain is not resolved) @@ -318,6 +312,13 @@ func (h *Handler) Process(ctx context.Context, link *transport.Link, dialer inte } } + if h.resolveStrategy.HasStrategy() && session.SkipDNSResolveFromContext(ctx) { + errors.LogInfo(ctx, "using AsIs instead of sockopt.domainStrategy ", h.resolveStrategy, " for connection to ", destination, " (including UDP packet targets)") + handler := *h + handler.resolveStrategy = internet.DomainStrategy_AS_IS + h = &handler + } + input := link.Reader output := link.Writer