Fix losing incoming EDUs if debug logging enabled (#11890)

David Robertson · web-flow · commit dd7f825118f1 · 2022-02-02T16:25:17.000Z
* Fix losing incoming EDUs if debug logging enabled Fixes #11889. Homeservers should only be affected if the `synapse.8631_debug` logger was enabled for DEBUG mode. I am not sure if this merits a bugfix release: I think the logging can be disabled in config if anyone is affected? But it is still pretty bad.
diff --git a/changelog.d/11890.bugfix b/changelog.d/11890.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in Synapse 1.51.0rc1 where incoming federation transactions containing at least one EDU would be dropped if debug logging was enabled for `synapse.8631_debug`.
diff --git a/synapse/federation/transport/server/federation.py b/synapse/federation/transport/server/federation.py
@@ -109,11 +109,11 @@ async def on_PUT(
             )
 
             if issue_8631_logger.isEnabledFor(logging.DEBUG):
-                DEVICE_UPDATE_EDUS = {"m.device_list_update", "m.signing_key_update"}
+                DEVICE_UPDATE_EDUS = ["m.device_list_update", "m.signing_key_update"]
                 device_list_updates = [
                     edu.content
                     for edu in transaction_data.get("edus", [])
-                    if edu.edu_type in DEVICE_UPDATE_EDUS
+                    if edu.get("edu_type") in DEVICE_UPDATE_EDUS
                 ]
                 if device_list_updates:
                     issue_8631_logger.debug(

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Fix a bug introduced in Synapse 1.51.0rc1 where incoming federation transactions containing at least one EDU would be dropped if debug logging was enabled for `synapse.8631_debug`.
Original file line number	Diff line number	Diff line change
`@@ -109,11 +109,11 @@ async def on_PUT(`
`109`	`109`	`)`
`110`	`110`
`111`	`111`	`if issue_8631_logger.isEnabledFor(logging.DEBUG):`
`112`		`- DEVICE_UPDATE_EDUS = {"m.device_list_update", "m.signing_key_update"}`
	`112`	`+ DEVICE_UPDATE_EDUS = ["m.device_list_update", "m.signing_key_update"]`
`113`	`113`	`device_list_updates = [`
`114`	`114`	`edu.content`
`115`	`115`	`for edu in transaction_data.get("edus", [])`
`116`		`- if edu.edu_type in DEVICE_UPDATE_EDUS`
	`116`	`+ if edu.get("edu_type") in DEVICE_UPDATE_EDUS`
`117`	`117`	`]`
`118`	`118`	`if device_list_updates:`
`119`	`119`	`issue_8631_logger.debug(`