Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: address race condition in socks5 test #278

Merged
merged 3 commits into from
Sep 11, 2024
Merged

fix: address race condition in socks5 test #278

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0cbce1
fix: address race condition in socks5 test
amircybersec Sep 6, 2024
e46f96a
Fix concurrency issue: add sync.waitGroup
amircybersec Sep 10, 2024
284d2f6
defer wait and close + code cleanup
amircybersec Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions transport/socks5/stream_dialer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,17 +167,23 @@ func testExchange(tb testing.TB, listener *net.TCPListener, destAddr string, req
}

func TestConnectWithoutAuth(t *testing.T) {

// Create a SOCKS5 server.
server := socks5.NewServer()

var running sync.WaitGroup
// Create SOCKS5 proxy on localhost with a random port.
listener, err := net.Listen("tcp", "127.0.0.1:0")
require.NoError(t, err)
defer listener.Close()
defer func() {
listener.Close()
running.Wait()
}()

running.Add(1)
go func() {
defer running.Done()
err := server.Serve(listener)
t.Log("server is listening...")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the race condition? This doesn't seem like it makes any difference.

if !errors.Is(err, net.ErrClosed) && err != nil {
require.NoError(t, err) // Assert no error if it's not the expected close error
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This goroutine must signal when it's done, so that the parent can wait for it. You can use sync.WaitGroup or a channel. Same for TestConnectWithAuth.

Expand Down Expand Up @@ -205,14 +211,20 @@ func TestConnectWithAuth(t *testing.T) {
socks5.WithAuthMethods([]socks5.Authenticator{cator}),
)

var running sync.WaitGroup
// Create SOCKS5 proxy on localhost with a random port.
listener, err := net.Listen("tcp", "127.0.0.1:0")
require.NoError(t, err)
defer listener.Close()
address := listener.Addr().String()
defer func() {
listener.Close()
running.Wait()
}()

running.Add(1)
// Create SOCKS5 proxy on localhost port 8001
go func() {
defer running.Done()
err := server.Serve(listener)
if !errors.Is(err, net.ErrClosed) && err != nil {
require.NoError(t, err) // Assert no error if it's not the expected close error
Expand Down
Loading