diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-06-04 16:12:57 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-06-05 10:46:26 +0100 |
| commit | cea9750d112cf74790fb8c16482a0068717954d5 (patch) | |
| tree | 73a8c25947705e074a5d1e85ec0fbb5393f9e3a1 /synapse/federation/federation_base.py | |
| parent | Add a test room version where we enforce key validity (#5348) (diff) | |
| download | synapse-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/federation_base.py')
| -rw-r--r-- | synapse/federation/federation_base.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/federation/federation_base.py b/synapse/federation/federation_base.py index b541913d82..fc5cfb7d83 100644 --- a/synapse/federation/federation_base.py +++ b/synapse/federation/federation_base.py @@ -271,6 +271,7 @@ def _check_sigs_on_pdus(keyring, room_version, pdus): p.sender_domain, p.redacted_pdu_json, p.pdu.origin_server_ts if v.enforce_key_validity else 0, + p.pdu.event_id, ) for p in pdus_to_check_sender ] @@ -306,6 +307,7 @@ def _check_sigs_on_pdus(keyring, room_version, pdus): get_domain_from_id(p.pdu.event_id), p.redacted_pdu_json, p.pdu.origin_server_ts if v.enforce_key_validity else 0, + p.pdu.event_id, ) for p in pdus_to_check_event_id ] |