Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add hash of current state to events

This commit is contained in:
Erik Johnston 2014-11-07 11:36:40 +00:00
parent 3b4dec442d
commit 97a096b507
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
synapse/api/events/__init__.py
View File

@ -75,6 +75,7 @@ class SynapseEvent(JsonEncodedObject):
"signatures", "signatures",
"prev_state", "prev_state",
"auth_events", "auth_events",
"state_hash",
] ]
required_keys = [ required_keys = [

11
synapse/crypto/event_signing.py
View File

@ -45,7 +45,7 @@ def check_event_content_hash(event, hash_algorithm=hashlib.sha256):
def _compute_content_hash(event, hash_algorithm): def _compute_content_hash(event, hash_algorithm):
event_json = event.get_full_dict() event_json = event.get_full_dict()
#TODO: We need to sign the JSON that is going out via fedaration. # TODO: We need to sign the JSON that is going out via fedaration.
event_json.pop("age_ts", None) event_json.pop("age_ts", None)
event_json.pop("unsigned", None) event_json.pop("unsigned", None)
event_json.pop("signatures", None) event_json.pop("signatures", None)
@ -81,6 +81,15 @@ def compute_event_signature(event, signature_name, signing_key):
def add_hashes_and_signatures(event, signature_name, signing_key, def add_hashes_and_signatures(event, signature_name, signing_key,
hash_algorithm=hashlib.sha256): hash_algorithm=hashlib.sha256):
if hasattr(event, "old_state_events"):
state_json_bytes = encode_canonical_json(
[e.event_id for e in event.old_state_events.values()]
)
hashed = hash_algorithm(state_json_bytes)
event.state_hash = {
hashed.name: encode_base64(hashed.digest())
}
hashed = _compute_content_hash(event, hash_algorithm=hash_algorithm) hashed = _compute_content_hash(event, hash_algorithm=hash_algorithm)
if not hasattr(event, "hashes"): if not hasattr(event, "hashes"):