webrtc: return error on 0 len writes after close

libp2p · Oct 23, 2023 · b7c04f8 · b7c04f8
1 parent fd471fa
commit b7c04f8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/p2p/transport/webrtc/stream_read.go b/p2p/transport/webrtc/stream_read.go
@@ -10,10 +10,6 @@ import (
 )
 
 func (s *stream) Read(b []byte) (int, error) {
-	if len(b) == 0 {
-		return 0, nil
-	}
-
 	s.mx.Lock()
 	defer s.mx.Unlock()
 
@@ -27,6 +23,9 @@ func (s *stream) Read(b []byte) (int, error) {
 		return 0, network.ErrReset
 	}
 
+	if len(b) == 0 {
+		return 0, nil
+	}
 	var read int
 	for {
 		if s.nextMessage == nil {

diff --git a/p2p/transport/webrtc/stream_test.go b/p2p/transport/webrtc/stream_test.go
@@ -25,6 +25,7 @@ type detachedChan struct {
 func getDetachedDataChannels(t *testing.T) (detachedChan, detachedChan) {
 	s := webrtc.SettingEngine{}
 	s.DetachDataChannels()
+	s.SetIncludeLoopbackCandidate(true)
 	api := webrtc.NewAPI(webrtc.WithSettingEngine(s))
 
 	offerPC, err := api.NewPeerConnection(webrtc.Configuration{})
@@ -305,3 +306,29 @@ func TestStreamWriteDeadlineAsync(t *testing.T) {
 	require.GreaterOrEqual(t, took, timeout)
 	require.LessOrEqual(t, took, timeout*3/2)
 }
+
+func TestStreamReadAfterClose(t *testing.T) {
+	client, server := getDetachedDataChannels(t)
+
+	clientStr := newStream(client.dc, client.rwc, func() {})
+	serverStr := newStream(server.dc, server.rwc, func() {})
+
+	serverStr.Close()
+	b := make([]byte, 1)
+	_, err := clientStr.Read(b)
+	require.Equal(t, io.EOF, err)
+	_, err = clientStr.Read(nil)
+	require.Equal(t, io.EOF, err)
+
+	client, server = getDetachedDataChannels(t)
+
+	clientStr = newStream(client.dc, client.rwc, func() {})
+	serverStr = newStream(server.dc, server.rwc, func() {})
+
+	serverStr.Reset()
+	b = make([]byte, 1)
+	_, err = clientStr.Read(b)
+	require.ErrorIs(t, err, network.ErrReset)
+	_, err = clientStr.Read(nil)
+	require.ErrorIs(t, err, network.ErrReset)
+}