summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-06-06 09:33:09 +0100
committerGitHub <noreply@github.com>2019-06-06 09:33:09 +0100
commit2eb47e5ee74f3e3370d58b38c41da54ff6cd0a42 (patch)
tree1e344eb7213d240c1836635d93ce147a08afcc17 /synapse/federation/transport/server.py
parentMerge pull request #5362 from matrix-org/rav/fix_custom_ca (diff)
parentAssociate a request_name with each verify request, for logging (diff)
downloadsynapse-2eb47e5ee74f3e3370d58b38c41da54ff6cd0a42.tar.xz
Merge pull request #5353 from matrix-org/rav/verify_key_logging
Associate a request_name with each verify request, for logging
Diffstat (limited to 'synapse/federation/transport/server.py')
-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