Sfoglia il codice sorgente

Use native dialer to communicate with fronting domain

tags/v2.2.0^2^2
9seconds 1 mese fa
parent
commit
62cba24071

+ 5
- 0
internal/testlib/mtglib_network_mock.go Vedi File

@@ -2,6 +2,7 @@ package testlib
2 2
 
3 3
 import (
4 4
 	"context"
5
+	"net"
5 6
 	"net/http"
6 7
 
7 8
 	"github.com/9seconds/mtg/v2/essentials"
@@ -24,6 +25,10 @@ func (m *MtglibNetworkMock) DialContext(ctx context.Context, network, address st
24 25
 	return args.Get(0).(essentials.Conn), args.Error(1) //nolint: wrapcheck, forcetypeassert
25 26
 }
26 27
 
28
+func (m *MtglibNetworkMock) NativeDialer() *net.Dialer {
29
+	return m.Called().Get(0).(*net.Dialer)
30
+}
31
+
27 32
 func (m *MtglibNetworkMock) MakeHTTPClient(dialFunc func(ctx context.Context,
28 33
 	network, address string) (essentials.Conn, error),
29 34
 ) *http.Client {

+ 4
- 1
mtglib/proxy.go Vedi File

@@ -279,13 +279,16 @@ func (p *Proxy) doDomainFronting(ctx *streamContext, conn *connRewind) {
279 279
 	p.eventStream.Send(p.ctx, NewEventDomainFronting(ctx.streamID))
280 280
 	conn.Rewind()
281 281
 
282
-	frontConn, err := p.network.DialContext(ctx, "tcp", p.DomainFrontingAddress())
282
+	nativeDialer := p.network.NativeDialer()
283
+	fConn, err := nativeDialer.DialContext(ctx, "tcp", p.DomainFrontingAddress())
283 284
 	if err != nil {
284 285
 		p.logger.WarningError("cannot dial to the fronting domain", err)
285 286
 
286 287
 		return
287 288
 	}
288 289
 
290
+	frontConn := essentials.WrapNetConn(fConn)
291
+
289 292
 	if p.domainFrontingProxyProtocol {
290 293
 		frontConn = newConnProxyProtocol(ctx.clientConn, frontConn)
291 294
 	}

+ 2
- 1
network/v2/base_network_test.go Vedi File

@@ -4,6 +4,7 @@ import (
4 4
 	"context"
5 5
 	"testing"
6 6
 
7
+	"github.com/9seconds/mtg/v2/mtglib"
7 8
 	"github.com/9seconds/mtg/v2/network/v2"
8 9
 	"github.com/stretchr/testify/assert"
9 10
 	"github.com/stretchr/testify/suite"
@@ -12,7 +13,7 @@ import (
12 13
 type BaseNetworkTestSuite struct {
13 14
 	EchoServerTestSuite
14 15
 
15
-	net network.Network
16
+	net mtglib.Network
16 17
 }
17 18
 
18 19
 func (suite *BaseNetworkTestSuite) SetupSuite() {

+ 3
- 2
network/v2/socks_proxy_test.go Vedi File

@@ -6,6 +6,7 @@ import (
6 6
 	"sync"
7 7
 	"testing"
8 8
 
9
+	"github.com/9seconds/mtg/v2/mtglib"
9 10
 	"github.com/9seconds/mtg/v2/network/v2"
10 11
 	"github.com/stretchr/testify/assert"
11 12
 	"github.com/stretchr/testify/require"
@@ -17,7 +18,7 @@ type SocksProxyTestSuite struct {
17 18
 	EchoServerTestSuite
18 19
 
19 20
 	wg          sync.WaitGroup
20
-	baseNetwork network.Network
21
+	baseNetwork mtglib.Network
21 22
 
22 23
 	noAuthURL *url.URL
23 24
 	authURL   *url.URL
@@ -85,7 +86,7 @@ func (suite *SocksProxyTestSuite) TestRead() {
85 86
 
86 87
 	for name, proxies := range testData {
87 88
 		suite.T().Run(name, func(t *testing.T) {
88
-			proxyNetworks := []network.Network{}
89
+			proxyNetworks := []mtglib.Network{}
89 90
 
90 91
 			for _, u := range proxies {
91 92
 				value, err := network.NewProxyNetwork(suite.baseNetwork, u)

Loading…
Annulla
Salva