ScuroNeko/mtg
1
0
Fork 0
mirror of https://github.com/ScuroNeko/mtg.git synced 2026-08-31 15:14:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use native dialer to communicate with fronting domain

Browse Source
This commit is contained in:
9seconds
2026-03-12 20:51:02 +01:00
parent 94e4179fb7
commit 62cba24071
4 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/testlib/mtglib_network_mock.go
+5
View File
@@ -2,6 +2,7 @@ package testlib
import ( import (
"context" "context"
"net"
"net/http" "net/http"
"github.com/9seconds/mtg/v2/essentials" "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 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, func (m *MtglibNetworkMock) MakeHTTPClient(dialFunc func(ctx context.Context,
network, address string) (essentials.Conn, error), network, address string) (essentials.Conn, error),
) *http.Client { ) *http.Client {
mtglib/proxy.go
+4 -1
View File
@@ -279,13 +279,16 @@ func (p *Proxy) doDomainFronting(ctx *streamContext, conn *connRewind) {
p.eventStream.Send(p.ctx, NewEventDomainFronting(ctx.streamID)) p.eventStream.Send(p.ctx, NewEventDomainFronting(ctx.streamID))
conn.Rewind() 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 { if err != nil {
p.logger.WarningError("cannot dial to the fronting domain", err) p.logger.WarningError("cannot dial to the fronting domain", err)
return return
} }
frontConn := essentials.WrapNetConn(fConn)
if p.domainFrontingProxyProtocol { if p.domainFrontingProxyProtocol {
frontConn = newConnProxyProtocol(ctx.clientConn, frontConn) frontConn = newConnProxyProtocol(ctx.clientConn, frontConn)
} }
network/v2/base_network_test.go
+2 -1
View File
@@ -4,6 +4,7 @@ import (
"context" "context"
"testing" "testing"
"github.com/9seconds/mtg/v2/mtglib"
"github.com/9seconds/mtg/v2/network/v2" "github.com/9seconds/mtg/v2/network/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite" "github.com/stretchr/testify/suite"
@@ -12,7 +13,7 @@ import (
type BaseNetworkTestSuite struct { type BaseNetworkTestSuite struct {
EchoServerTestSuite EchoServerTestSuite
net network.Network net mtglib.Network
} }
func (suite *BaseNetworkTestSuite) SetupSuite() { func (suite *BaseNetworkTestSuite) SetupSuite() {
network/v2/socks_proxy_test.go
+3 -2
View File
@@ -6,6 +6,7 @@ import (
"sync" "sync"
"testing" "testing"
"github.com/9seconds/mtg/v2/mtglib"
"github.com/9seconds/mtg/v2/network/v2" "github.com/9seconds/mtg/v2/network/v2"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@@ -17,7 +18,7 @@ type SocksProxyTestSuite struct {
EchoServerTestSuite EchoServerTestSuite
wg sync.WaitGroup wg sync.WaitGroup
baseNetwork network.Network baseNetwork mtglib.Network
noAuthURL *url.URL noAuthURL *url.URL
authURL *url.URL authURL *url.URL
@@ -85,7 +86,7 @@ func (suite *SocksProxyTestSuite) TestRead() {
for name, proxies := range testData { for name, proxies := range testData {
suite.T().Run(name, func(t *testing.T) { suite.T().Run(name, func(t *testing.T) {
proxyNetworks := []network.Network{} proxyNetworks := []mtglib.Network{}
for _, u := range proxies { for _, u := range proxies {
value, err := network.NewProxyNetwork(suite.baseNetwork, u) value, err := network.NewProxyNetwork(suite.baseNetwork, u)