diff options
| author | Erik Johnston <erik@matrix.org> | 2015-06-12 11:53:03 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-06-12 11:53:03 +0100 |
| commit | 405f8c47961c46aa225aa4b30f3774528929d9ed (patch) | |
| tree | a266f69bc3147bf232595794bb6d36e024330ef9 /synapse/federation/federation_base.py | |
| parent | Merge branch 'release-v0.9.1' of github.com:matrix-org/synapse (diff) | |
| parent | Mention config option name (diff) | |
| download | synapse-405f8c47961c46aa225aa4b30f3774528929d9ed.tar.xz | |
Merge branch 'release-v0.9.2' v0.9.2
Diffstat (limited to 'synapse/federation/federation_base.py')
| -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..299493af91 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", + 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) |