mirror of
https://mau.dev/maunium/synapse.git
synced 2024-12-15 02:13:52 +01:00
Merge pull request from GHSA-mp92-3jfm-3575
This commit is contained in:
parent
79f48b2b4f
commit
daec55e1fe
3 changed files with 16 additions and 1 deletions
|
@ -84,7 +84,7 @@ from synapse.replication.http.federation import (
|
||||||
from synapse.storage.databases.main.lock import Lock
|
from synapse.storage.databases.main.lock import Lock
|
||||||
from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
|
from synapse.storage.databases.main.roommember import extract_heroes_from_room_summary
|
||||||
from synapse.storage.roommember import MemberSummary
|
from synapse.storage.roommember import MemberSummary
|
||||||
from synapse.types import JsonDict, StateMap, get_domain_from_id
|
from synapse.types import JsonDict, StateMap, get_domain_from_id, UserID
|
||||||
from synapse.util import unwrapFirstError
|
from synapse.util import unwrapFirstError
|
||||||
from synapse.util.async_helpers import Linearizer, concurrently_execute, gather_results
|
from synapse.util.async_helpers import Linearizer, concurrently_execute, gather_results
|
||||||
from synapse.util.caches.response_cache import ResponseCache
|
from synapse.util.caches.response_cache import ResponseCache
|
||||||
|
@ -999,6 +999,12 @@ class FederationServer(FederationBase):
|
||||||
async def on_claim_client_keys(
|
async def on_claim_client_keys(
|
||||||
self, query: List[Tuple[str, str, str, int]], always_include_fallback_keys: bool
|
self, query: List[Tuple[str, str, str, int]], always_include_fallback_keys: bool
|
||||||
) -> Dict[str, Any]:
|
) -> Dict[str, Any]:
|
||||||
|
if any(
|
||||||
|
not self.hs.is_mine(UserID.from_string(user_id))
|
||||||
|
for user_id, _, _, _ in query
|
||||||
|
):
|
||||||
|
raise SynapseError(400, "User is not hosted on this homeserver")
|
||||||
|
|
||||||
log_kv({"message": "Claiming one time keys.", "user, device pairs": query})
|
log_kv({"message": "Claiming one time keys.", "user, device pairs": query})
|
||||||
results = await self._e2e_keys_handler.claim_local_one_time_keys(
|
results = await self._e2e_keys_handler.claim_local_one_time_keys(
|
||||||
query, always_include_fallback_keys=always_include_fallback_keys
|
query, always_include_fallback_keys=always_include_fallback_keys
|
||||||
|
|
|
@ -328,6 +328,9 @@ class DeviceWorkerHandler:
|
||||||
return result
|
return result
|
||||||
|
|
||||||
async def on_federation_query_user_devices(self, user_id: str) -> JsonDict:
|
async def on_federation_query_user_devices(self, user_id: str) -> JsonDict:
|
||||||
|
if not self.hs.is_mine(UserID.from_string(user_id)):
|
||||||
|
raise SynapseError(400, "User is not hosted on this homeserver")
|
||||||
|
|
||||||
stream_id, devices = await self.store.get_e2e_device_keys_for_federation_query(
|
stream_id, devices = await self.store.get_e2e_device_keys_for_federation_query(
|
||||||
user_id
|
user_id
|
||||||
)
|
)
|
||||||
|
|
|
@ -542,6 +542,12 @@ class E2eKeysHandler:
|
||||||
device_keys_query: Dict[str, Optional[List[str]]] = query_body.get(
|
device_keys_query: Dict[str, Optional[List[str]]] = query_body.get(
|
||||||
"device_keys", {}
|
"device_keys", {}
|
||||||
)
|
)
|
||||||
|
if any(
|
||||||
|
not self.is_mine(UserID.from_string(user_id))
|
||||||
|
for user_id in device_keys_query
|
||||||
|
):
|
||||||
|
raise SynapseError(400, "User is not hosted on this homeserver")
|
||||||
|
|
||||||
res = await self.query_local_devices(
|
res = await self.query_local_devices(
|
||||||
device_keys_query,
|
device_keys_query,
|
||||||
include_displaynames=(
|
include_displaynames=(
|
||||||
|
|
Loading…
Reference in a new issue