message saved if client crashes on retreival

This commit is contained in:
yves committed 2026-11-20 22:00:54 +01:00
1 parent 6d3ea3e2a6
commit 006bedc728
11 files changed
+591 -72

No files matched your search

+30 -8
View File
@@ -94,26 +94,44 @@ pub fn seal_response(key: &Key, resp: &v2::Response) -> Vec<u8> {
.encode_to_vec()
}
fn pull_message(server_sign: &SignPublic, mailbox: &SignPublic, ts: u64, request_id: &[u8]) -> Vec<u8> {
fn pull_message(
server_sign: &SignPublic,
mailbox: &SignPublic,
ts: u64,
acks: &[Vec<u8>],
request_id: &[u8],
) -> Vec<u8> {
let ack_refs: Vec<&[u8]> = acks.iter().map(Vec::as_slice).collect();
let acks_hash = meow_crypto::sha256(&ack_refs);
[
PULL_LABEL,
server_sign.as_bytes(),
mailbox.as_bytes(),
&ts.to_be_bytes(),
&acks_hash,
request_id,
]
.concat()
}
/// Client: prove ownership of a mailbox for one pull request.
pub fn mailbox_auth(mailbox: &SigningKeyPair, server: &ServerInfo, request_id: &[u8], now: u64) -> v2::MailboxAuth {
/// Client: prove ownership of a mailbox for one pull request, and acknowledge
/// (delete) the messages `acks` received by an earlier pull.
pub fn mailbox_auth(
mailbox: &SigningKeyPair,
server: &ServerInfo,
request_id: &[u8],
acks: Vec<Vec<u8>>,
now: u64,
) -> v2::MailboxAuth {
let pk = mailbox.public();
let signature = mailbox
.sign(&pull_message(&server.sign_key, &pk, now, &acks, request_id))
.to_vec();
v2::MailboxAuth {
mailbox: pk.to_vec(),
timestamp: now,
signature: mailbox
.sign(&pull_message(&server.sign_key, &pk, now, request_id))
.to_vec(),
signature,
acks,
}
}
@@ -130,7 +148,7 @@ pub fn verify_mailbox_auth(
return Err(Error::Expired);
}
mailbox.verify(
&pull_message(server_sign, &mailbox, auth.timestamp, request_id),
&pull_message(server_sign, &mailbox, auth.timestamp, &auth.acks, request_id),
&auth.signature,
)?;
Ok(mailbox)
@@ -178,9 +196,13 @@ mod tests {
let keys = ServerKeys::generate();
let info = ServerInfo::from_card(&keys.card("http://s", "s", "", 1)).unwrap();
let mb = SigningKeyPair::generate();
let auth = mailbox_auth(&mb, &info, b"rid", 1000);
let auth = mailbox_auth(&mb, &info, b"rid", vec![b"m1".to_vec()], 1000);
let sp = keys.sign.public();
assert_eq!(verify_mailbox_auth(&sp, b"rid", &auth, 1100).unwrap(), mb.public());
// Acks are covered by the signature.
let mut forged = auth.clone();
forged.acks.push(b"m2".to_vec());
assert!(verify_mailbox_auth(&sp, b"rid", &forged, 1100).is_err());
assert!(verify_mailbox_auth(&sp, b"other", &auth, 1100).is_err());
assert!(verify_mailbox_auth(&sp, b"rid", &auth, 1000 + AUTH_WINDOW_SECS + 1).is_err());
let other_server = ServerKeys::generate().sign.public();