MplexHandler: reading from a stream which was closed remotely for wri…

…ting should result in exception
StefanBratanov · May 25, 2023 · 8974317 · 8974317
1 parent d3c4580
commit 8974317
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/libp2p/src/main/kotlin/io/libp2p/etc/util/netty/mux/AbstractMuxHandler.kt b/libp2p/src/main/kotlin/io/libp2p/etc/util/netty/mux/AbstractMuxHandler.kt
@@ -56,12 +56,19 @@ abstract class AbstractMuxHandler<TData>() :
 
     protected fun childRead(id: MuxId, msg: TData) {
         val child = streamMap[id]
-        if (child != null) {
-            pendingReadComplete += id
-            child.pipeline().fireChannelRead(msg)
-        } else {
-            releaseMessage(msg)
-            throw ConnectionClosedException("Channel with id $id not opened")
+        when {
+            child == null -> {
+                releaseMessage(msg)
+                throw ConnectionClosedException("Channel with id $id not opened")
+            }
+            child.remoteDisconnected -> {
+                releaseMessage(msg)
+                throw ConnectionClosedException("Channel with id $id was closed for sending by remote")
+            }
+            else -> {
+                pendingReadComplete += id
+                child.pipeline().fireChannelRead(msg)
+            }
         }
     }
 

diff --git a/libp2p/src/main/kotlin/io/libp2p/etc/util/netty/mux/MuxChannel.kt b/libp2p/src/main/kotlin/io/libp2p/etc/util/netty/mux/MuxChannel.kt
@@ -17,8 +17,8 @@ class MuxChannel<TData>(
     val initiator: Boolean
 ) : AbstractChildChannel(parent.ctx!!.channel(), id) {
 
-    private var remoteDisconnected = false
-    private var localDisconnected = false
+    var remoteDisconnected = false
+    var localDisconnected = false
 
     override fun metadata(): ChannelMetadata = ChannelMetadata(true)
     override fun localAddress0() =