summary refs log tree commit diff
path: root/synapse/federation/transport
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-04 16:12:57 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-05 10:46:26 +0100
commitcea9750d112cf74790fb8c16482a0068717954d5 (patch)
tree73a8c25947705e074a5d1e85ec0fbb5393f9e3a1 /synapse/federation/transport
parentAdd a test room version where we enforce key validity (#5348) (diff)
downloadsynapse-cea9750d112cf74790fb8c16482a0068717954d5.tar.xz
Associate a request_name with each verify request, for logging
Also:
* rename VerifyKeyRequest->VerifyJsonRequest
* calculate key_ids on VerifyJsonRequest construction
* refactor things to pass around VerifyJsonRequests instead of 4-tuples
Diffstat (limited to 'synapse/federation/transport')
-rw-r--r--synapse/federation/transport/server.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 0db8858cf1..949a5fb2aa 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -140,7 +140,9 @@ class Authenticator(object):
                 401, "Missing Authorization headers", Codes.UNAUTHORIZED,
             )
 
-        yield self.keyring.verify_json_for_server(origin, json_request, now)
+        yield self.keyring.verify_json_for_server(
+            origin, json_request, now, "Incoming request"
+        )
 
         logger.info("Request from %s", origin)
         request.authenticated_entity = origin