summary refs log tree commit diff
path: root/synapse/federation/pdu_codec.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-03 17:51:42 +0000
committerErik Johnston <erik@matrix.org>2014-11-03 17:51:42 +0000
commit68698e0ac8c39083f6ab7d377a48b5bead3d3598 (patch)
treed2b722e1743d024cf8dcece32f0b8c07fb1bcf0e /synapse/federation/pdu_codec.py
parentMerge branch 'event_signing' of github.com:matrix-org/synapse into federation... (diff)
downloadsynapse-68698e0ac8c39083f6ab7d377a48b5bead3d3598.tar.xz
Fix bugs in generating event signatures and hashing
Diffstat (limited to 'synapse/federation/pdu_codec.py')
-rw-r--r--synapse/federation/pdu_codec.py13
1 files changed, 1 insertions, 12 deletions
diff --git a/synapse/federation/pdu_codec.py b/synapse/federation/pdu_codec.py
index 5ec97a698e..52c84efb5b 100644
--- a/synapse/federation/pdu_codec.py
+++ b/synapse/federation/pdu_codec.py
@@ -14,10 +14,6 @@
 # limitations under the License.
 
 from .units import Pdu
-from synapse.crypto.event_signing import (
-    add_event_pdu_content_hash, sign_event_pdu
-)
-from synapse.types import EventID
 
 import copy
 
@@ -49,17 +45,10 @@ class PduCodec(object):
     def pdu_from_event(self, event):
         d = event.get_full_dict()
 
-        if hasattr(event, "state_key"):
-            d["is_state"] = True
-
         kwargs = copy.deepcopy(event.unrecognized_keys)
         kwargs.update({
             k: v for k, v in d.items()
         })
 
-        if "origin_server_ts" not in kwargs:
-            kwargs["origin_server_ts"] = int(self.clock.time_msec())
-
         pdu = Pdu(**kwargs)
-        pdu = add_event_pdu_content_hash(pdu)
-        return sign_event_pdu(pdu, self.server_name, self.signing_key)
+        return pdu