Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-19 02:54:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2290 from matrix-org/erikj/ensure_round_trip

Browse Source 
Reject local events that don't round trip the DB
This commit is contained in:
Erik Johnston 2017-06-26 15:12:02 +01:00 committed by GitHub
commit d04d672a80
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/handlers/message.py
View File

@ -34,6 +34,7 @@ from canonicaljson import encode_canonical_json
import logging import logging
import random import random
import ujson
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -498,6 +499,14 @@ class MessageHandler(BaseHandler):
logger.warn("Denying new event %r because %s", event, err) logger.warn("Denying new event %r because %s", event, err)
raise err raise err
# Ensure that we can round trip before trying to persist in db
try:
dump = ujson.dumps(event.content)
ujson.loads(dump)
except:
logger.exception("Failed to encode content: %r", event.content)
raise
yield self.maybe_kick_guest_users(event, context) yield self.maybe_kick_guest_users(event, context)
if event.type == EventTypes.CanonicalAlias: if event.type == EventTypes.CanonicalAlias: