Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:36:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Don't unfreeze when using FreezeEvent.get_dict, as we are using a JSONEncoder that understands FrozenDict

Browse source
This commit is contained in:
Erik Johnston 2015-02-11 15:44:28 +00:00
parent 4ebbaf0d43
commit ddb816cf60
6 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
synapse/handlers/federation.py
View file

@ -23,6 +23,7 @@ from synapse.api.errors import (
from synapse.api.constants import EventTypes, Membership, RejectedReason
from synapse.util.logutils import log_function
from synapse.util.async import run_on_reactor
from synapse.util.frozenutils import unfreeze
from synapse.crypto.event_signing import (
compute_event_signature, add_hashes_and_signatures,
)
@ -311,9 +312,12 @@ class FederationHandler(BaseHandler):
self.room_queues[room_id] = []
builder = self.event_builder_factory.new(
event.get_pdu_json()
unfreeze(event.get_pdu_json())
)
logger.info("Builder: %s", builder.get_pdu_json())
logger.info("Content: %s", content)
handled_events = set()
try:
@ -324,14 +328,21 @@ class FederationHandler(BaseHandler):
if not hasattr(event, "signatures"):
builder.signatures = {}
logger.info("Content befhahs: %s", builder.content)
add_hashes_and_signatures(
builder,
self.hs.hostname,
self.hs.config.signing_key[0],
)
logger.info("Content aftet hah: %s", builder.content)
logger.info("Content pdu json: %s", builder.get_pdu_json())
new_event = builder.build()
logger.info("Content after build: %s", new_event.content)
# Try the host we successfully got a response to /make_join/
# request first.
try:
@ -340,6 +351,7 @@ class FederationHandler(BaseHandler):
except ValueError:
pass
logger.info(new_event.content)
ret = yield self.replication_layer.send_join(
target_hosts,
new_event
@ -485,6 +497,7 @@ class FederationHandler(BaseHandler):
event.internal_metadata.outlier = False
logger.info(event.content)
context = yield self._handle_new_event(origin, event)
logger.debug(