diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-06-04 09:13:42 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-06-04 09:13:42 +0100 |
| commit | aeb226332075964e704006bd6989faa173d63576 (patch) | |
| tree | c2a1785140a15ba665e04e5b8ec279346411958d /synapse/groups/attestations.py | |
| parent | Changelog (diff) | |
| parent | Hawkowl/fix missing auth (#5328) (diff) | |
| download | synapse-aeb226332075964e704006bd6989faa173d63576.tar.xz | |
Merge branch 'develop' into babolivier/port_db_account_validity
Diffstat (limited to 'synapse/groups/attestations.py')
| -rw-r--r-- | synapse/groups/attestations.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/groups/attestations.py b/synapse/groups/attestations.py index 786149be65..fa6b641ee1 100644 --- a/synapse/groups/attestations.py +++ b/synapse/groups/attestations.py @@ -97,10 +97,11 @@ class GroupAttestationSigning(object): # TODO: We also want to check that *new* attestations that people give # us to store are valid for at least a little while. - if valid_until_ms < self.clock.time_msec(): + now = self.clock.time_msec() + if valid_until_ms < now: raise SynapseError(400, "Attestation expired") - yield self.keyring.verify_json_for_server(server_name, attestation) + yield self.keyring.verify_json_for_server(server_name, attestation, now) def create_attestation(self, group_id, user_id): """Create an attestation for the group_id and user_id with default |