webtransport: check for UDP multiaddr component in address matcher (#…

…2491)
libp2p · Aug 16, 2023 · 457f84a · 457f84a
1 parent 4090dcc
commit 457f84a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 11 deletions.
diff --git a/p2p/transport/webtransport/multiaddr.go b/p2p/transport/webtransport/multiaddr.go
@@ -89,17 +89,23 @@ func IsWebtransportMultiaddr(multiaddr ma.Multiaddr) (bool, int) {
 	certhashCount := 0
 
 	ma.ForEach(multiaddr, func(c ma.Component) bool {
-		if c.Protocol().Code == ma.P_QUIC_V1 && state == init {
-			state = foundUDP
-		}
-		if c.Protocol().Code == ma.P_QUIC_V1 && state == foundUDP {
-			state = foundQuicV1
-		}
-		if c.Protocol().Code == ma.P_WEBTRANSPORT && state == foundQuicV1 {
-			state = foundWebTransport
-		}
-		if c.Protocol().Code == ma.P_CERTHASH && state == foundWebTransport {
-			certhashCount++
+		switch c.Protocol().Code {
+		case ma.P_UDP:
+			if state == init {
+				state = foundUDP
+			}
+		case ma.P_QUIC_V1:
+			if state == foundUDP {
+				state = foundQuicV1
+			}
+		case ma.P_WEBTRANSPORT:
+			if state == foundQuicV1 {
+				state = foundWebTransport
+			}
+		case ma.P_CERTHASH:
+			if state == foundWebTransport {
+				certhashCount++
+			}
 		}
 		return true
 	})

diff --git a/p2p/transport/webtransport/multiaddr_test.go b/p2p/transport/webtransport/multiaddr_test.go
@@ -117,6 +117,7 @@ func TestIsWebtransportMultiaddr(t *testing.T) {
 		{addr: "/ip4/1.2.3.4/udp/60042/quic-v1/webtransport/certhash/" + fooHash, want: true, certhashCount: 1},
 		{addr: "/ip4/1.2.3.4/udp/60042/quic-v1/webtransport/certhash/" + fooHash + "/certhash/" + barHash, want: true, certhashCount: 2},
 		{addr: "/dns4/example.com/udp/60042/quic-v1/webtransport/certhash/" + fooHash, want: true, certhashCount: 1},
+		{addr: "/dns4/example.com/tcp/60042/quic-v1/webtransport/certhash/" + fooHash, want: false},
 		{addr: "/dns4/example.com/udp/60042/webrtc/certhash/" + fooHash, want: false},
 	}