return an ErrNotSupported when lazy negotiation fails (#84)

multiformats · Apr 21, 2022 · cbe57f2 · cbe57f2
1 parent 90f2bb1
commit cbe57f2
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/lazyClient.go b/lazyClient.go
@@ -77,6 +77,10 @@ func (l *lazyClientConn) doReadHandshake() {
 			return
 		}
 
+		if tok == "na" {
+			l.rerr = ErrNotSupported
+			return
+		}
 		if tok != proto {
 			l.rerr = fmt.Errorf("protocol mismatch in lazy handshake ( %s != %s )", tok, proto)
 			return

diff --git a/multistream_test.go b/multistream_test.go
@@ -149,6 +149,26 @@ func TestProtocolNegotiationLazy(t *testing.T) {
 	verifyPipe(t, ac, b)
 }
 
+func TestProtocolNegotiationUnsupported(t *testing.T) {
+	a, b := newPipe(t)
+	mux := NewMultistreamMuxer()
+
+	done := make(chan struct{})
+	go func() {
+		defer close(done)
+		mux.Negotiate(a)
+	}()
+
+	c := NewMSSelect(b, "/foo")
+	c.Write([]byte("foo protocol data"))
+	_, err := c.Read([]byte{0})
+	if err != ErrNotSupported {
+		t.Fatalf("expected protocol /foo to be unsupported, got: %v", err)
+	}
+	c.Close()
+	<-done
+}
+
 func TestNegLazyStressRead(t *testing.T) {
 	const count = 75