fix(libp2p): filter out dnsaddrs for different peers

packages/libp2p/src/connection-manager/dial-queue.ts

@@ -309,8 +309,22 @@ export class DialQueue {
     ))
       .flat()
 
-    // filter out any multiaddrs that we do not have transports for
-    const filteredAddrs = resolvedAddresses.filter(addr => Boolean(this.transportManager.transportForMultiaddr(addr.multiaddr)))
+    const filteredAddrs = resolvedAddresses.filter(addr => {
+      // filter out any multiaddrs that we do not have transports for
+      if (this.transportManager.transportForMultiaddr(addr.multiaddr) == null) {
+        return false
+      }
+
+      // if the resolved multiaddr has a PeerID but it's the wrong one, ignore it
+      // - this can happen with addresses like bootstrap.libp2p.io that resolve
+      // to multiple different peers
+      const addrPeerId = addr.multiaddr.getPeerId()
+      if (peerId != null && addrPeerId != null) {
+        return peerId.equals(addrPeerId)
+      }
+
+      return true
+    })
 
     // deduplicate addresses
     const dedupedAddrs = new Map<string, Address>()

packages/libp2p/test/connection-manager/dial-queue.spec.ts

@@ -2,7 +2,7 @@
 
 import { mockConnection, mockDuplex, mockMultiaddrConnection } from '@libp2p/interface-compliance-tests/mocks'
 import { createEd25519PeerId } from '@libp2p/peer-id-factory'
-import { multiaddr } from '@multiformats/multiaddr'
+import { multiaddr, resolvers } from '@multiformats/multiaddr'
 import { expect } from 'aegir/chai'
 import delay from 'delay'
 import pDefer from 'p-defer'
@@ -280,4 +280,52 @@ describe('dial queue', () => {
     // Dial attempt finished without connection
     expect(signals['/ip4/127.0.0.1/tcp/1233']).to.have.property('aborted', true)
   })
+
+  it('should ignore DNS addresses for other peers', async () => {
+    const remotePeer = await createEd25519PeerId()
+    const otherRemotePeer = await createEd25519PeerId()
+    const ma = multiaddr(`/dnsaddr/example.com/p2p/${remotePeer}`)
+    const maStr = `/ip4/123.123.123.123/tcp/2348/p2p/${remotePeer}`
+    const resolvedAddresses = [
+      `/ip4/234.234.234.234/tcp/4213/p2p/${otherRemotePeer}`,
+      maStr
+    ]
+
+    let resolvedDNSAddrs = false
+    let dialedBadAddress = false
+
+    // simulate a DNSAddr that resolves to multiple different peers like
+    // bootstrap.libp2p.io
+    resolvers.set('dnsaddr', async (addr) => {
+      if (addr.equals(ma)) {
+        resolvedDNSAddrs = true
+        return resolvedAddresses
+      }
+
+      return []
+    })
+
+    dialer = new DialQueue(components, {
+      maxParallelDials: 50
+    })
+    components.transportManager.transportForMultiaddr.returns(stubInterface<Transport>())
+
+    const connection = mockConnection(mockMultiaddrConnection(mockDuplex(), remotePeer))
+
+    components.transportManager.dial.callsFake(async (ma, opts = {}) => {
+      if (ma.toString() === maStr) {
+        await delay(100)
+        return connection
+      }
+
+      dialedBadAddress = true
+      throw new Error('Could not dial address')
+    })
+
+    await expect(dialer.dial(ma)).to.eventually.equal(connection)
+    expect(resolvedDNSAddrs).to.be.true('Did not resolve DNSAddrs')
+    expect(dialedBadAddress).to.be.false('Dialed address with wrong peer id')
+
+    resolvers.delete('dnsaddr')
+  })
 })

packages/libp2p/test/connection-manager/direct.spec.ts

@@ -165,7 +165,7 @@ describe('dialing (direct, WebSockets)', () => {
 
     const remotePeerId = peerIdFromString(remoteAddr.getPeerId() ?? '')
     await localComponents.peerStore.patch(remotePeerId, {
-      multiaddrs: Array.from({ length: 11 }, (_, i) => multiaddr(`/ip4/127.0.0.1/tcp/1500${i}/ws/p2p/12D3KooWHFKTMzwerBtsVmtz4ZZEQy2heafxzWw6wNn5PPYkBxJ5`))
+      multiaddrs: Array.from({ length: 11 }, (_, i) => multiaddr(`/ip4/127.0.0.1/tcp/1500${i}/ws/p2p/${remotePeerId.toString()}`))
     })
 
     await expect(connectionManager.openConnection(remotePeerId))