diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-02 14:26:54 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-02 16:30:52 +0100 |
| commit | 22716774d587354229149c752ace3b581013a077 (patch) | |
| tree | bcf158448e4cebffff855980ad6fd76f18d4e1dd | |
| parent | Add a timeout (diff) | |
| download | synapse-22716774d587354229149c752ace3b581013a077.tar.xz | |
Don't about JSON when warning about content tampering
| -rw-r--r-- | synapse/federation/federation_base.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index f0430b2cb1..6799ed05ac 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -18,8 +18,6 @@ from twisted.internet import defer from synapse.events.utils import prune_event -from syutil.jsonutil import encode_canonical_json - from synapse.crypto.event_signing import check_event_content_hash from synapse.api.errors import SynapseError @@ -120,16 +118,15 @@ class FederationBase(object): ) except SynapseError: logger.warn( - "Signature check failed for %s redacted to %s", - encode_canonical_json(pdu.get_pdu_json()), - encode_canonical_json(redacted_pdu_json), + "Signature check failed for %s, redacting", + pdu.event_id, ) raise if not check_event_content_hash(pdu): logger.warn( - "Event content has been tampered, redacting %s, %s", - pdu.event_id, encode_canonical_json(pdu.get_dict()) + "Event content has been tampered, redacting.", + pdu.event_id, ) defer.returnValue(redacted_event) |