summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-12-17 18:09:51 +0100
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-12-17 18:09:51 +0100
commit8c5f252edbb0c62663116c6a541ce8691414996a (patch)
tree88ff46299b4dd435579e172add4e4e29231c1dad /synapse/handlers
parentMerge pull request #447 from matrix-org/rav/fix_search_pagination (diff)
downloadsynapse-8c5f252edbb0c62663116c6a541ce8691414996a.tar.xz
Strip address and such out of 3pid invites
We're not meant to leak that into the graph
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/federation.py13
1 files changed, 12 insertions, 1 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index e7ad48c948..1255241461 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py
@@ -1650,11 +1650,22 @@ class FederationHandler(BaseHandler): sender = invite["sender"] room_id = invite["room_id"] + if "signed" not in invite: + logger.info( + "Discarding received notification of third party invite " + "without signed: %s" % (invite,) + ) + return + + third_party_invite = { + "signed": invite["signed"], + } + event_dict = { "type": EventTypes.Member, "content": { "membership": Membership.INVITE, - "third_party_invite": invite, + "third_party_invite": third_party_invite, }, "room_id": room_id, "sender": sender,