MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 23:53:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'erikj/fix_origin_check' into release-v1.19.2

Browse source
This commit is contained in:
Erik Johnston 2020-09-16 12:40:58 +01:00
commit f1c9ded738
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/8324.bugfix Normal file
View file

@ -0,0 +1 @@
Fix fetching events from remote servers that are malformed.

7
synapse/federation/federation_client.py
View file

@ -54,7 +54,7 @@ from synapse.events import EventBase, builder
from synapse.federation.federation_base import FederationBase, event_from_pdu_json from synapse.federation.federation_base import FederationBase, event_from_pdu_json
from synapse.logging.context import make_deferred_yieldable, preserve_fn from synapse.logging.context import make_deferred_yieldable, preserve_fn
from synapse.logging.utils import log_function from synapse.logging.utils import log_function
from synapse.types import JsonDict from synapse.types import JsonDict, get_domain_from_id
from synapse.util import unwrapFirstError from synapse.util import unwrapFirstError
from synapse.util.caches.expiringcache import ExpiringCache from synapse.util.caches.expiringcache import ExpiringCache
from synapse.util.retryutils import NotRetryingDestination from synapse.util.retryutils import NotRetryingDestination
@ -386,10 +386,11 @@ class FederationClient(FederationBase):
pdu.event_id, allow_rejected=True, allow_none=True pdu.event_id, allow_rejected=True, allow_none=True
) )
if not res and pdu.origin != origin: pdu_origin = get_domain_from_id(pdu.sender)
if not res and pdu_origin != origin:
try: try:
res = await self.get_pdu( res = await self.get_pdu(
destinations=[pdu.origin], destinations=[pdu_origin],
event_id=pdu.event_id, event_id=pdu.event_id,
room_version=room_version, room_version=room_version,
outlier=outlier, outlier=outlier,