From ba99b63efeb9ecb0e944c8a58db4edce1f8a8ca8 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 29 Oct 2019 14:10:59 +0000 Subject: [PATCH 1/4] Fix log line that was printing undefined value --- synapse/handlers/federation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 488058fe68a4..0eb5a631f370 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1250,7 +1250,7 @@ def on_make_join_request(self, origin, room_id, user_id): builder=builder ) except AuthError as e: - logger.warn("Failed to create join %r because %s", event, e) + logger.warn("Failed to create join %s because %s", room_id, e) raise e event_allowed = yield self.third_party_event_rules.check_event_allowed( From 0068c3fb9bb412838842dd871225fd885520ca8c Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 29 Oct 2019 14:13:56 +0000 Subject: [PATCH 2/4] Add changelog --- changelog.d/6278.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6278.misc diff --git a/changelog.d/6278.misc b/changelog.d/6278.misc new file mode 100644 index 000000000000..5fe677110495 --- /dev/null +++ b/changelog.d/6278.misc @@ -0,0 +1 @@ +Update log line to not use an undefined variable. \ No newline at end of file From 440417cfc1512f63d10ce73bed94a781dadf5872 Mon Sep 17 00:00:00 2001 From: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Date: Wed, 30 Oct 2019 11:05:31 +0000 Subject: [PATCH 3/4] Apply suggestions from code review Co-Authored-By: Erik Johnston --- changelog.d/6278.misc | 2 +- synapse/handlers/federation.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog.d/6278.misc b/changelog.d/6278.misc index 5fe677110495..c1072704618a 100644 --- a/changelog.d/6278.misc +++ b/changelog.d/6278.misc @@ -1 +1 @@ -Update log line to not use an undefined variable. \ No newline at end of file +Fix exception when remote servers attempt to join a room that they're not allowed to join. diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 0eb5a631f370..2da520e6e857 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1250,7 +1250,7 @@ def on_make_join_request(self, origin, room_id, user_id): builder=builder ) except AuthError as e: - logger.warn("Failed to create join %s because %s", room_id, e) + logger.warn("Failed to create join to %s because %s", room_id, e) raise e event_allowed = yield self.third_party_event_rules.check_event_allowed( From 338f581eef3d730a6d51b17390a7ab4a00eb1f5c Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 30 Oct 2019 11:06:13 +0000 Subject: [PATCH 4/4] Change changelog from misc to bugfix --- changelog.d/{6278.misc => 6278.bugfix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename changelog.d/{6278.misc => 6278.bugfix} (100%) diff --git a/changelog.d/6278.misc b/changelog.d/6278.bugfix similarity index 100% rename from changelog.d/6278.misc rename to changelog.d/6278.bugfix