autonatv2: fix normalization for websocket addrs

1. Convert /wss to /tls/ws
2. Ignore the sni for comparison because there's no sni
information on `conn.LocalAddr()`

Author: sukunrt

p2p/protocol/autonatv2/autonat_test.go

@@ -636,6 +636,24 @@ func TestAreAddrsConsistency(t *testing.T) {
 			dialAddr:  ma.StringCast("/ip4/1.2.3.4/udp/123/quic-v1/"),
 			success:   false,
 		},
+		{
+			name:      "wss",
+			dialAddr:  ma.StringCast("/dns/lib.p2p/tcp/1/wss"),
+			localAddr: ma.StringCast("/ip4/1.2.3.4/tcp/1/tls/ws"),
+			success:   true,
+		},
+		{
+			name:      "tls-sni",
+			localAddr: ma.StringCast("/ip4/1.2.3.4/tcp/1/wss"),
+			dialAddr:  ma.StringCast("/ip4/1.2.3.4/tcp/1/tls/sni/abc.xyz/ws"),
+			success:   true,
+		},
+		{
+			name:      "only p2p",
+			localAddr: ma.StringCast("/p2p/QmYo41GybvrXk8y8Xnm1P7pfA4YEXCpfnLyzgRPnNbG35e"),
+			dialAddr:  ma.StringCast("/p2p/QmYo41GybvrXk8y8Xnm1P7pfA4YEXCpfnLyzgRPnNbG35e"),
+			success:   true,
+		},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {

p2p/protocol/autonatv2/client.go

@@ -325,11 +325,40 @@ func (ac *client) handleDialBack(s network.Stream) {
 	}
 }
 
+var tlsWSAddr = ma.StringCast("/tls/ws")
+
 // normalizeMultiaddr returns a multiaddr suitable for equality checks.
-// it removes trailing certhashes.
+// it removes trailing certhashes and p2p components, removes sni components,
+// and translates /wss to /tls/ws.
+// Remove sni components because there's no way for us to verify whether the
+// correct sni was dialled by the remote host as the LocalAddr on the websocket conn
+// doesn't have sni information.
+// Note: This is used for comparing two addresses where both the addresses are
+// controlled by the host not by a remote node.
 func normalizeMultiaddr(addr ma.Multiaddr) ma.Multiaddr {
 	addr = removeTrailing(addr, ma.P_P2P)
 	addr = removeTrailing(addr, ma.P_CERTHASH)
+
+	for i, c := range addr {
+		if c.Code() == ma.P_WSS {
+			na := make(ma.Multiaddr, 0, len(addr)+1)
+			na = append(na, addr[:i]...)
+			na = append(na, tlsWSAddr...)
+			na = append(na, addr[i+1:]...)
+			addr = na
+			break // only do this once; there shouldn't be two /wss components anyway
+		}
+	}
+
+	for i, c := range addr {
+		if c.Code() == ma.P_SNI {
+			na := make(ma.Multiaddr, 0, len(addr)-1)
+			na = append(na, addr[:i]...)
+			na = append(na, addr[i+1:]...)
+			addr = na
+			break // only do this once; there shouldn't be two /sni components anyway
+		}
+	}
 	return addr
 }