diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-10-18 19:43:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-18 19:43:36 +0200 |
commit | 93eaeec75a2d3be89df0040b1374d339e92bb9b9 (patch) | |
tree | b0f628ee589454ee8012a905116f4696933351d5 /synapse/api | |
parent | Merge branch 'uhoreg/e2e_cross-signing_merged' into develop (diff) | |
download | synapse-93eaeec75a2d3be89df0040b1374d339e92bb9b9.tar.xz |
Remove Auth.check method (#6217)
This method was somewhat redundant, and confusing.
Diffstat (limited to 'synapse/api')
-rw-r--r-- | synapse/api/auth.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index cb50579fd2..cd347fbe1b 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -84,27 +84,10 @@ class Auth(object): ) auth_events = yield self.store.get_events(auth_events_ids) auth_events = {(e.type, e.state_key): e for e in itervalues(auth_events)} - self.check( + event_auth.check( room_version, event, auth_events=auth_events, do_sig_check=do_sig_check ) - def check(self, room_version, event, auth_events, do_sig_check=True): - """ Checks if this event is correctly authed. - - Args: - room_version (str): version of the room - event: the event being checked. - auth_events (dict: event-key -> event): the existing room state. - - - Returns: - True if the auth checks pass. - """ - with Measure(self.clock, "auth.check"): - event_auth.check( - room_version, event, auth_events, do_sig_check=do_sig_check - ) - @defer.inlineCallbacks def check_joined_room(self, room_id, user_id, current_state=None): """Check if the user is currently joined in the room |