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

Remove signatures from pdu when computing hashes to use for prev pdus, make sure is_state is a boolean.

This commit is contained in:
Mark Haines 2014-10-17 19:41:32 +01:00
parent dc3c2823ac
commit 8afbece683
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/crypto/event_signing.py
View File

@ -22,6 +22,9 @@ from syutil.base64util import encode_base64, decode_base64
from syutil.crypto.jsonsign import sign_json, verify_signed_json from syutil.crypto.jsonsign import sign_json, verify_signed_json
import hashlib import hashlib
import logging
logger = logging.getLogger(__name__)
def add_event_pdu_content_hash(pdu, hash_algorithm=hashlib.sha256): def add_event_pdu_content_hash(pdu, hash_algorithm=hashlib.sha256):
@ -48,7 +51,7 @@ def check_event_pdu_content_hash(pdu, hash_algorithm=hashlib.sha256):
def _compute_content_hash(pdu, hash_algorithm): def _compute_content_hash(pdu, hash_algorithm):
pdu_json = pdu.get_dict() pdu_json = pdu.get_dict()
#TODO: Make "age_ts" key internal #TODO: Make "age_ts" key internal
pdu_json.pop("age_ts") pdu_json.pop("age_ts", None)
pdu_json.pop("unsigned", None) pdu_json.pop("unsigned", None)
pdu_json.pop("signatures", None) pdu_json.pop("signatures", None)
hashes = pdu_json.pop("hashes", {}) hashes = pdu_json.pop("hashes", {})
@ -60,6 +63,7 @@ def compute_pdu_event_reference_hash(pdu, hash_algorithm=hashlib.sha256):
tmp_pdu = Pdu(**pdu.get_dict()) tmp_pdu = Pdu(**pdu.get_dict())
tmp_pdu = prune_pdu(tmp_pdu) tmp_pdu = prune_pdu(tmp_pdu)
pdu_json = tmp_pdu.get_dict() pdu_json = tmp_pdu.get_dict()
pdu_json.pop("signatures", None)
pdu_json_bytes = encode_canonical_json(pdu_json) pdu_json_bytes = encode_canonical_json(pdu_json)
hashed = hash_algorithm(pdu_json_bytes) hashed = hash_algorithm(pdu_json_bytes)
return (hashed.name, hashed.digest()) return (hashed.name, hashed.digest())

2
synapse/federation/units.py
View File

@ -101,7 +101,7 @@ class Pdu(JsonEncodedObject):
super(Pdu, self).__init__( super(Pdu, self).__init__(
destinations=destinations, destinations=destinations,
is_state=is_state, is_state=bool(is_state),
prev_pdus=prev_pdus, prev_pdus=prev_pdus,
outlier=outlier, outlier=outlier,
hashes=hashes, hashes=hashes,