diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-05 14:03:00 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-05 14:03:00 +0000 |
| commit | f08bd958802679de89e29bc60da7ecf29e130ca2 (patch) | |
| tree | 1b3c14cae9b04223805dccd0d730910f4cd80b64 /synapse/api/auth.py | |
| parent | SYN-202: Log as WARN the 404 'Presence information not visible' errors instea... (diff) | |
| parent | Change context.auth_events to what the auth_events would be bases on context.... (diff) | |
| download | synapse-f08bd958802679de89e29bc60da7ecf29e130ca2.tar.xz | |
Merge pull request #47 from matrix-org/signature_failures
Federation fixes.
Diffstat (limited to 'synapse/api/auth.py')
| -rw-r--r-- | synapse/api/auth.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 37e31d2b6f..7105ee21dc 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -102,8 +102,6 @@ class Auth(object): def check_host_in_room(self, room_id, host): curr_state = yield self.state.get_current_state(room_id) - logger.debug("Got curr_state %s", curr_state) - for event in curr_state: if event.type == EventTypes.Member: try: @@ -360,7 +358,7 @@ class Auth(object): def add_auth_events(self, builder, context): yield run_on_reactor() - auth_ids = self.compute_auth_events(builder, context) + auth_ids = self.compute_auth_events(builder, context.current_state) auth_events_entries = yield self.store.add_event_hashes( auth_ids @@ -374,26 +372,26 @@ class Auth(object): if v.event_id in auth_ids } - def compute_auth_events(self, event, context): + def compute_auth_events(self, event, current_state): if event.type == EventTypes.Create: return [] auth_ids = [] key = (EventTypes.PowerLevels, "", ) - power_level_event = context.current_state.get(key) + power_level_event = current_state.get(key) if power_level_event: auth_ids.append(power_level_event.event_id) key = (EventTypes.JoinRules, "", ) - join_rule_event = context.current_state.get(key) + join_rule_event = current_state.get(key) key = (EventTypes.Member, event.user_id, ) - member_event = context.current_state.get(key) + member_event = current_state.get(key) key = (EventTypes.Create, "", ) - create_event = context.current_state.get(key) + create_event = current_state.get(key) if create_event: auth_ids.append(create_event.event_id) |