summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-11-22 15:05:13 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-13 14:22:18 +0000
commited43a63fcf4173b15210f3097c02b70dcee98f8b (patch)
tree79423404b769629448907ff34351141fb57fd60b
parentMerge branch 'erikj/thread_demo' of github.com:matrix-org/synapse into erikj/... (diff)
downloadsynapse-ed43a63fcf4173b15210f3097c02b70dcee98f8b.tar.xz
Don't verify stuff
-rw-r--r--synapse/federation/federation_base.py1
-rw-r--r--synapse/federation/transport/server.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py

index b7ad729c63..14406f5e70 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py
@@ -136,6 +136,7 @@ class FederationBase(object): * throws a SynapseError if the signature check failed. The deferreds run their callbacks in the sentinel logcontext. """ + return [defer.succeed(p) for p in pdus] deferreds = _check_sigs_on_pdus(self.keyring, pdus) ctx = logcontext.LoggingContext.current_context() diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 3553f418f1..e18a567d01 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py
@@ -125,7 +125,7 @@ class Authenticator(object): 401, "Missing Authorization headers", Codes.UNAUTHORIZED, ) - yield self.keyring.verify_json_for_server(origin, json_request) + # yield self.keyring.verify_json_for_server(origin, json_request) logger.info("Request from %s", origin) request.authenticated_entity = origin