From 62cba24071b2cab359902ba07eee6d435c54e81e Mon Sep 17 00:00:00 2001 From: 9seconds Date: Thu, 12 Mar 2026 20:51:02 +0100 Subject: [PATCH] Use native dialer to communicate with fronting domain --- internal/testlib/mtglib_network_mock.go | 5 +++++ mtglib/proxy.go | 5 ++++- network/v2/base_network_test.go | 3 ++- network/v2/socks_proxy_test.go | 5 +++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/internal/testlib/mtglib_network_mock.go b/internal/testlib/mtglib_network_mock.go index 21ae79c..9dce30d 100644 --- a/internal/testlib/mtglib_network_mock.go +++ b/internal/testlib/mtglib_network_mock.go @@ -2,6 +2,7 @@ package testlib import ( "context" + "net" "net/http" "github.com/9seconds/mtg/v2/essentials" @@ -24,6 +25,10 @@ func (m *MtglibNetworkMock) DialContext(ctx context.Context, network, address st return args.Get(0).(essentials.Conn), args.Error(1) //nolint: wrapcheck, forcetypeassert } +func (m *MtglibNetworkMock) NativeDialer() *net.Dialer { + return m.Called().Get(0).(*net.Dialer) +} + func (m *MtglibNetworkMock) MakeHTTPClient(dialFunc func(ctx context.Context, network, address string) (essentials.Conn, error), ) *http.Client { diff --git a/mtglib/proxy.go b/mtglib/proxy.go index 995f877..aac79de 100644 --- a/mtglib/proxy.go +++ b/mtglib/proxy.go @@ -279,13 +279,16 @@ func (p *Proxy) doDomainFronting(ctx *streamContext, conn *connRewind) { p.eventStream.Send(p.ctx, NewEventDomainFronting(ctx.streamID)) conn.Rewind() - frontConn, err := p.network.DialContext(ctx, "tcp", p.DomainFrontingAddress()) + nativeDialer := p.network.NativeDialer() + fConn, err := nativeDialer.DialContext(ctx, "tcp", p.DomainFrontingAddress()) if err != nil { p.logger.WarningError("cannot dial to the fronting domain", err) return } + frontConn := essentials.WrapNetConn(fConn) + if p.domainFrontingProxyProtocol { frontConn = newConnProxyProtocol(ctx.clientConn, frontConn) } diff --git a/network/v2/base_network_test.go b/network/v2/base_network_test.go index f9729e4..f2d7a10 100644 --- a/network/v2/base_network_test.go +++ b/network/v2/base_network_test.go @@ -4,6 +4,7 @@ import ( "context" "testing" + "github.com/9seconds/mtg/v2/mtglib" "github.com/9seconds/mtg/v2/network/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" @@ -12,7 +13,7 @@ import ( type BaseNetworkTestSuite struct { EchoServerTestSuite - net network.Network + net mtglib.Network } func (suite *BaseNetworkTestSuite) SetupSuite() { diff --git a/network/v2/socks_proxy_test.go b/network/v2/socks_proxy_test.go index cc02dda..d6d41ae 100644 --- a/network/v2/socks_proxy_test.go +++ b/network/v2/socks_proxy_test.go @@ -6,6 +6,7 @@ import ( "sync" "testing" + "github.com/9seconds/mtg/v2/mtglib" "github.com/9seconds/mtg/v2/network/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -17,7 +18,7 @@ type SocksProxyTestSuite struct { EchoServerTestSuite wg sync.WaitGroup - baseNetwork network.Network + baseNetwork mtglib.Network noAuthURL *url.URL authURL *url.URL @@ -85,7 +86,7 @@ func (suite *SocksProxyTestSuite) TestRead() { for name, proxies := range testData { suite.T().Run(name, func(t *testing.T) { - proxyNetworks := []network.Network{} + proxyNetworks := []mtglib.Network{} for _, u := range proxies { value, err := network.NewProxyNetwork(suite.baseNetwork, u)