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

client: Request room keys if we're unable to decrypt a megolm event.

Browse Source
This commit is contained in:
Damir Jelić 2019-05-02 12:09:49 +02:00
parent 7d58da93f9
commit db43c3efbd
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pantalaimon/client.py
View File

@ -42,7 +42,12 @@ class PanClient(AsyncClient):
self.key_verification_cb, self.key_verification_cb,
KeyVerificationEvent KeyVerificationEvent
) )
self.add_event_callback(
self.undecrypted_event_cb,
MegolmEvent
)
self.key_verificatins_tasks = [] self.key_verificatins_tasks = []
self.key_request_tasks = []
def verify_devices(self, changed_devices): def verify_devices(self, changed_devices):
# Verify new devices automatically for now. # Verify new devices automatically for now.
@ -55,6 +60,19 @@ class PanClient(AsyncClient):
"user {}".format(device.id, user_id)) "user {}".format(device.id, user_id))
self.verify_device(device) self.verify_device(device)
def undecrypted_event_cb(self, room, event):
loop = asyncio.get_event_loop()
logger.info("Unable to decrypt event from {} via {}.".format(
event.sender,
event.device_id
))
if event.session_id not in self.outgoing_key_requests:
logger.info("Requesting room key for undecrypted event.")
task = loop.create_task(self.request_room_key(event))
self.key_request_tasks.append(task)
def key_verification_cb(self, event): def key_verification_cb(self, event):
logger.info("Received key verification event: {}".format(event)) logger.info("Received key verification event: {}".format(event))
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
@ -117,7 +135,7 @@ class PanClient(AsyncClient):
task = asyncio.create_task(self._to_device(message)) task = asyncio.create_task(self._to_device(message))
tasks.append(task) tasks.append(task)
responses = await asyncio.gather(*tasks) await asyncio.gather(*tasks)
async def loop(self): async def loop(self):
self.loop_running = True self.loop_running = True
@ -153,6 +171,8 @@ class PanClient(AsyncClient):
self.key_verificatins_tasks = [] self.key_verificatins_tasks = []
await asyncio.gather(*self.key_request_tasks)
if self.should_upload_keys: if self.should_upload_keys:
await self.keys_upload() await self.keys_upload()