2016-01-06 23:26:29 -05:00
|
|
|
# Copyright 2015, 2016 OpenMarket Ltd
|
2019-07-25 11:08:24 -04:00
|
|
|
# Copyright 2019 New Vector Ltd
|
2020-10-07 08:00:17 -04:00
|
|
|
# Copyright 2020 The Matrix.org Foundation C.I.C.
|
2015-07-06 13:47:57 -04:00
|
|
|
#
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
|
|
|
#
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
#
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
|
|
|
|
2016-07-26 11:46:53 -04:00
|
|
|
import logging
|
2023-04-25 13:30:41 -04:00
|
|
|
import re
|
2023-04-27 12:57:46 -04:00
|
|
|
from collections import Counter
|
2023-05-10 10:08:43 -04:00
|
|
|
from http import HTTPStatus
|
2023-04-27 12:57:46 -04:00
|
|
|
from typing import TYPE_CHECKING, Any, Dict, Optional, Tuple
|
2016-07-26 11:46:53 -04:00
|
|
|
|
2023-05-10 10:08:43 -04:00
|
|
|
from synapse.api.errors import Codes, InvalidAPICallError, SynapseError
|
2021-08-26 07:53:52 -04:00
|
|
|
from synapse.http.server import HttpServer
|
2016-09-12 13:17:09 -04:00
|
|
|
from synapse.http.servlet import (
|
2018-07-09 02:09:20 -04:00
|
|
|
RestServlet,
|
|
|
|
parse_integer,
|
|
|
|
parse_json_object_from_request,
|
|
|
|
parse_string,
|
2016-09-12 13:17:09 -04:00
|
|
|
)
|
2021-08-26 07:53:52 -04:00
|
|
|
from synapse.http.site import SynapseRequest
|
2022-08-22 05:03:11 -04:00
|
|
|
from synapse.logging.opentracing import log_kv, set_tag
|
2022-11-16 17:16:25 -05:00
|
|
|
from synapse.replication.http.devices import ReplicationUploadKeysForUserRestServlet
|
2022-09-07 07:03:32 -04:00
|
|
|
from synapse.rest.client._base import client_patterns, interactive_auth_handler
|
2021-08-26 07:53:52 -04:00
|
|
|
from synapse.types import JsonDict, StreamToken
|
2022-09-07 07:03:32 -04:00
|
|
|
from synapse.util.cancellation import cancellable
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
if TYPE_CHECKING:
|
|
|
|
from synapse.server import HomeServer
|
|
|
|
|
2015-07-06 13:47:57 -04:00
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
|
|
|
|
class KeyUploadServlet(RestServlet):
|
|
|
|
"""
|
2016-07-26 18:38:12 -04:00
|
|
|
POST /keys/upload HTTP/1.1
|
2015-07-06 13:47:57 -04:00
|
|
|
Content-Type: application/json
|
|
|
|
|
|
|
|
{
|
2022-11-16 17:16:25 -05:00
|
|
|
"device_keys": {
|
|
|
|
"user_id": "<user_id>",
|
|
|
|
"device_id": "<device_id>",
|
|
|
|
"valid_until_ts": <millisecond_timestamp>,
|
|
|
|
"algorithms": [
|
|
|
|
"m.olm.curve25519-aes-sha2",
|
|
|
|
]
|
|
|
|
"keys": {
|
|
|
|
"<algorithm>:<device_id>": "<key_base64>",
|
|
|
|
},
|
|
|
|
"signatures:" {
|
|
|
|
"<user_id>" {
|
|
|
|
"<algorithm>:<device_id>": "<signature_base64>"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"fallback_keys": {
|
|
|
|
"<algorithm>:<device_id>": "<key_base64>",
|
|
|
|
"signed_<algorithm>:<device_id>": {
|
|
|
|
"fallback": true,
|
|
|
|
"key": "<key_base64>",
|
|
|
|
"signatures": {
|
|
|
|
"<user_id>": {
|
|
|
|
"<algorithm>:<device_id>": "<key_base64>"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"one_time_keys": {
|
|
|
|
"<algorithm>:<key_id>": "<key_base64>"
|
2015-07-06 13:47:57 -04:00
|
|
|
},
|
|
|
|
}
|
2022-11-16 17:16:25 -05:00
|
|
|
|
|
|
|
response, e.g.:
|
|
|
|
|
|
|
|
{
|
|
|
|
"one_time_key_counts": {
|
|
|
|
"curve25519": 10,
|
|
|
|
"signed_curve25519": 20
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-06 13:47:57 -04:00
|
|
|
"""
|
2019-06-20 05:32:02 -04:00
|
|
|
|
2019-06-03 07:28:59 -04:00
|
|
|
PATTERNS = client_patterns("/keys/upload(/(?P<device_id>[^/]+))?$")
|
2023-03-23 08:11:14 -04:00
|
|
|
CATEGORY = "Encryption requests"
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def __init__(self, hs: "HomeServer"):
|
2020-09-18 09:56:44 -04:00
|
|
|
super().__init__()
|
2015-07-06 13:47:57 -04:00
|
|
|
self.auth = hs.get_auth()
|
2016-09-13 06:35:35 -04:00
|
|
|
self.e2e_keys_handler = hs.get_e2e_keys_handler()
|
2020-10-07 08:00:17 -04:00
|
|
|
self.device_handler = hs.get_device_handler()
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2022-11-16 17:16:25 -05:00
|
|
|
if hs.config.worker.worker_app is None:
|
|
|
|
# if main process
|
|
|
|
self.key_uploader = self.e2e_keys_handler.upload_keys_for_user
|
|
|
|
else:
|
|
|
|
# then a worker
|
|
|
|
self.key_uploader = ReplicationUploadKeysForUserRestServlet.make_client(hs)
|
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
async def on_POST(
|
|
|
|
self, request: SynapseRequest, device_id: Optional[str]
|
|
|
|
) -> Tuple[int, JsonDict]:
|
2019-12-05 11:46:37 -05:00
|
|
|
requester = await self.auth.get_user_by_req(request, allow_guest=True)
|
2016-01-11 10:29:57 -05:00
|
|
|
user_id = requester.user.to_string()
|
2016-03-11 11:41:03 -05:00
|
|
|
body = parse_json_object_from_request(request)
|
|
|
|
|
2016-07-26 18:38:12 -04:00
|
|
|
if device_id is not None:
|
2020-10-07 08:00:17 -04:00
|
|
|
# Providing the device_id should only be done for setting keys
|
|
|
|
# for dehydrated devices; however, we allow it for any device for
|
|
|
|
# compatibility with older clients.
|
2016-07-26 18:38:12 -04:00
|
|
|
if requester.device_id is not None and device_id != requester.device_id:
|
2020-10-07 08:00:17 -04:00
|
|
|
dehydrated_device = await self.device_handler.get_dehydrated_device(
|
|
|
|
user_id
|
2016-07-27 11:41:06 -04:00
|
|
|
)
|
2020-10-07 08:00:17 -04:00
|
|
|
if dehydrated_device is not None and device_id != dehydrated_device[0]:
|
|
|
|
set_tag("error", True)
|
|
|
|
log_kv(
|
|
|
|
{
|
|
|
|
"message": "Client uploading keys for a different device",
|
|
|
|
"logged_in_id": requester.device_id,
|
|
|
|
"key_being_uploaded": device_id,
|
|
|
|
}
|
|
|
|
)
|
|
|
|
logger.warning(
|
|
|
|
"Client uploading keys for a different device "
|
|
|
|
"(logged in as %s, uploading for %s)",
|
|
|
|
requester.device_id,
|
|
|
|
device_id,
|
|
|
|
)
|
2016-07-26 18:38:12 -04:00
|
|
|
else:
|
|
|
|
device_id = requester.device_id
|
|
|
|
|
|
|
|
if device_id is None:
|
2016-09-12 13:17:09 -04:00
|
|
|
raise SynapseError(
|
2016-07-26 18:38:12 -04:00
|
|
|
400, "To upload keys, you must pass device_id when authenticating"
|
|
|
|
)
|
|
|
|
|
2022-11-16 17:16:25 -05:00
|
|
|
result = await self.key_uploader(
|
|
|
|
user_id=user_id, device_id=device_id, keys=body
|
2016-09-13 06:35:35 -04:00
|
|
|
)
|
2019-08-30 11:28:26 -04:00
|
|
|
return 200, result
|
2015-07-06 13:47:57 -04:00
|
|
|
|
|
|
|
|
|
|
|
class KeyQueryServlet(RestServlet):
|
|
|
|
"""
|
|
|
|
POST /keys/query HTTP/1.1
|
|
|
|
Content-Type: application/json
|
|
|
|
{
|
|
|
|
"device_keys": {
|
|
|
|
"<user_id>": ["<device_id>"]
|
|
|
|
} }
|
|
|
|
|
|
|
|
HTTP/1.1 200 OK
|
|
|
|
{
|
|
|
|
"device_keys": {
|
|
|
|
"<user_id>": {
|
|
|
|
"<device_id>": {
|
|
|
|
"user_id": "<user_id>", // Duplicated to be signed
|
|
|
|
"device_id": "<device_id>", // Duplicated to be signed
|
|
|
|
"valid_until_ts": <millisecond_timestamp>,
|
|
|
|
"algorithms": [ // List of supported algorithms
|
2020-06-04 15:03:40 -04:00
|
|
|
"m.olm.curve25519-aes-sha2",
|
2015-07-06 13:47:57 -04:00
|
|
|
],
|
|
|
|
"keys": { // Must include a ed25519 signing key
|
|
|
|
"<algorithm>:<key_id>": "<key_base64>",
|
|
|
|
},
|
|
|
|
"signatures:" {
|
|
|
|
// Must be signed with device's ed25519 key
|
|
|
|
"<user_id>/<device_id>": {
|
|
|
|
"<algorithm>:<key_id>": "<signature_base64>"
|
|
|
|
}
|
|
|
|
// Must be signed by this server.
|
|
|
|
"<server_name>": {
|
|
|
|
"<algorithm>:<key_id>": "<signature_base64>"
|
|
|
|
} } } } } }
|
|
|
|
"""
|
|
|
|
|
2019-06-03 07:28:59 -04:00
|
|
|
PATTERNS = client_patterns("/keys/query$")
|
2023-03-23 08:11:14 -04:00
|
|
|
CATEGORY = "Encryption requests"
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def __init__(self, hs: "HomeServer"):
|
2020-09-18 09:56:44 -04:00
|
|
|
super().__init__()
|
2015-07-06 13:47:57 -04:00
|
|
|
self.auth = hs.get_auth()
|
2016-08-01 13:02:07 -04:00
|
|
|
self.e2e_keys_handler = hs.get_e2e_keys_handler()
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2022-09-07 07:03:32 -04:00
|
|
|
@cancellable
|
2021-08-26 07:53:52 -04:00
|
|
|
async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
2019-12-05 11:46:37 -05:00
|
|
|
requester = await self.auth.get_user_by_req(request, allow_guest=True)
|
2019-07-25 11:08:24 -04:00
|
|
|
user_id = requester.user.to_string()
|
2021-06-09 07:05:32 -04:00
|
|
|
device_id = requester.device_id
|
2016-09-12 13:17:09 -04:00
|
|
|
timeout = parse_integer(request, "timeout", 10 * 1000)
|
2016-03-11 11:41:03 -05:00
|
|
|
body = parse_json_object_from_request(request)
|
2021-08-20 10:47:03 -04:00
|
|
|
|
|
|
|
device_keys = body.get("device_keys")
|
|
|
|
if not isinstance(device_keys, dict):
|
|
|
|
raise InvalidAPICallError("'device_keys' must be a JSON object")
|
|
|
|
|
|
|
|
def is_list_of_strings(values: Any) -> bool:
|
|
|
|
return isinstance(values, list) and all(isinstance(v, str) for v in values)
|
|
|
|
|
|
|
|
if any(not is_list_of_strings(keys) for keys in device_keys.values()):
|
|
|
|
raise InvalidAPICallError(
|
|
|
|
"'device_keys' values must be a list of strings",
|
|
|
|
)
|
|
|
|
|
2021-06-09 07:05:32 -04:00
|
|
|
result = await self.e2e_keys_handler.query_devices(
|
|
|
|
body, timeout, user_id, device_id
|
|
|
|
)
|
2019-08-30 11:28:26 -04:00
|
|
|
return 200, result
|
2015-07-06 13:47:57 -04:00
|
|
|
|
|
|
|
|
2017-02-01 05:30:03 -05:00
|
|
|
class KeyChangesServlet(RestServlet):
|
2017-02-01 05:32:49 -05:00
|
|
|
"""Returns the list of changes of keys between two stream tokens (may return
|
2017-02-01 08:17:17 -05:00
|
|
|
spurious extra results, since we currently ignore the `to` param).
|
2017-02-01 05:32:49 -05:00
|
|
|
|
|
|
|
GET /keys/changes?from=...&to=...
|
|
|
|
|
|
|
|
200 OK
|
|
|
|
{ "changed": ["@foo:example.com"] }
|
|
|
|
"""
|
2019-06-20 05:32:02 -04:00
|
|
|
|
2019-06-03 07:28:59 -04:00
|
|
|
PATTERNS = client_patterns("/keys/changes$")
|
2023-03-23 08:11:14 -04:00
|
|
|
CATEGORY = "Encryption requests"
|
2017-02-01 05:30:03 -05:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def __init__(self, hs: "HomeServer"):
|
2020-09-18 09:56:44 -04:00
|
|
|
super().__init__()
|
2017-02-01 05:30:03 -05:00
|
|
|
self.auth = hs.get_auth()
|
|
|
|
self.device_handler = hs.get_device_handler()
|
2022-02-23 06:04:02 -05:00
|
|
|
self.store = hs.get_datastores().main
|
2017-02-01 05:30:03 -05:00
|
|
|
|
2022-09-07 07:03:32 -04:00
|
|
|
@cancellable
|
2021-08-26 07:53:52 -04:00
|
|
|
async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
2019-12-05 11:46:37 -05:00
|
|
|
requester = await self.auth.get_user_by_req(request, allow_guest=True)
|
2017-02-01 05:30:03 -05:00
|
|
|
|
2021-07-21 09:47:56 -04:00
|
|
|
from_token_string = parse_string(request, "from", required=True)
|
2019-08-22 06:28:12 -04:00
|
|
|
set_tag("from", from_token_string)
|
2017-02-01 05:32:49 -05:00
|
|
|
|
|
|
|
# We want to enforce they do pass us one, but we ignore it and return
|
|
|
|
# changes after the "to" as well as before.
|
2022-07-21 08:01:52 -04:00
|
|
|
#
|
|
|
|
# XXX This does not enforce that "to" is passed.
|
|
|
|
set_tag("to", str(parse_string(request, "to")))
|
2017-02-01 05:30:03 -05:00
|
|
|
|
2020-09-30 15:29:19 -04:00
|
|
|
from_token = await StreamToken.from_string(self.store, from_token_string)
|
2017-02-01 05:30:03 -05:00
|
|
|
|
|
|
|
user_id = requester.user.to_string()
|
|
|
|
|
2019-12-05 11:46:37 -05:00
|
|
|
results = await self.device_handler.get_user_ids_changed(user_id, from_token)
|
2017-02-01 05:30:03 -05:00
|
|
|
|
2019-08-30 11:28:26 -04:00
|
|
|
return 200, results
|
2017-02-01 05:30:03 -05:00
|
|
|
|
|
|
|
|
2015-07-06 13:47:57 -04:00
|
|
|
class OneTimeKeyServlet(RestServlet):
|
|
|
|
"""
|
2015-07-14 08:08:33 -04:00
|
|
|
POST /keys/claim HTTP/1.1
|
2015-07-06 13:47:57 -04:00
|
|
|
{
|
|
|
|
"one_time_keys": {
|
|
|
|
"<user_id>": {
|
|
|
|
"<device_id>": "<algorithm>"
|
|
|
|
} } }
|
|
|
|
|
|
|
|
HTTP/1.1 200 OK
|
|
|
|
{
|
|
|
|
"one_time_keys": {
|
|
|
|
"<user_id>": {
|
|
|
|
"<device_id>": {
|
|
|
|
"<algorithm>:<key_id>": "<key_base64>"
|
|
|
|
} } } }
|
|
|
|
|
|
|
|
"""
|
2019-06-20 05:32:02 -04:00
|
|
|
|
2019-06-03 07:28:59 -04:00
|
|
|
PATTERNS = client_patterns("/keys/claim$")
|
2023-03-23 08:11:14 -04:00
|
|
|
CATEGORY = "Encryption requests"
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def __init__(self, hs: "HomeServer"):
|
2020-09-18 09:56:44 -04:00
|
|
|
super().__init__()
|
2015-07-06 13:47:57 -04:00
|
|
|
self.auth = hs.get_auth()
|
2016-09-13 06:35:35 -04:00
|
|
|
self.e2e_keys_handler = hs.get_e2e_keys_handler()
|
2015-07-06 13:47:57 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
2023-05-24 16:23:26 -04:00
|
|
|
requester = await self.auth.get_user_by_req(request, allow_guest=True)
|
2016-09-12 13:17:09 -04:00
|
|
|
timeout = parse_integer(request, "timeout", 10 * 1000)
|
2016-03-11 11:41:03 -05:00
|
|
|
body = parse_json_object_from_request(request)
|
2023-04-27 12:57:46 -04:00
|
|
|
|
|
|
|
# Generate a count for each algorithm, which is hard-coded to 1.
|
|
|
|
query: Dict[str, Dict[str, Dict[str, int]]] = {}
|
|
|
|
for user_id, one_time_keys in body.get("one_time_keys", {}).items():
|
|
|
|
for device_id, algorithm in one_time_keys.items():
|
|
|
|
query.setdefault(user_id, {})[device_id] = {algorithm: 1}
|
|
|
|
|
2023-04-25 13:30:41 -04:00
|
|
|
result = await self.e2e_keys_handler.claim_one_time_keys(
|
2023-05-24 16:23:26 -04:00
|
|
|
query, requester.user, timeout, always_include_fallback_keys=False
|
2023-04-25 13:30:41 -04:00
|
|
|
)
|
|
|
|
return 200, result
|
|
|
|
|
|
|
|
|
|
|
|
class UnstableOneTimeKeyServlet(RestServlet):
|
|
|
|
"""
|
2023-04-27 12:57:46 -04:00
|
|
|
Identical to the stable endpoint (OneTimeKeyServlet) except it allows for
|
|
|
|
querying for multiple OTKs at once and always includes fallback keys in the
|
|
|
|
response.
|
|
|
|
|
|
|
|
POST /keys/claim HTTP/1.1
|
|
|
|
{
|
|
|
|
"one_time_keys": {
|
|
|
|
"<user_id>": {
|
|
|
|
"<device_id>": ["<algorithm>", ...]
|
|
|
|
} } }
|
|
|
|
|
|
|
|
HTTP/1.1 200 OK
|
|
|
|
{
|
|
|
|
"one_time_keys": {
|
|
|
|
"<user_id>": {
|
|
|
|
"<device_id>": {
|
|
|
|
"<algorithm>:<key_id>": "<key_base64>"
|
|
|
|
} } } }
|
|
|
|
|
2023-04-25 13:30:41 -04:00
|
|
|
"""
|
|
|
|
|
|
|
|
PATTERNS = [re.compile(r"^/_matrix/client/unstable/org.matrix.msc3983/keys/claim$")]
|
|
|
|
CATEGORY = "Encryption requests"
|
|
|
|
|
|
|
|
def __init__(self, hs: "HomeServer"):
|
|
|
|
super().__init__()
|
|
|
|
self.auth = hs.get_auth()
|
|
|
|
self.e2e_keys_handler = hs.get_e2e_keys_handler()
|
|
|
|
|
|
|
|
async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
2023-05-24 16:23:26 -04:00
|
|
|
requester = await self.auth.get_user_by_req(request, allow_guest=True)
|
2023-04-25 13:30:41 -04:00
|
|
|
timeout = parse_integer(request, "timeout", 10 * 1000)
|
|
|
|
body = parse_json_object_from_request(request)
|
2023-04-27 12:57:46 -04:00
|
|
|
|
|
|
|
# Generate a count for each algorithm.
|
|
|
|
query: Dict[str, Dict[str, Dict[str, int]]] = {}
|
|
|
|
for user_id, one_time_keys in body.get("one_time_keys", {}).items():
|
|
|
|
for device_id, algorithms in one_time_keys.items():
|
|
|
|
query.setdefault(user_id, {})[device_id] = Counter(algorithms)
|
|
|
|
|
2023-04-25 13:30:41 -04:00
|
|
|
result = await self.e2e_keys_handler.claim_one_time_keys(
|
2023-05-24 16:23:26 -04:00
|
|
|
query, requester.user, timeout, always_include_fallback_keys=True
|
2023-04-25 13:30:41 -04:00
|
|
|
)
|
2019-08-30 11:28:26 -04:00
|
|
|
return 200, result
|
2015-07-06 13:47:57 -04:00
|
|
|
|
|
|
|
|
2019-07-25 11:08:24 -04:00
|
|
|
class SigningKeyUploadServlet(RestServlet):
|
|
|
|
"""
|
|
|
|
POST /keys/device_signing/upload HTTP/1.1
|
|
|
|
Content-Type: application/json
|
|
|
|
|
|
|
|
{
|
|
|
|
}
|
|
|
|
"""
|
|
|
|
|
2021-11-16 08:47:58 -05:00
|
|
|
PATTERNS = client_patterns("/keys/device_signing/upload$", releases=("v3",))
|
2019-07-25 11:08:24 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def __init__(self, hs: "HomeServer"):
|
2020-09-18 09:56:44 -04:00
|
|
|
super().__init__()
|
2019-07-25 11:08:24 -04:00
|
|
|
self.hs = hs
|
|
|
|
self.auth = hs.get_auth()
|
|
|
|
self.e2e_keys_handler = hs.get_e2e_keys_handler()
|
|
|
|
self.auth_handler = hs.get_auth_handler()
|
|
|
|
|
|
|
|
@interactive_auth_handler
|
2021-08-26 07:53:52 -04:00
|
|
|
async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
2019-12-05 11:46:37 -05:00
|
|
|
requester = await self.auth.get_user_by_req(request)
|
2019-07-25 11:08:24 -04:00
|
|
|
user_id = requester.user.to_string()
|
|
|
|
body = parse_json_object_from_request(request)
|
|
|
|
|
2023-11-15 12:28:10 -05:00
|
|
|
(
|
|
|
|
is_cross_signing_setup,
|
|
|
|
master_key_updatable_without_uia,
|
|
|
|
) = await self.e2e_keys_handler.check_cross_signing_setup(user_id)
|
2023-05-10 10:08:43 -04:00
|
|
|
|
|
|
|
# Before MSC3967 we required UIA both when setting up cross signing for the
|
|
|
|
# first time and when resetting the device signing key. With MSC3967 we only
|
|
|
|
# require UIA when resetting cross-signing, and not when setting up the first
|
|
|
|
# time. Because there is no UIA in MSC3861, for now we throw an error if the
|
|
|
|
# user tries to reset the device signing key when MSC3861 is enabled, but allow
|
|
|
|
# first-time setup.
|
2023-11-15 12:28:10 -05:00
|
|
|
#
|
|
|
|
# XXX: We now have a get-out clause by which MAS can temporarily mark the master
|
|
|
|
# key as replaceable. It should do its own equivalent of user interactive auth
|
|
|
|
# before doing so.
|
2023-05-09 10:20:04 -04:00
|
|
|
if self.hs.config.experimental.msc3861.enabled:
|
2023-11-15 12:28:10 -05:00
|
|
|
# The auth service has to explicitly mark the master key as replaceable
|
|
|
|
# without UIA to reset the device signing key with MSC3861.
|
|
|
|
if is_cross_signing_setup and not master_key_updatable_without_uia:
|
2023-05-10 10:08:43 -04:00
|
|
|
raise SynapseError(
|
|
|
|
HTTPStatus.NOT_IMPLEMENTED,
|
|
|
|
"Resetting cross signing keys is not yet supported with MSC3861",
|
|
|
|
Codes.UNRECOGNIZED,
|
|
|
|
)
|
|
|
|
# But first-time setup is fine
|
|
|
|
|
|
|
|
elif self.hs.config.experimental.msc3967_enabled:
|
|
|
|
# If we already have a master key then cross signing is set up and we require UIA to reset
|
|
|
|
if is_cross_signing_setup:
|
2023-03-02 05:34:59 -05:00
|
|
|
await self.auth_handler.validate_user_via_ui_auth(
|
|
|
|
requester,
|
|
|
|
request,
|
|
|
|
body,
|
|
|
|
"reset the device signing key on your account",
|
|
|
|
# Do not allow skipping of UIA auth.
|
|
|
|
can_skip_ui_auth=False,
|
|
|
|
)
|
|
|
|
# Otherwise we don't require UIA since we are setting up cross signing for first time
|
2023-05-10 10:08:43 -04:00
|
|
|
|
2023-03-02 05:34:59 -05:00
|
|
|
else:
|
|
|
|
# Previous behaviour is to always require UIA but allow it to be skipped
|
|
|
|
await self.auth_handler.validate_user_via_ui_auth(
|
|
|
|
requester,
|
|
|
|
request,
|
|
|
|
body,
|
|
|
|
"add a device signing key to your account",
|
|
|
|
# Allow skipping of UI auth since this is frequently called directly
|
|
|
|
# after login and it is silly to ask users to re-auth immediately.
|
|
|
|
can_skip_ui_auth=True,
|
|
|
|
)
|
2019-07-25 11:08:24 -04:00
|
|
|
|
2019-12-05 11:46:37 -05:00
|
|
|
result = await self.e2e_keys_handler.upload_signing_keys_for_user(user_id, body)
|
2019-09-04 22:30:45 -04:00
|
|
|
return 200, result
|
2019-07-25 11:08:24 -04:00
|
|
|
|
|
|
|
|
2019-05-22 16:41:24 -04:00
|
|
|
class SignaturesUploadServlet(RestServlet):
|
|
|
|
"""
|
|
|
|
POST /keys/signatures/upload HTTP/1.1
|
|
|
|
Content-Type: application/json
|
|
|
|
|
|
|
|
{
|
|
|
|
"@alice:example.com": {
|
|
|
|
"<device_id>": {
|
|
|
|
"user_id": "<user_id>",
|
|
|
|
"device_id": "<device_id>",
|
|
|
|
"algorithms": [
|
2020-06-04 15:03:40 -04:00
|
|
|
"m.olm.curve25519-aes-sha2",
|
|
|
|
"m.megolm.v1.aes-sha2"
|
2019-05-22 16:41:24 -04:00
|
|
|
],
|
|
|
|
"keys": {
|
|
|
|
"<algorithm>:<device_id>": "<key_base64>",
|
|
|
|
},
|
|
|
|
"signatures": {
|
|
|
|
"<signing_user_id>": {
|
|
|
|
"<algorithm>:<signing_key_base64>": "<signature_base64>>"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
"""
|
2019-07-22 12:52:39 -04:00
|
|
|
|
2019-07-17 22:11:31 -04:00
|
|
|
PATTERNS = client_patterns("/keys/signatures/upload$")
|
2019-05-22 16:41:24 -04:00
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def __init__(self, hs: "HomeServer"):
|
2020-09-18 09:56:44 -04:00
|
|
|
super().__init__()
|
2019-05-22 16:41:24 -04:00
|
|
|
self.auth = hs.get_auth()
|
|
|
|
self.e2e_keys_handler = hs.get_e2e_keys_handler()
|
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
async def on_POST(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
|
2019-12-05 11:46:37 -05:00
|
|
|
requester = await self.auth.get_user_by_req(request, allow_guest=True)
|
2019-05-22 16:41:24 -04:00
|
|
|
user_id = requester.user.to_string()
|
|
|
|
body = parse_json_object_from_request(request)
|
|
|
|
|
2019-12-05 11:46:37 -05:00
|
|
|
result = await self.e2e_keys_handler.upload_signatures_for_device_keys(
|
2019-05-22 16:41:24 -04:00
|
|
|
user_id, body
|
|
|
|
)
|
2019-09-04 22:30:45 -04:00
|
|
|
return 200, result
|
2019-05-22 16:41:24 -04:00
|
|
|
|
|
|
|
|
2021-08-26 07:53:52 -04:00
|
|
|
def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
|
2015-07-06 13:47:57 -04:00
|
|
|
KeyUploadServlet(hs).register(http_server)
|
|
|
|
KeyQueryServlet(hs).register(http_server)
|
2017-02-01 05:30:03 -05:00
|
|
|
KeyChangesServlet(hs).register(http_server)
|
2015-07-06 13:47:57 -04:00
|
|
|
OneTimeKeyServlet(hs).register(http_server)
|
2023-04-25 13:30:41 -04:00
|
|
|
if hs.config.experimental.msc3983_appservice_otk_claims:
|
|
|
|
UnstableOneTimeKeyServlet(hs).register(http_server)
|
2022-12-02 13:10:05 -05:00
|
|
|
if hs.config.worker.worker_app is None:
|
|
|
|
SigningKeyUploadServlet(hs).register(http_server)
|
|
|
|
SignaturesUploadServlet(hs).register(http_server)
|