matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: Add one-time key claiming functionality.

Browse source
This commit is contained in:
Damir Jelić 2018-10-01 17:12:36 +02:00
parent 4860ffee11
commit d8e7d84445
1 changed files with 26 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
matrix/server.py
View file

@ -22,7 +22,7 @@ import socket
import ssl import ssl
import time import time
from collections import defaultdict, deque from collections import defaultdict, deque
from typing import Any, Deque, Dict, Optional, List, NamedTuple from typing import Any, Deque, Dict, Optional, List, NamedTuple, DefaultDict
from nio import ( from nio import (
HttpClient, HttpClient,
@ -33,11 +33,13 @@ from nio import (
RoomSendResponse, RoomSendResponse,
SyncResponse, SyncResponse,
ShareGroupSessionResponse, ShareGroupSessionResponse,
KeysClaimResponse,
TransportResponse, TransportResponse,
TransportType, TransportType,
RoomMessagesResponse, RoomMessagesResponse,
RequestType, RequestType,
EncryptionError, EncryptionError,
GroupEncryptionError,
OlmTrustError, OlmTrustError,
) )
@ -232,7 +234,8 @@ class MatrixServer(object):
self.device_check_timestamp = None # type: Optional[int] self.device_check_timestamp = None # type: Optional[int]
self.own_message_queue = dict() # type: Dict[str, OwnMessage] self.own_message_queue = dict() # type: Dict[str, OwnMessage]
self.encryption_queue = defaultdict(deque) self.encryption_queue = defaultdict(deque) \
# type: DefaultDict[str, Deque[EncrytpionQueueItem]]
self.backlog_queue = dict() # type: Dict[str, str] self.backlog_queue = dict() # type: Dict[str, str]
self.unhandled_users = dict() # type: Dict[str, List[str]] self.unhandled_users = dict() # type: Dict[str, List[str]]
@ -624,12 +627,16 @@ class MatrixServer(object):
self.backlog_queue[uuid] = room_id self.backlog_queue[uuid] = room_id
self.send_or_queue(request) self.send_or_queue(request)
def room_send_message(self, room_buffer, formatted, msgtype="m.text"): def room_send_message(
# type: (RoomBuffer, Formatted, str) -> bool self,
room_buffer, # type: RoomBuffer
formatted, # type: Formatted
msgtype="m.text", # type: str
):
# type: (...) -> bool
room = room_buffer.room room = room_buffer.room
if not self.client: assert self.client
return False
body = {"msgtype": msgtype, "body": formatted.to_plain()} body = {"msgtype": msgtype, "body": formatted.to_plain()}
@ -641,8 +648,12 @@ class MatrixServer(object):
uuid, request = self.client.room_send( uuid, request = self.client.room_send(
room.room_id, "m.room.message", body room.room_id, "m.room.message", body
) )
except EncryptionError: except GroupEncryptionError:
_, request = self.client.share_group_session(room.room_id) try:
_, request = self.client.share_group_session(room.room_id)
except EncryptionError:
_, request = self.client.keys_claim(room.room_id)
message = EncrytpionQueueItem(msgtype, formatted) message = EncrytpionQueueItem(msgtype, formatted)
self.encryption_queue[room.room_id].append(message) self.encryption_queue[room.room_id].append(message)
self.send_or_queue(request) self.send_or_queue(request)
@ -866,6 +877,13 @@ class MatrixServer(object):
elif isinstance(response, RoomMessagesResponse): elif isinstance(response, RoomMessagesResponse):
self.handle_backlog_response(response) self.handle_backlog_response(response)
elif isinstance(response, KeysClaimResponse):
_, request = self.client.share_group_session(
response.room_id,
ignore_missing_sessions=True
)
self.send(request)
elif isinstance(response, ShareGroupSessionResponse): elif isinstance(response, ShareGroupSessionResponse):
room_id = response.room_id room_id = response.room_id
room_buffer = self.room_buffers[room_id] room_buffer = self.room_buffers[room_id]