From 48f73a30f758584c98abde4c1a2c12601ef53276 Mon Sep 17 00:00:00 2001 From: Joseph Weston Date: Mon, 25 Feb 2019 20:46:19 +0100 Subject: [PATCH 1/2] make 'event_id' a required parameter in federated state requests As per the spec: https://matrix.org/docs/spec/server_server/r0.1.1.html#id40 Signed-off-by: Joseph Weston --- synapse/federation/transport/server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index a2396ab46670..c9fc1a8380fe 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -393,7 +393,7 @@ def on_GET(self, origin, content, query, context): return self.handler.on_context_state_request( origin, context, - parse_string_from_args(query, "event_id", None), + parse_string_from_args(query, "event_id", None, required=True), ) From 9445a6bd7416f364500092bb5fca8fc0179011d1 Mon Sep 17 00:00:00 2001 From: Joseph Weston Date: Mon, 25 Feb 2019 20:51:20 +0100 Subject: [PATCH 2/2] add changelog entry for bugfix Signed-off-by: Joseph Weston --- changelog.d/4740.bugfix | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/4740.bugfix diff --git a/changelog.d/4740.bugfix b/changelog.d/4740.bugfix new file mode 100644 index 000000000000..f82bb4227a8e --- /dev/null +++ b/changelog.d/4740.bugfix @@ -0,0 +1 @@ +'event_id' is now a required parameter in federated state requests, as per the matrix spec.