1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
//! Pre-key management for Signal Protocol.
//!
//! Pre-key IDs use a persistent monotonic counter (Device::next_pre_key_id)
//! matching WhatsApp Web's NEXT_PK_ID pattern. IDs only increase to prevent
//! collisions when prekeys are consumed non-sequentially from the store.
use crate::client::Client;
use anyhow;
use log;
use std::sync::atomic::Ordering;
use wacore::iq::prekeys::{
DigestKeyBundleSpec, PreKeyCountSpec, PreKeyFetchSpec, PreKeyUploadSpec,
};
use wacore::libsignal::protocol::{KeyPair, PreKeyBundle, PublicKey};
use wacore::libsignal::store::record_helpers::new_pre_key_record;
use wacore::store::commands::DeviceCommand;
use wacore_binary::jid::Jid;
pub use wacore::prekeys::PreKeyUtils;
/// Matches WA Web's UPLOAD_KEYS_COUNT from WAWebSignalStoreApi.
const WANTED_PRE_KEY_COUNT: usize = 812;
const MIN_PRE_KEY_COUNT: usize = 5;
impl Client {
pub(crate) async fn fetch_pre_keys(
&self,
jids: &[Jid],
reason: Option<&str>,
) -> Result<std::collections::HashMap<Jid, PreKeyBundle>, anyhow::Error> {
let spec = match reason {
Some(r) => PreKeyFetchSpec::with_reason(jids.to_vec(), r),
None => PreKeyFetchSpec::new(jids.to_vec()),
};
let bundles = self.execute(spec).await?;
for jid in bundles.keys() {
log::debug!("Successfully parsed pre-key bundle for {jid}");
}
Ok(bundles)
}
/// Query the WhatsApp server for how many pre-keys it currently has for this device.
pub(crate) async fn get_server_pre_key_count(&self) -> Result<usize, crate::request::IqError> {
let response = self.execute(PreKeyCountSpec::new()).await?;
Ok(response.count)
}
/// Ensure the server has at least MIN_PRE_KEY_COUNT pre-keys, and upload a batch of
/// WANTED_PRE_KEY_COUNT new pre-keys. Uses a persistent monotonic counter
/// (Device::next_pre_key_id) to avoid ID collisions — matching WhatsApp Web's
/// NEXT_PK_ID / FIRST_UNUPLOAD_PK_ID pattern from WAWebSignalStoreApi.
///
/// When `force` is true, skips the count guard and always uploads. This is used
/// by the digest key repair path (WA Web's `_uploadPreKeys` does NOT check count).
pub(crate) async fn upload_pre_keys(&self, force: bool) -> Result<(), anyhow::Error> {
let server_count = match self.get_server_pre_key_count().await {
Ok(c) => c,
Err(e) => return Err(anyhow::anyhow!(e)),
};
if !force && server_count >= MIN_PRE_KEY_COUNT {
log::debug!("Server has {} pre-keys, no upload needed.", server_count);
return Ok(());
}
log::debug!("Server has {} pre-keys, uploading more.", server_count);
let device_snapshot = self.persistence_manager.get_device_snapshot().await;
let device_store = self.persistence_manager.get_device_arc().await;
let backend = {
let device_guard = device_store.read().await;
device_guard.backend.clone()
};
// Determine the starting ID using both the persistent counter AND the store max.
// Using max(counter, max_id+1) guards against crash-after-upload-before-persist:
// the counter would be stale, but the store already has the generated keys.
let max_id = backend.get_max_prekey_id().await?;
let start_id = if device_snapshot.next_pre_key_id > 0 {
std::cmp::max(device_snapshot.next_pre_key_id, max_id + 1)
} else {
log::info!(
"Migrating pre-key counter: MAX(key_id) in store = {}, starting from {}",
max_id,
max_id + 1
);
max_id + 1
};
let mut keys_to_upload = Vec::with_capacity(WANTED_PRE_KEY_COUNT);
let mut key_pairs_to_upload = Vec::with_capacity(WANTED_PRE_KEY_COUNT);
for i in 0..WANTED_PRE_KEY_COUNT {
let pre_key_id = start_id + i as u32;
if pre_key_id > 16777215 {
log::warn!(
"Pre-key ID {} exceeds maximum range, wrapping around",
pre_key_id
);
break;
}
let key_pair = KeyPair::generate(&mut rand::make_rng::<rand::rngs::StdRng>());
let pre_key_record = new_pre_key_record(pre_key_id, &key_pair);
keys_to_upload.push((pre_key_id, pre_key_record));
key_pairs_to_upload.push((pre_key_id, key_pair));
}
if keys_to_upload.is_empty() {
log::warn!("No pre-keys available to upload");
return Ok(());
}
// Encode once — reused for both pre-upload store and post-upload mark.
let encoded_batch: Vec<(u32, Vec<u8>)> = {
use prost::Message;
keys_to_upload
.iter()
.map(|(id, record)| (*id, record.encode_to_vec()))
.collect()
};
// Persist the freshly generated prekeys before uploading them so they are
// already available for local decryption if the server starts sending
// pkmsg traffic immediately after accepting the upload.
// Propagate errors — uploading a key we can't store locally would cause
// decryption failures when the server hands it out.
backend.store_prekeys_batch(&encoded_batch, false).await?;
let pre_key_pairs: Vec<(u32, PublicKey)> = key_pairs_to_upload
.iter()
.map(|(id, key_pair)| (*id, key_pair.public_key))
.collect();
let spec = PreKeyUploadSpec::new(
device_snapshot.registration_id,
device_snapshot.identity_key.public_key,
device_snapshot.signed_pre_key_id,
device_snapshot.signed_pre_key.public_key,
device_snapshot.signed_pre_key_signature.to_vec(),
pre_key_pairs,
);
self.execute(spec).await?;
// Mark the uploaded prekeys as server-synced (reuse encoded batch)
if let Err(e) = backend.store_prekeys_batch(&encoded_batch, true).await {
log::warn!("Failed to mark prekeys as uploaded: {:?}", e);
}
// Update the persistent counter so future uploads never reuse these IDs.
let next_id = start_id + key_pairs_to_upload.len() as u32;
self.persistence_manager
.process_command(DeviceCommand::SetNextPreKeyId(next_id))
.await;
self.server_has_prekeys.store(true, Ordering::Relaxed);
log::debug!(
"Successfully uploaded {} new pre-keys with sequential IDs starting from {}.",
key_pairs_to_upload.len(),
start_id
);
Ok(())
}
/// Upload pre-keys with Fibonacci retry backoff matching WA Web's `PromiseRetryLoop`.
///
/// Retry schedule: 1s, 2s, 3s, 5s, 8s, 13s, ... capped at 610s.
/// Verified against WA Web JS: `{ algo: { type: "fibonacci", first: 1e3, second: 2e3 }, max: 61e4 }`
///
/// When `force` is true, bypasses the count guard (used by digest repair path).
pub(crate) async fn upload_pre_keys_with_retry(
&self,
force: bool,
) -> Result<(), anyhow::Error> {
let mut delay_a: u64 = 1;
let mut delay_b: u64 = 2;
const MAX_DELAY_SECS: u64 = 610;
loop {
match self.upload_pre_keys(force).await {
Ok(()) => {
log::info!("Pre-key upload succeeded");
return Ok(());
}
Err(e) => {
let delay = delay_a.min(MAX_DELAY_SECS);
log::warn!("Pre-key upload failed, retrying in {}s: {:?}", delay, e);
self.runtime
.sleep(std::time::Duration::from_secs(delay))
.await;
// Bail if disconnected during retry wait
if !self.is_logged_in.load(Ordering::Relaxed) {
return Err(anyhow::anyhow!(
"Connection lost during pre-key upload retry"
));
}
let next = delay_a + delay_b;
delay_a = delay_b;
delay_b = next;
}
}
}
}
/// Validate server key bundle digest, re-uploading only when the server has no record.
///
/// Matches WA Web's `WAWebDigestKeyJob.digestKey()`:
/// 1. Queries server for key bundle digest (identity + signed prekey + prekey IDs + SHA-1 hash)
/// 2. If server returns 404 (no record): triggers `upload_pre_keys_with_retry()`
/// 3. If server returns 406/503/other error: logs and does nothing
/// 4. On success: loads local keys and computes SHA-1 over the same material
/// 5. If validation fails (regId mismatch, missing prekey, hash mismatch): logs warning,
/// does NOT re-upload — WA Web catches all `validateLocalKeyBundle` exceptions without
/// re-uploading; the normal `RotateKeyJob` will eventually refresh keys
pub(crate) async fn validate_digest_key(&self) -> Result<(), anyhow::Error> {
let response = match self.execute(DigestKeyBundleSpec::new()).await {
Ok(resp) => resp,
Err(crate::request::IqError::ServerError { code: 404, .. }) => {
log::warn!("digestKey: no record found for current user, re-uploading");
return self.upload_pre_keys_with_retry(true).await;
}
Err(crate::request::IqError::ServerError { code: 406, .. }) => {
log::warn!("digestKey: malformed request");
return Ok(());
}
Err(crate::request::IqError::ServerError { code: 503, .. }) => {
log::warn!("digestKey: service unavailable");
return Ok(());
}
Err(crate::request::IqError::ParseError(e)) => {
// WA Web catches parse failures without re-uploading
log::debug!("digestKey: unparseable digest response ({e}), skipping");
return Ok(());
}
Err(e) => {
log::warn!("digestKey: server error: {:?}", e);
return Ok(());
}
};
// WA Web's validateLocalKeyBundle validates but catches ALL exceptions without
// re-uploading. The catch block in digestKey() sets a=false for any throw from y(),
// meaning only 404 triggers re-upload. We match that: log warnings, return Ok(()).
let device_snapshot = self.persistence_manager.get_device_snapshot().await;
if response.reg_id != device_snapshot.registration_id {
log::warn!(
"digestKey: registration ID mismatch (server={}, local={}), skipping",
response.reg_id,
device_snapshot.registration_id
);
return Ok(());
}
// Compute local SHA-1 digest over the same material as WA Web's validateLocalKeyBundle:
// identity_pub_key + signed_prekey_pub + signed_prekey_signature + (for each prekey ID: load 32-byte pubkey)
let identity_bytes = device_snapshot.identity_key.public_key.public_key_bytes();
let skey_pub_bytes = device_snapshot.signed_pre_key.public_key.public_key_bytes();
let skey_sig_bytes = &device_snapshot.signed_pre_key_signature;
let device_store = self.persistence_manager.get_device_arc().await;
let backend = {
let guard = device_store.read().await;
guard.backend.clone()
};
// Load each prekey referenced by the server digest and extract its public key
let mut prekey_pubkeys = Vec::with_capacity(response.prekey_ids.len());
for prekey_id in &response.prekey_ids {
match backend.load_prekey(*prekey_id).await {
Ok(Some(record_bytes)) => {
use prost::Message;
match waproto::whatsapp::PreKeyRecordStructure::decode(record_bytes.as_slice())
{
Ok(record) => {
if let Some(pk) = record.public_key {
prekey_pubkeys.push(pk);
} else {
log::warn!(
"digestKey: prekey {} has no public key, skipping",
prekey_id
);
return Ok(());
}
}
Err(e) => {
log::warn!(
"digestKey: failed to decode prekey {}: {}, skipping",
prekey_id,
e
);
return Ok(());
}
}
}
Ok(None) => {
log::warn!("digestKey: missing local prekey {}, skipping", prekey_id);
return Ok(());
}
Err(e) => {
log::warn!(
"digestKey: failed to load prekey {}: {:?}, skipping",
prekey_id,
e
);
return Ok(());
}
}
}
// Compute local SHA-1 digest matching WA Web's validateLocalKeyBundle
let local_hash = wacore::prekeys::compute_key_bundle_digest(
identity_bytes,
skey_pub_bytes,
skey_sig_bytes,
&prekey_pubkeys,
);
if local_hash.as_slice() != response.hash.as_slice() {
log::warn!(
"digestKey: hash mismatch (server={}, local={}), skipping",
hex::encode(&response.hash),
hex::encode(local_hash)
);
return Ok(());
}
log::debug!("digestKey: key bundle validation successful");
Ok(())
}
}