Skip to content

Fix searchPeersByHash() silently dropping contacts beyond the 8th hash match #3243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
smellyspice wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix searchPeersByHash() silently dropping contacts beyond the 8th hash match #3243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/helpers/BaseChatMesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@

#include "ContactInfo.h"

#define MAX_SEARCH_RESULTS 8

#define MSG_SEND_FAILED 0
#define MSG_SEND_SENT_FLOOD 1
#define MSG_SEND_SENT_DIRECT 2
Expand Down Expand Up @@ -40,6 +38,18 @@ class ContactsIterator {

#define MAX_ANON_CONTACTS 8

// Must cover every possible contact, not just a small fixed sample: identity
// hashes are truncated to PATH_HASH_SIZE (1 byte) on the wire for ANON_REQ/
// REQ/RESPONSE matching (see Identity::isHashMatch()/copyHashTo()), so with
// enough contacts, multiple can legitimately share the same hash. A fixed
// cap smaller than the contact list size means searchPeersByHash() can stop
// after collecting that many same-hash matches and never even look at a
// later-added contact sharing that byte -- its replies then fail to decrypt
// permanently, not intermittently, since decryption is tried against every
// returned candidate's real shared secret (a wrong match simply fails to
// authenticate, so there's no correctness reason to cap the search early).
#define MAX_SEARCH_RESULTS (MAX_CONTACTS+MAX_ANON_CONTACTS)

#ifndef MAX_CONNECTIONS
#define MAX_CONNECTIONS 16
#endif
Expand Down