diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2021-06-23 12:54:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-23 12:54:50 +0100 |
| commit | 8beead66ae48aa11f1e25da42256eb92b8bce099 (patch) | |
| tree | 5f8b22b1c5712f8a5ada8f3f3f0681bdcfd38f3a | |
| parent | Drop Origin & Accept from Access-Control-Allow-Headers value (#10114) (diff) | |
| download | synapse-8beead66ae48aa11f1e25da42256eb92b8bce099.tar.xz | |
Send out invite rejections and knocks over federation (#10223)
ensure that events sent via `send_leave` and `send_knock` are sent on to the rest of the federation.
| -rw-r--r-- | changelog.d/10223.bugfix | 1 | ||||
| -rwxr-xr-x | scripts-dev/complement.sh | 2 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/changelog.d/10223.bugfix b/changelog.d/10223.bugfix new file mode 100644 index 0000000000..4e42f6b608 --- /dev/null +++ b/changelog.d/10223.bugfix @@ -0,0 +1 @@ +Fix a long-standing bug which meant that invite rejections and knocks were not sent out over federation in a timely manner. diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh index ba060104c3..aca32edc17 100755 --- a/scripts-dev/complement.sh +++ b/scripts-dev/complement.sh @@ -65,4 +65,4 @@ if [[ -n "$1" ]]; then fi # Run the tests! -go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests +go test -v -tags synapse_blacklist,msc2946,msc3083,msc2716,msc2403 -count=1 $EXTRA_COMPLEMENT_ARGS ./tests diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 1b566dbf2d..74d169a2ac 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1980,6 +1980,13 @@ class FederationHandler(BaseHandler): event.internal_metadata.outlier = False + # Send this event on behalf of the other server. + # + # The remote server isn't a full participant in the room at this point, so + # may not have an up-to-date list of the other homeservers participating in + # the room, so we send it on their behalf. + event.internal_metadata.send_on_behalf_of = origin + context = await self.state_handler.compute_event_context(event) await self._auth_and_persist_event(origin, event, context) @@ -2084,6 +2091,13 @@ class FederationHandler(BaseHandler): event.internal_metadata.outlier = False + # Send this event on behalf of the other server. + # + # The remote server isn't a full participant in the room at this point, so + # may not have an up-to-date list of the other homeservers participating in + # the room, so we send it on their behalf. + event.internal_metadata.send_on_behalf_of = origin + context = await self.state_handler.compute_event_context(event) event_allowed = await self.third_party_event_rules.check_event_allowed( |