Merge commit '5ffd68dca' into anoa/dinsic_release_1_21_x

* commit '5ffd68dca':
  1.19.2
  Newsfile
  Don't assume that an event has an origin field

Author: anoadragon453

CHANGES.md

@@ -1,3 +1,14 @@
+Synapse 1.19.2 (2020-09-16)
+===========================
+
+Due to the issue below server admins are encouraged to upgrade as soon as possible.
+
+Bugfixes
+--------
+
+- Fix joining rooms over federation that include malformed events. ([\#8324](https://github.com/matrix-org/synapse/issues/8324))
+
+
 Synapse 1.20.0rc3 (2020-09-11)
 ==============================
 

debian/changelog

@@ -1,8 +1,8 @@
-matrix-synapse-py3 (1.19.0ubuntu1) UNRELEASED; urgency=medium
+matrix-synapse-py3 (1.19.2) stable; urgency=medium
 
-  * Use Type=notify in systemd service
+  * New synapse release 1.19.2.
 
- -- Dexter Chua <[email protected]>  Wed, 26 Aug 2020 12:41:36 +0000
+ -- Synapse Packaging team <[email protected]>  Wed, 16 Sep 2020 12:50:30 +0100
 
 matrix-synapse-py3 (1.19.1) stable; urgency=medium
 

synapse/__init__.py

@@ -48,7 +48,7 @@
 except ImportError:
     pass
 
-__version__ = "1.20.0rc3"
+__version__ = "1.19.2"
 
 if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)):
     # We import here so that we don't have to install a bunch of deps when

synapse/federation/federation_client.py

@@ -54,7 +54,7 @@
 from synapse.federation.federation_base import FederationBase, event_from_pdu_json
 from synapse.logging.context import make_deferred_yieldable, preserve_fn
 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.caches.expiringcache import ExpiringCache
 from synapse.util.retryutils import NotRetryingDestination
@@ -386,10 +386,11 @@ async def handle_check_result(pdu: EventBase, deferred: Deferred):
                     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:
                     res = await self.get_pdu(
-                        destinations=[pdu.origin],
+                        destinations=[pdu_origin],
                         event_id=pdu.event_id,
                         room_version=room_version,
                         outlier=outlier,