Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-01-09 14:39:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

client: Replace undecryptable megolm events with an error message.

Browse Source
This commit is contained in:
Damir Jelić 2019-05-02 13:27:50 +02:00
parent db43c3efbd
commit ba28580aca
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pantalaimon/client.py
View File

@ -49,6 +49,18 @@ class PanClient(AsyncClient):
self.key_verificatins_tasks = [] self.key_verificatins_tasks = []
self.key_request_tasks = [] self.key_request_tasks = []
@property
def unable_to_decrypt(self):
"""Room event signaling that the message couldn't be decrypted."""
return {
"type": "m.room.message",
"content": {
"msgtype": "m.text",
"body": ("** Unable to decrypt: The sender's device has not "
"sent us the keys for this message. **")
}
}
def verify_devices(self, changed_devices): def verify_devices(self, changed_devices):
# Verify new devices automatically for now. # Verify new devices automatically for now.
for user_id, device_dict in changed_devices.items(): for user_id, device_dict in changed_devices.items():
@ -236,8 +248,13 @@ class PanClient(AsyncClient):
content content
) )
def pan_decrypt_event(self, event_dict, room_id=None): def pan_decrypt_event(
# type: (Dict[Any, Any], Optional[str]) -> (bool) self,
event_dict,
room_id=None,
ignore_failures=True
):
# type: (Dict[Any, Any], Optional[str], bool) -> (bool)
event = RoomEncryptedEvent.parse_event(event_dict) event = RoomEncryptedEvent.parse_event(event_dict)
if not isinstance(event, MegolmEvent): if not isinstance(event, MegolmEvent):
@ -260,6 +277,12 @@ class PanClient(AsyncClient):
except EncryptionError as error: except EncryptionError as error:
logger.warn(error) logger.warn(error)
if ignore_failures:
event_dict.update(self.unable_to_decrypt)
else:
raise
return False return False
def decrypt_messages_body(self, body): def decrypt_messages_body(self, body):
@ -289,7 +312,7 @@ class PanClient(AsyncClient):
return body return body
def decrypt_sync_body(self, body): def decrypt_sync_body(self, body, ignore_failures=True):
# type: (Dict[Any, Any]) -> Dict[Any, Any] # type: (Dict[Any, Any]) -> Dict[Any, Any]
"""Go through a json sync response and decrypt megolm encrypted events. """Go through a json sync response and decrypt megolm encrypted events.
@ -311,6 +334,6 @@ class PanClient(AsyncClient):
continue continue
for event in room_dict["timeline"]["events"]: for event in room_dict["timeline"]["events"]:
self.pan_decrypt_event(event, room_id) self.pan_decrypt_event(event, room_id, ignore_failures)
return body return body