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

Jump to bottom

Increase test coverage #32

Merged
merged 9 commits into from
Nov 21, 2023
Merged

Increase test coverage #32

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c4eda3e
increase coverage
mikenye Nov 21, 2023
d0b7cfe
undo
mikenye Nov 21, 2023
9e2535c
work on TestProxyClientToServer
mikenye Nov 21, 2023
a1c6fcf
commenting
mikenye Nov 21, 2023
9d407da
attempt to fix race cond
mikenye Nov 21, 2023
1c7d7fc
fix typo
mikenye Nov 21, 2023
7aeed2a
work on TestProxyServerToClient
mikenye Nov 21, 2023
9752e60
a comment
mikenye Nov 21, 2023
a104bec
fix timeout
mikenye Nov 21, 2023
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
132 changes: 79 additions & 53 deletions pw-bordercontrol/cmd/bordercontrol/feeder_conn_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,43 +506,54 @@ func TestProxyClientToServer(t *testing.T) {
zerolog.SetGlobalLevel(zerolog.TraceLevel)

var (
serverConn net.Conn
serverListener net.Listener
err error
wgServerListener sync.WaitGroup
wgServerConn sync.WaitGroup
ssServerConn net.Conn
ssClientConn *net.TCPConn
serverListener net.Listener
err error
wgServerSideConns sync.WaitGroup
wgServerListener sync.WaitGroup
wgServerConn sync.WaitGroup
)

t.Log("preparing test client/server connections")
t.Log("preparing test server-side connections")

// spin up server that will accept one connection (serverConn)
// spin up server-side server that will accept one connection
wgServerListener.Add(1)
wgServerConn.Add(1)
wgServerSideConns.Add(1)
go func() {
var e error
serverListener, e = nettest.NewLocalListener("tcp4")
assert.NoError(t, e)
wgServerListener.Done()
serverConn, e = serverListener.Accept()
ssServerConn, e = serverListener.Accept()
assert.NoError(t, e)
wgServerConn.Done()
wgServerSideConns.Done()
}()
wgServerListener.Wait()

// spin up client connection
// serverAddr := strings.Split(serverListener.Addr().String(), ":")[0]
serverPort, err := strconv.Atoi(strings.Split(serverListener.Addr().String(), ":")[1])
assert.NoError(t, err)

connectTo := net.TCPAddr{
IP: net.IPv4(127, 0, 0, 1),
Port: serverPort,
Zone: "",
}
clientConn, err := net.DialTCP("tcp4", nil, &connectTo)
assert.NoError(t, err)
// spin up server-side client connection
wgServerSideConns.Add(1)
go func() {
serverPort, err := strconv.Atoi(strings.Split(serverListener.Addr().String(), ":")[1])
assert.NoError(t, err)

connectTo := net.TCPAddr{
IP: net.IPv4(127, 0, 0, 1),
Port: serverPort,
Zone: "",
}
ssClientConn, err = net.DialTCP("tcp4", nil, &connectTo)
assert.NoError(t, err)
wgServerSideConns.Done()
}()
wgServerConn.Wait()
wgServerSideConns.Wait()

// spin up client-side server & client connections
t.Log("preparing test client-side connections")
csClientConn, csServerConn := net.Pipe()

// method to signal goroutines to exit
pStatus := proxyStatus{
Expand All @@ -552,23 +563,25 @@ func TestProxyClientToServer(t *testing.T) {
// test proxyClientToServer
lastAuthCheck := time.Now()
go proxyClientToServer(
serverConn,
clientConn,
csClientConn,
ssClientConn,
uint(1),
testSNI,
&pStatus,
&lastAuthCheck,
log.Logger,
)

// send data to be proxied
_, err = serverConn.Write([]byte("Hello World!"))
// send data to be proxied from client-side
_, err = csServerConn.Write([]byte("Hello World!"))
assert.NoError(t, err)

// read data from the other end of the proxy
// read proxied data from the server-side
buf := make([]byte, 12)
_, err = clientConn.Read(buf)
_, err = ssServerConn.Read(buf)
assert.NoError(t, err)

// data should match!
assert.Equal(t, []byte("Hello World!"), buf)

pStatus.mu.Lock()
Expand All @@ -583,69 +596,82 @@ func TestProxyServerToClient(t *testing.T) {
zerolog.SetGlobalLevel(zerolog.TraceLevel)

var (
serverConn net.Conn
serverListener net.Listener
err error
wgServerListener sync.WaitGroup
wgServerConn sync.WaitGroup
ssServerConn net.Conn
ssClientConn *net.TCPConn
serverListener net.Listener
err error
wgServerSideConns sync.WaitGroup
wgServerListener sync.WaitGroup
wgServerConn sync.WaitGroup
)

t.Log("preparing test client/server connections")
t.Log("preparing test server-side connections")

// spin up server that will accept one connection (serverConn)
// spin up server-side server that will accept one connection
wgServerListener.Add(1)
wgServerConn.Add(1)
wgServerSideConns.Add(1)
go func() {
var e error
serverListener, e = nettest.NewLocalListener("tcp4")
assert.NoError(t, e)
wgServerListener.Done()
serverConn, e = serverListener.Accept()
ssServerConn, e = serverListener.Accept()
assert.NoError(t, e)
wgServerConn.Done()
wgServerSideConns.Done()
}()
wgServerListener.Wait()

// spin up client connection
// serverAddr := strings.Split(serverListener.Addr().String(), ":")[0]
serverPort, err := strconv.Atoi(strings.Split(serverListener.Addr().String(), ":")[1])
assert.NoError(t, err)

connectTo := net.TCPAddr{
IP: net.IPv4(127, 0, 0, 1),
Port: serverPort,
Zone: "",
}
clientConn, err := net.DialTCP("tcp4", nil, &connectTo)
assert.NoError(t, err)
// spin up server-side client connection
wgServerSideConns.Add(1)
go func() {
serverPort, err := strconv.Atoi(strings.Split(serverListener.Addr().String(), ":")[1])
assert.NoError(t, err)

connectTo := net.TCPAddr{
IP: net.IPv4(127, 0, 0, 1),
Port: serverPort,
Zone: "",
}
ssClientConn, err = net.DialTCP("tcp4", nil, &connectTo)
assert.NoError(t, err)
wgServerSideConns.Done()
}()
wgServerConn.Wait()
wgServerSideConns.Wait()

// spin up client-side server & client connections
t.Log("preparing test client-side connections")
csClientConn, csServerConn := net.Pipe()

// method to signal goroutines to exit
pStatus := proxyStatus{
run: true,
}

// test proxyClientToServer
// test proxyServerToClient
lastAuthCheck := time.Now()
go proxyServerToClient(
serverConn,
clientConn,
csClientConn,
ssClientConn,
uint(1),
testSNI,
&pStatus,
&lastAuthCheck,
log.Logger,
)

// send data to be proxied
_, err = serverConn.Write([]byte("Hello World!"))
// send data to be proxied from client-side
_, err = ssServerConn.Write([]byte("Hello World!"))
assert.NoError(t, err)

// read data from the other end of the proxy
// read proxied data from the server-side
buf := make([]byte, 12)
_, err = clientConn.Read(buf)
_, err = csServerConn.Read(buf)
assert.NoError(t, err)

// data should match!
assert.Equal(t, []byte("Hello World!"), buf)

pStatus.mu.Lock()
Expand Down