filip/Kecalek_python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix OPK loss on SPK-grace retry, deletion sync, add keys_updated push

Browse Source 
- chat_core: defer one-time-prekey deletion until the first message
  decrypts successfully; deleting it on load made the SPK grace-period
  retry derive a wrong shared secret and lose the message permanently
- chat_core: fix get_deleted_since params (since -> since_ts) and
  response field (message_ids -> deleted_ids) so incremental deletion
  sync actually works
- chat_core: route keys_updated pushes into the notification queue
- server: notify contacts with keys_updated when a user uploads a new
  SPK or logs in with a new device, so clients invalidate cached key
  bundles instead of waiting for the TTL
- server: rate-limit download_stream like other heavy handlers

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Filip
2026-06-12 01:39:36 +02:00
parent 4ded15d569
commit 750290ddc1
2 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
chat_core.py
View File

@@ -916,7 +916,7 @@ class ChatClient:
"session_reset",
"message_reacted", "message_pinned", "message_unpinned",
"message_delivered", "username_changed",
"avatar_changed",
"avatar_changed", "keys_updated",
"typing_start", "typing_stop"):
await self._notification_queue.put(msg)
else:
@@ -1852,8 +1852,10 @@ class ChatClient:
opk_priv = None
if opk_id:
opk_priv = _load_opk_private(self.email, opk_id, self._local_key)
if opk_priv:
_delete_opk_private(self.email, opk_id)
# Deletion is deferred until the first message decrypts successfully
# (_consume_pending_opk). Deleting here would break the SPK
# grace-period retry: the second _process_x3dh_header call could no
# longer load the OPK and the message would be lost permanently.
spk_priv = spk_override if spk_override else self.spk_private
@@ -1868,6 +1870,8 @@ class ChatClient:
spk_pub = spk_priv.public_key() if hasattr(spk_priv, 'public_key') else None
ratchet = DoubleRatchet.init_bob(shared_secret, (spk_priv, spk_pub))
ratchet._pending_opk_delete = opk_id if opk_priv else None
session_key = f"{sender_id}:{sender_device_id}" if sender_device_id else sender_id
self.sessions[session_key] = ratchet
_save_session(self.email, sender_id, ratchet, self._local_key,
@@ -1882,6 +1886,18 @@ class ChatClient:
return ratchet
def _consume_pending_opk(self, ratchet) -> None:
"""Delete the one-time prekey consumed by an X3DH handshake.
Called only after the first message decrypted successfully, so a failed
attempt (e.g. wrong SPK during the grace period) can still retry with
the same OPK.
"""
opk_id = getattr(ratchet, "_pending_opk_delete", None)
if opk_id:
_delete_opk_private(self.email, opk_id)
ratchet._pending_opk_delete = None
# ------------------------------------------------------------------
# Conversations
# ------------------------------------------------------------------
@@ -2485,6 +2501,8 @@ class ChatClient:
else:
raise ValueError(f"No session for sender {sender_id}")
self._consume_pending_opk(ratchet)
plaintext = unpad_plaintext(plaintext)
payload = json.loads(plaintext)
@@ -2633,9 +2651,9 @@ class ChatClient:
"""Sync message deletions from server (background, non-blocking)."""
try:
del_resp = await self.send_and_recv("get_deleted_since",
conversation_id=conv_id, since=after_ts)
conversation_id=conv_id, since_ts=after_ts)
if del_resp.get("status") == "ok":
for del_id in del_resp.get("data", {}).get("message_ids", []):
for del_id in del_resp.get("data", {}).get("deleted_ids", []):
_save_message_to_cache(self.email, conv_id, del_id, {"deleted": True},
cache_key=self._cache_key)
except Exception: