Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

Add logs to wsnet listener#388

Merged
deansheather merged 4 commits intomasterfromdean/ch15087
Jul 20, 2021
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
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
PrevPrevious commit
Fix tests
  • Loading branch information
@deansheather
deansheather committedJul 20, 2021
commiteb2200c456c00d7884ffd8025a451f8ae6d6b31a
1 change: 1 addition & 0 deletionsgo.mod
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@ require (
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4
github.com/rjeczalik/notify v0.9.2
github.com/spf13/cobra v1.2.1
github.com/stretchr/testify v1.7.0
golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015
Expand Down
220 changes: 81 additions & 139 deletionswsnet/dial_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
package wsnet

import (
"bytes"
"context"
"crypto/rand"
"errors"
Expand All@@ -15,6 +14,8 @@ import (
"cdr.dev/slog/sloggers/slogtest"
"github.com/pion/ice/v2"
"github.com/pion/webrtc/v3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func ExampleDial_basic() {
Expand DownExpand Up@@ -50,37 +51,30 @@ func ExampleDial_basic() {
// You now have access to the proxied remote port in `conn`.
}

// nolint:gocognit,gocyclo
func TestDial(t *testing.T) {
t.Run("Ping", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

err = dialer.Ping(context.Background())
if err != nil {
t.Error(err)
}
require.NoError(t, err)
})

t.Run("Ping Close", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

turnAddr, closeTurn := createTURNServer(t, ice.SchemeTypeTURN)
dialer, err := DialWebsocket(context.Background(), connectAddr, &DialOptions{
ICEServers: []webrtc.ICEServer{{
Expand All@@ -90,167 +84,124 @@ func TestDial(t *testing.T) {
CredentialType: webrtc.ICECredentialTypePassword,
}},
})
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

_ = dialer.Ping(context.Background())
closeTurn()
err = dialer.Ping(context.Background())
if err != io.EOF {
t.Error(err)
return
}
assert.ErrorIs(t, err, io.EOF)
})

t.Run("OPError", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

_, err = dialer.DialContext(context.Background(), "tcp", "localhost:100")
if err == nil {
t.Error("should have gotten err")
return
}
_, ok := err.(*net.OpError)
if !ok {
t.Error("invalid error type returned")
return
}
assert.Error(t, err)

// Double pointer intended.
netErr := &net.OpError{}
assert.ErrorAs(t, err, &netErr)
})

t.Run("Proxy", func(t *testing.T) {
t.Parallel()

listener, err := net.Listen("tcp", "0.0.0.0:0")
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

msg := []byte("Hello!")
go func() {
conn, err := listener.Accept()
if err != nil {
t.Error(err)
}
require.NoError(t, err)

_, _ = conn.Write(msg)
}()

connectAddr, listenAddr := createDumbBroker(t)
_, err = Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

conn, err := dialer.DialContext(context.Background(), listener.Addr().Network(), listener.Addr().String())
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

rec := make([]byte, len(msg))
_, err = conn.Read(rec)
if err != nil {
t.Error(err)
return
}
if !bytes.Equal(msg, rec) {
t.Error("bytes were different", string(msg), string(rec))
}
require.NoError(t, err)

assert.Equal(t, msg, rec)
})

// Expect that we'd get an EOF on the server closing.
t.Run("EOF on Close", func(t *testing.T) {
t.Parallel()

listener, err := net.Listen("tcp", "0.0.0.0:0")
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)
go func() {
_, _ = listener.Accept()
}()

connectAddr, listenAddr := createDumbBroker(t)
srv, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
t.Error(err)
}
require.NoError(t, err)

conn, err := dialer.DialContext(context.Background(), listener.Addr().Network(), listener.Addr().String())
if err != nil {
t.Error(err)
return
}
go srv.Close()
require.NoError(t, err)

go l.Close()
rec := make([]byte, 16)
_, err = conn.Read(rec)
if !errors.Is(err, io.EOF) {
t.Error(err)
return
}
assert.ErrorIs(t, err, io.EOF)
})

t.Run("Disconnect", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

err = dialer.Close()
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

err = dialer.Ping(context.Background())
if err != webrtc.ErrConnectionClosed {
t.Error(err)
}
assert.ErrorIs(t, err, webrtc.ErrConnectionClosed)
})

t.Run("Disconnect DialContext", func(t *testing.T) {
t.Parallel()

tcpListener, err := net.Listen("tcp", "0.0.0.0:0")
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)
go func() {
_, _ = tcpListener.Accept()
}()

connectAddr, listenAddr := createDumbBroker(t)
_, err = Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

turnAddr, closeTurn := createTURNServer(t, ice.SchemeTypeTURN)
dialer, err := DialWebsocket(context.Background(), connectAddr, &DialOptions{
ICEServers: []webrtc.ICEServer{{
Expand All@@ -260,42 +211,32 @@ func TestDial(t *testing.T) {
CredentialType: webrtc.ICECredentialTypePassword,
}},
})
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

conn, err := dialer.DialContext(context.Background(), "tcp", tcpListener.Addr().String())
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)

// Close the TURN server before reading...
// WebRTC connections take a few seconds to timeout.
closeTurn()
_, err = conn.Read(make([]byte, 16))
if err != io.EOF {
t.Error(err)
return
}
assert.ErrorIs(t, err, io.EOF)
})

t.Run("Closed", func(t *testing.T) {
t.Parallel()

connectAddr, listenAddr := createDumbBroker(t)
_, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
if err != nil {
t.Error(err)
return
}
l, err := Listen(context.Background(), slogtest.Make(t, nil), listenAddr, "")
require.NoError(t, err)
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
t.Error(err)
return
}
require.NoError(t, err)
go func() {
_ = dialer.Close()
}()

select {
case <-dialer.Closed():
case <-time.NewTimer(time.Second).C:
Expand DownExpand Up@@ -334,11 +275,12 @@ func BenchmarkThroughput(b *testing.B) {
}
}()
connectAddr, listenAddr := createDumbBroker(b)
_, err = Listen(context.Background(), slogtest.Make(b, nil), listenAddr, "")
l, err:= Listen(context.Background(), slogtest.Make(b, nil), listenAddr, "")
if err != nil {
b.Error(err)
return
}
defer l.Close()

dialer, err := DialWebsocket(context.Background(), connectAddr, nil)
if err != nil {
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp