mirror of
https://github.com/ScuroNeko/mtg.git
synced 2026-08-31 12:04:03 +03:00
Use native dialer to communicate with fronting domain
This commit is contained in:
@@ -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 {
|
||||
|
||||
+4
-1
@@ -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)
|
||||
}
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user