fix(libp2p): filter out dnsaddrs for different peers #1954
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some multiaddrs like `/dnsaddr/bootstrap.ipfs.io` resolve to multiple PeerIds. E.g: ```console % dig _dnsaddr.bootstrap.libp2p.io TXT ; <<>> DiG 9.10.6 <<>> _dnsaddr.bootstrap.libp2p.io TXT ;; global options: +cmd ;; Got answer: ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 53473 ;; flags: qr rd ra; QUERY: 1, ANSWER: 4, AUTHORITY: 0, ADDITIONAL: 1 ;; OPT PSEUDOSECTION: ; EDNS: version: 0, flags:; udp: 1232 ;; QUESTION SECTION: ;_dnsaddr.bootstrap.libp2p.io. IN TXT ;; ANSWER SECTION: _dnsaddr.bootstrap.libp2p.io. 261 IN TXT "dnsaddr=/dnsaddr/am6.bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb" _dnsaddr.bootstrap.libp2p.io. 261 IN TXT "dnsaddr=/dnsaddr/ny5.bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa" _dnsaddr.bootstrap.libp2p.io. 261 IN TXT "dnsaddr=/dnsaddr/sg1.bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt" _dnsaddr.bootstrap.libp2p.io. 261 IN TXT "dnsaddr=/dnsaddr/sv15.bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN" ``` This can cause problems when dialing those addresses with a PeerId since resolving the dnsaddr returns addresses with embedded PeerIds that aren't for the node you are trying to dial so filter those out. The errors these cause are non-fatal but do consume resources dialing nodes we aren't going to be able to connect to.
whizzzkid
reviewed
Aug 11, 2023
| return peerId.equals(addrPeerId) | ||
| } | ||
|
|
||
| return true |
There was a problem hiding this comment.
should the default be true? Can this be restructured such that it's only true when all conditions are met and defaults to false otherwise?
There was a problem hiding this comment.
I think it makes sense to fallback to true and filter out the false on the way
Comment on lines
+321
to
+324
| const addrPeerId = addr.multiaddr.getPeerId() | ||
| if (peerId != null && addrPeerId != null) { | ||
| return peerId.equals(addrPeerId) | ||
| } |
There was a problem hiding this comment.
one of the null checks look redundant. Also can the equality check be the other way? just for the sake of convention
Suggested change
| const addrPeerId = addr.multiaddr.getPeerId() | |
| if (peerId != null && addrPeerId != null) { | |
| return peerId.equals(addrPeerId) | |
| } | |
| const addrPeerId = addr.multiaddr.getPeerId() | |
| if (addrPeerId != null) { | |
| return addrPeerId.equals(peerId) | |
| } |
There was a problem hiding this comment.
You have to null guard on peerId again, if that's what you mean, because the type is PeerId | undefined - execution of the code takes place in a callback so TSC can't guarantee it's not been set back to undefined before the callback is invoked.
SgtPooki
approved these changes
Aug 11, 2023
| // - 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) { |
There was a problem hiding this comment.
If its p2p-circuit addrPeerId will likely be null always
This was referenced Jan 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some multiaddrs like
/dnsaddr/bootstrap.ipfs.ioresolve to multiple PeerIds.E.g:
This can cause problems when dialing those addresses with an explicit PeerId since resolving the dnsaddr returns addresses with embedded PeerIds that aren't for the node you are trying to dial so we need to filter those out.
The errors these cause are non-fatal but do consume resources dialing nodes we aren't going to be able to connect to.