discv5: fix WHOAREYOU pending-request correlation#43
Merged
Conversation
Fix 5 bugs preventing a complete discv5 handshake exchange: 1. sendWhoareyou now echoes the triggering packet's nonce instead of zeroes, enabling the initiator to correlate the challenge. 2. Add PendingChallenge nonce-indexed list to Node so inbound WHOAREYOU packets can be mapped back to the target peer. 3. handleWhoareyou now builds and sends a full Handshake reply (ECDH, key derivation, id-sig, encodeHandshake) instead of discarding the ephemeral keypair. 4. handleHandshake uses sess.id_nonce and sess.challenge_data from the awaiting_handshake session instead of zero-padding the header nonce. 5. sendToNode sends a random ordinary packet when no session exists, storing the plaintext for retry inside the Handshake body. Also adds challenge_data field to Session, pubkey field to table.Entry, and expiry for PendingChallenge entries. Tests: handshake roundtrip, nonce echo correlation, pending expiry. Closes #38
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
sendWhoareyounow echoes the triggering packet's nonce and storeschallenge_datafor id-sig verificationhandleWhoareyoubuilds and sends a real Handshake reply (ECDH, key derivation, id-sig, encrypt pending message)handleHandshakeuses the session's storedid_nonceandchallenge_datainstead of zero-padded header noncesendToNodesends a random ordinary packet when no session exists, triggering the WHOAREYOU→Handshake flowPendingChallengenonce-indexed list with expiry,challenge_datafield onSession,pubkeyontable.EntryTest plan
zig build test --summary all— all 144 tests pass (3 new: handshake roundtrip, nonce echo, pending expiry)zig build simtest --summary all— passeszig fmt --check .— cleanCloses #38