Merge pull request #483 from dolonet/fix/socks-proxy-resolver

Do not use custom DNS resolver to dial proxy upstreams

network/v2/proxy_network.go

@@ -3,6 +3,7 @@ package network
 import (
 	"context"
 	"fmt"
+	"net"
 	"net/http"
 	"net/url"
 
@@ -39,8 +40,23 @@ func (p proxyNetwork) MakeHTTPClient(
 	return p.Network.MakeHTTPClient(dialFunc)
 }
 
+// proxyServerDialer is the dialer used to connect to a SOCKS upstream. It
+// copies timeout and fallback-delay from the base dialer but drops the custom
+// Resolver: the user-supplied DoT/DoH resolver is for bypassing DPI on public
+// names (Telegram DCs, fronting host), whereas SOCKS upstream addresses are
+// usually internal (docker compose, k8s, /etc/hosts) and must be resolved by
+// the system resolver. See https://github.com/9seconds/mtg/issues/439.
+func proxyServerDialer(base mtglib.Network) *net.Dialer {
+	nd := base.NativeDialer()
+
+	return &net.Dialer{
+		Timeout:       nd.Timeout,
+		FallbackDelay: nd.FallbackDelay,
+	}
+}
+
 func NewProxyNetwork(base mtglib.Network, proxyURL *url.URL) (*proxyNetwork, error) {
-	socks, err := proxy.FromURL(proxyURL, base.NativeDialer())
+	socks, err := proxy.FromURL(proxyURL, proxyServerDialer(base))
 	if err != nil {
 		return nil, fmt.Errorf("cannot build proxy dialer: %w", err)
 	}

network/v2/proxy_network_internal_test.go

@@ -0,0 +1,49 @@
+package network
+
+import (
+	"context"
+	"errors"
+	"net"
+	"testing"
+	"time"
+)
+
+// Regression test for https://github.com/9seconds/mtg/issues/439: the dialer
+// used to reach a SOCKS upstream must not inherit the user-supplied DoT/DoH
+// resolver, otherwise internal names (docker compose, k8s, /etc/hosts) fail
+// to resolve through a public resolver that does not know them.
+func TestProxyServerDialerDropsCustomResolver(t *testing.T) {
+	customResolver := &net.Resolver{
+		PreferGo: true,
+		Dial: func(_ context.Context, _, _ string) (net.Conn, error) {
+			return nil, errors.New("custom resolver must not be queried for SOCKS upstream")
+		},
+	}
+
+	base := New(
+		customResolver,
+		"mtg-test",
+		7*time.Second,
+		0,
+		0,
+		DefaultKeepAliveConfig,
+	)
+
+	if base.NativeDialer().Resolver != customResolver {
+		t.Fatalf("base.NativeDialer().Resolver = %v, want custom resolver", base.NativeDialer().Resolver)
+	}
+
+	d := proxyServerDialer(base)
+
+	if d.Resolver != nil {
+		t.Errorf("proxyServerDialer().Resolver = %v, want nil (must use OS resolver)", d.Resolver)
+	}
+
+	if d.Timeout != base.NativeDialer().Timeout {
+		t.Errorf("proxyServerDialer().Timeout = %v, want %v", d.Timeout, base.NativeDialer().Timeout)
+	}
+
+	if d.FallbackDelay != base.NativeDialer().FallbackDelay {
+		t.Errorf("proxyServerDialer().FallbackDelay = %v, want %v", d.FallbackDelay, base.NativeDialer().FallbackDelay)
+	}
+}