Skip to content

Commit 69607f6

Browse files
fortunafortuna
committed
Fix tests
1 parent 8d7272e commit 69607f6

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

‎internal/integration_test/integration_test.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ func TestTCPEcho(t *testing.T) {
130130
}
131131
replayCache := service.NewReplayCache(5)
132132
const testTimeout = 200 * time.Millisecond
133-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, cipherList, &replayCache, &service.NoOpTCPMetrics{}, testTimeout)
133+
testMetrics := &service.NoOpTCPMetrics{}
134+
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
135+
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
134136
handler.SetTargetDialer(&transport.TCPDialer{})
135137
done := make(chan struct{})
136138
go func() {
@@ -198,7 +200,8 @@ func TestRestrictedAddresses(t *testing.T) {
198200
require.NoError(t, err)
199201
const testTimeout = 200 * time.Millisecond
200202
testMetrics := &statusMetrics{}
201-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, testTimeout)
203+
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
204+
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
202205
done := make(chan struct{})
203206
go func() {
204207
service.StreamServe(service.WrapStreamListener(proxyListener.AcceptTCP), handler.Handle)
@@ -378,7 +381,9 @@ func BenchmarkTCPThroughput(b *testing.B) {
378381
b.Fatal(err)
379382
}
380383
const testTimeout = 200 * time.Millisecond
381-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, cipherList, nil, &service.NoOpTCPMetrics{}, testTimeout)
384+
testMetrics := &service.NoOpTCPMetrics{}
385+
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
386+
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
382387
handler.SetTargetDialer(&transport.TCPDialer{})
383388
done := make(chan struct{})
384389
go func() {
@@ -440,7 +445,9 @@ func BenchmarkTCPMultiplexing(b *testing.B) {
440445
}
441446
replayCache := service.NewReplayCache(service.MaxCapacity)
442447
const testTimeout = 200 * time.Millisecond
443-
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, cipherList, &replayCache, &service.NoOpTCPMetrics{}, testTimeout)
448+
testMetrics := &service.NoOpTCPMetrics{}
449+
authFunc := service.NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
450+
handler := service.NewTCPHandler(proxyListener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
444451
handler.SetTargetDialer(&transport.TCPDialer{})
445452
done := make(chan struct{})
446453
go func() {

‎service/tcp_test.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,8 @@ func TestProbeRandom(t *testing.T) {
275275
cipherList, err := MakeTestCiphers(makeTestSecrets(1))
276276
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
277277
testMetrics := &probeTestMetrics{}
278-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, 200*time.Millisecond)
278+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
279+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
279280
done := make(chan struct{})
280281
go func() {
281282
StreamServe(WrapStreamListener(listener.AcceptTCP), handler.Handle)
@@ -351,7 +352,8 @@ func TestProbeClientBytesBasicTruncated(t *testing.T) {
351352
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
352353
cipher := firstCipher(cipherList)
353354
testMetrics := &probeTestMetrics{}
354-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, 200*time.Millisecond)
355+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
356+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
355357
handler.SetTargetDialer(makeValidatingTCPStreamDialer(allowAll))
356358
done := make(chan struct{})
357359
go func() {
@@ -386,7 +388,8 @@ func TestProbeClientBytesBasicModified(t *testing.T) {
386388
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
387389
cipher := firstCipher(cipherList)
388390
testMetrics := &probeTestMetrics{}
389-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, 200*time.Millisecond)
391+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
392+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
390393
handler.SetTargetDialer(makeValidatingTCPStreamDialer(allowAll))
391394
done := make(chan struct{})
392395
go func() {
@@ -422,7 +425,8 @@ func TestProbeClientBytesCoalescedModified(t *testing.T) {
422425
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
423426
cipher := firstCipher(cipherList)
424427
testMetrics := &probeTestMetrics{}
425-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, 200*time.Millisecond)
428+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
429+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
426430
handler.SetTargetDialer(makeValidatingTCPStreamDialer(allowAll))
427431
done := make(chan struct{})
428432
go func() {
@@ -465,7 +469,8 @@ func TestProbeServerBytesModified(t *testing.T) {
465469
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
466470
cipher := firstCipher(cipherList)
467471
testMetrics := &probeTestMetrics{}
468-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, 200*time.Millisecond)
472+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
473+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, 200*time.Millisecond)
469474
done := make(chan struct{})
470475
go func() {
471476
StreamServe(WrapStreamListener(listener.AcceptTCP), handler.Handle)
@@ -495,7 +500,8 @@ func TestReplayDefense(t *testing.T) {
495500
replayCache := NewReplayCache(5)
496501
testMetrics := &probeTestMetrics{}
497502
const testTimeout = 200 * time.Millisecond
498-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, &replayCache, testMetrics, testTimeout)
503+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
504+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
499505
snapshot := cipherList.SnapshotForClientIP(nil)
500506
cipherEntry := snapshot[0].Value.(*CipherEntry)
501507
cipher := cipherEntry.CryptoKey
@@ -573,7 +579,8 @@ func TestReverseReplayDefense(t *testing.T) {
573579
replayCache := NewReplayCache(5)
574580
testMetrics := &probeTestMetrics{}
575581
const testTimeout = 200 * time.Millisecond
576-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, &replayCache, testMetrics, testTimeout)
582+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, &replayCache, testMetrics)
583+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
577584
snapshot := cipherList.SnapshotForClientIP(nil)
578585
cipherEntry := snapshot[0].Value.(*CipherEntry)
579586
cipher := cipherEntry.CryptoKey
@@ -643,7 +650,8 @@ func probeExpectTimeout(t *testing.T, payloadSize int) {
643650
cipherList, err := MakeTestCiphers(makeTestSecrets(5))
644651
require.NoError(t, err, "MakeTestCiphers failed: %v", err)
645652
testMetrics := &probeTestMetrics{}
646-
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, cipherList, nil, testMetrics, testTimeout)
653+
authFunc := NewShadowsocksStreamAuthenticator(cipherList, nil, testMetrics)
654+
handler := NewTCPHandler(listener.Addr().(*net.TCPAddr).Port, authFunc, testMetrics, testTimeout)
647655

648656
done := make(chan struct{})
649657
go func() {

0 commit comments

Comments
 (0)