This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add a user directory #2252
Merged
Merged
Add a user directory #2252
Changes from 21 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
eeb2f9e
Add user_directory to database
erikjohnston 42137ef
Don't go round in circles
erikjohnston 3e123b8
Start later
erikjohnston 1685245
Add call later
erikjohnston b5db4ed
Update room column when room becomes unpublic
erikjohnston 3b5f22c
Add search
erikjohnston 45a5df5
Add REST API
erikjohnston 535c99f
Use POST
erikjohnston 293ef29
Weight differently
erikjohnston 63fda37
Add comments
erikjohnston 350622a
Handle the server leaving a public room
erikjohnston dc51af3
Pull max id from correct table
erikjohnston 5d79d72
Split out directory and search tables
erikjohnston 304880d
Add stream change cache
erikjohnston 63c58c2
Limit number of things we fetch out of the db
erikjohnston 4abcff0
Fix typo
erikjohnston f091061
Fix tests
erikjohnston f979149
Typos
erikjohnston b2d8d07
Lifts things into separate function
erikjohnston f1378ae
Convert to int
erikjohnston cc7609a
Comment briefly on how we keep user_directory up to date
erikjohnston 5dd1b2c
Use unique indices
erikjohnston f5cc22b
Comment on why arbitrary comments
erikjohnston a757dd4
Use prefix matching
erikjohnston 036362e
Order by if they have profile info
erikjohnston 0fe6f3c
Bug fixes and logging
erikjohnston 9c7db24
Fix removing users
erikjohnston 59dbb47
Remove spurious inlineCallbacks
erikjohnston 8be6fd9
Check if host is still in room
erikjohnston 7233341
Comments
erikjohnston 02a6108
Tweak search query
erikjohnston d5477c7
Tweak search query
erikjohnston 21e255a
Split the table in two
erikjohnston 4d039aa
Fix sqlite
erikjohnston File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,345 @@ | ||
# -*- coding: utf-8 -*- | ||
# Copyright 2017 Vector Creations Ltd | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import logging | ||
|
||
from twisted.internet import defer | ||
|
||
from synapse.api.constants import EventTypes, JoinRules, Membership | ||
from synapse.storage.roommember import ProfileInfo | ||
from synapse.util.metrics import Measure | ||
|
||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class UserDirectoyHandler(object): | ||
"""Handles querying of and keeping updated the user_directory. | ||
|
||
N.B.: ASSUMES IT IS THE ONLY THING THAT MODIFIES THE USER DIRECTORY | ||
|
||
The user directory is filled with users who this server can see are joined to a | ||
world_readable or publically joinable room. We keep a database table up to date | ||
by streaming changes of the current state and recalculating whether users should | ||
be in the directory or not when necessary. | ||
|
||
For each user in the directory we also store a room_id which is public and that the | ||
user is joined to. This allows us to ignore history_visibility and join_rules changes | ||
for that user in all other public rooms, as we know they'll still be in at least | ||
one public room. | ||
""" | ||
|
||
def __init__(self, hs): | ||
self.store = hs.get_datastore() | ||
self.state = hs.get_state_handler() | ||
self.server_name = hs.hostname | ||
self.clock = hs.get_clock() | ||
|
||
# When start up for the first time we need to populate the user_directory. | ||
# This is a set of user_id's we've inserted already | ||
self.initially_handled_users = set() | ||
|
||
# The current position in the current_state_delta stream | ||
self.pos = None | ||
|
||
# Guard to ensure we only process deltas one at a time | ||
self._is_processing = False | ||
|
||
# We kick this off so that we don't have to wait for a change before | ||
# we start populating the user directory | ||
self.clock.call_later(0, self.notify_new_event) | ||
|
||
def search_users(self, search_term, limit): | ||
"""Searches for users in directory | ||
|
||
Returns: | ||
dict of the form:: | ||
|
||
{ | ||
"limited": <bool>, # whether there were more results or not | ||
"results": [ # Ordered by best match first | ||
{ | ||
"user_id": <user_id>, | ||
"display_name": <display_name>, | ||
"avatar_url": <avatar_url> | ||
} | ||
] | ||
} | ||
""" | ||
return self.store.search_user_dir(search_term, limit) | ||
|
||
@defer.inlineCallbacks | ||
def notify_new_event(self): | ||
"""Called when there may be more deltas to process | ||
""" | ||
if self._is_processing: | ||
return | ||
|
||
self._is_processing = True | ||
try: | ||
yield self._unsafe_process() | ||
finally: | ||
self._is_processing = False | ||
|
||
@defer.inlineCallbacks | ||
def _unsafe_process(self): | ||
# If self.pos is None then means we haven't fetched it from DB | ||
if self.pos is None: | ||
self.pos = yield self.store.get_user_directory_stream_pos() | ||
|
||
# If still None then we need to do the initial fill of directory | ||
if self.pos is None: | ||
yield self._do_initial_spam() | ||
self.pos = yield self.store.get_user_directory_stream_pos() | ||
|
||
# Loop round handling deltas until we're up to date | ||
while True: | ||
with Measure(self.clock, "user_dir_delta"): | ||
deltas = yield self.store.get_current_state_deltas(self.pos) | ||
if not deltas: | ||
return | ||
|
||
yield self._handle_deltas(deltas) | ||
|
||
self.pos = deltas[-1]["stream_id"] | ||
yield self.store.update_user_directory_stream_pos(self.pos) | ||
|
||
@defer.inlineCallbacks | ||
def _do_initial_spam(self): | ||
"""Populates the user_directory from the current state of the DB, used | ||
when synapse first starts with user_directory support | ||
""" | ||
new_pos = yield self.store.get_max_stream_id_in_current_state_deltas() | ||
|
||
# Delete any existing entries just in case there are any | ||
yield self.store.delete_all_from_user_dir() | ||
|
||
# We process by going through each existing room at a time. | ||
room_ids = yield self.store.get_all_rooms() | ||
|
||
for room_id in room_ids: | ||
yield self._handle_intial_room(room_id) | ||
|
||
self.initially_handled_users = None | ||
|
||
yield self.store.update_user_directory_stream_pos(new_pos) | ||
|
||
@defer.inlineCallbacks | ||
def _handle_intial_room(self, room_id): | ||
"""Called when we initially fill out user_directory one room at a time | ||
""" | ||
is_in_room = yield self.state.get_is_host_in_room(room_id, self.server_name) | ||
if not is_in_room: | ||
return | ||
|
||
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(room_id) | ||
if not is_public: | ||
return | ||
|
||
users_with_profile = yield self.state.get_current_user_in_room(room_id) | ||
unhandled_users = set(users_with_profile) - self.initially_handled_users | ||
|
||
yield self.store.add_profiles_to_user_dir( | ||
room_id, { | ||
user_id: users_with_profile[user_id] for user_id in unhandled_users | ||
} | ||
) | ||
|
||
self.initially_handled_users |= unhandled_users | ||
|
||
@defer.inlineCallbacks | ||
def _handle_deltas(self, deltas): | ||
"""Called with the state deltas to process | ||
""" | ||
for delta in deltas: | ||
typ = delta["type"] | ||
state_key = delta["state_key"] | ||
room_id = delta["room_id"] | ||
event_id = delta["event_id"] | ||
prev_event_id = delta["prev_event_id"] | ||
|
||
# For join rule and visibility changes we need to check if the room | ||
# may have become public or not and add/remove the users in said room | ||
if typ in (EventTypes.RoomHistoryVisibility, EventTypes.JoinRules): | ||
yield self._handle_room_publicity_change( | ||
room_id, prev_event_id, event_id, typ, | ||
) | ||
elif typ == EventTypes.Member: | ||
change = yield self._get_key_change( | ||
prev_event_id, event_id, | ||
key_name="membership", | ||
public_value=Membership.JOIN, | ||
) | ||
|
||
if change is None: | ||
continue | ||
|
||
if not change: | ||
# Need to check if the server left the room entirely, if so | ||
# we might need to remove all the users in that room | ||
is_in_room = yield self.state.get_is_host_in_room( | ||
room_id, self.server_name, | ||
) | ||
if not is_in_room: | ||
# Fetch all the users that we marked as being in user | ||
# directory due to being in the room and then check if | ||
# need to remove those users or not | ||
user_ids = yield self.store.get_users_in_dir_due_to_room(room_id) | ||
for user_id in user_ids: | ||
yield self._handle_remove_user(room_id, user_id) | ||
return | ||
|
||
if change: # The user joined | ||
event = yield self.store.get_event(event_id) | ||
profile = ProfileInfo( | ||
avatar_url=event.content.get("avatar_url"), | ||
display_name=event.content.get("displayname"), | ||
) | ||
|
||
yield self._handle_new_user(room_id, state_key, profile) | ||
else: # The user left | ||
yield self._handle_remove_user(room_id, state_key) | ||
|
||
def _handle_room_publicity_change(self, room_id, prev_event_id, event_id, typ): | ||
"""Handle a room having potentially changed from/to world_readable/publically | ||
joinable. | ||
|
||
Args: | ||
room_id (str) | ||
prev_event_id (str|None): The previous event before the state change | ||
event_id (str|None): The new event after the state change | ||
typ (str): Type of the event | ||
""" | ||
if typ == EventTypes.RoomHistoryVisibility: | ||
change = yield self._get_key_change( | ||
prev_event_id, event_id, | ||
key_name="history_visibility", | ||
public_value="world_readable", | ||
) | ||
elif typ == EventTypes.JoinRules: | ||
change = yield self._get_key_change( | ||
prev_event_id, event_id, | ||
key_name="join_rules", | ||
public_value=JoinRules.PUBLIC, | ||
) | ||
else: | ||
raise Exception("Invalid event type") | ||
# If change is None, no change. True => become world_readable/public, | ||
# False => was world_readable/public | ||
if change is None: | ||
return | ||
|
||
# There's been a change to or from being world readable. | ||
|
||
is_public = yield self.store.is_room_world_readable_or_publicly_joinable( | ||
room_id | ||
) | ||
|
||
if change and not is_public: | ||
# If we became world readable but room isn't currently public then | ||
# we ignore the change | ||
return | ||
elif not change and is_public: | ||
# If we stopped being world readable but are still public, | ||
# ignore the change | ||
return | ||
|
||
users_with_profile = yield self.state.get_current_user_in_room(room_id) | ||
for user_id, profile in users_with_profile.iteritems(): | ||
if change: | ||
yield self._handle_new_user(room_id, user_id, profile) | ||
else: | ||
yield self._handle_remove_user(room_id, user_id) | ||
|
||
@defer.inlineCallbacks | ||
def _handle_new_user(self, room_id, user_id, profile): | ||
"""Called when we might need to add user to directory | ||
|
||
Args: | ||
room_id (str): room_id that user joined or started being public that | ||
user_id (str) | ||
""" | ||
row = yield self.store.get_user_in_directory(user_id) | ||
if row: | ||
return | ||
|
||
yield self.store.add_profiles_to_user_dir(room_id, {user_id: profile}) | ||
|
||
def _handle_remove_user(self, room_id, user_id): | ||
"""Called when we might need to remove user to directory | ||
|
||
Args: | ||
room_id (str): room_id that user left or stopped being public that | ||
user_id (str) | ||
""" | ||
row = yield self.store.get_user_in_directory(user_id) | ||
if not row or row["room_id"] != room_id: | ||
# Either the user wasn't in directory or we're still in a room that | ||
# is public (i.e. the room_id in the database) | ||
return | ||
|
||
# XXX: Make this faster? | ||
rooms = yield self.store.get_rooms_for_user(user_id) | ||
for j_room_id in rooms: | ||
is_public = yield self.store.is_room_world_readable_or_publicly_joinable( | ||
j_room_id | ||
) | ||
|
||
if is_public: | ||
yield self.store.update_user_in_user_dir(user_id, j_room_id) | ||
return | ||
|
||
yield self.store.remove_from_user_dir(user_id) | ||
|
||
@defer.inlineCallbacks | ||
def _get_key_change(self, prev_event_id, event_id, key_name, public_value): | ||
"""Given two events check if the `key_name` field in content changed | ||
from not matching `public_value` to doing so. | ||
|
||
For example, check if `history_visibility` (`key_name`) changed from | ||
`shared` to `world_readable` (`public_value`). | ||
|
||
Returns: | ||
None if the field in the events either both match `public_value` | ||
neither do, i.e. there has been no change. | ||
True if it didnt match `public_value` but now does | ||
False if it did match `public_value` but now doesn't | ||
""" | ||
prev_event = None | ||
event = None | ||
if prev_event_id: | ||
prev_event = yield self.store.get_event(prev_event_id, allow_none=True) | ||
|
||
if event_id: | ||
event = yield self.store.get_event(event_id, allow_none=True) | ||
|
||
if not event and not prev_event: | ||
defer.returnValue(None) | ||
|
||
prev_value = None | ||
value = None | ||
|
||
if prev_event: | ||
prev_value = prev_event.content.get(key_name, None) | ||
|
||
if event: | ||
value = event.content.get(key_name, None) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
|
||
if value == public_value and prev_value != public_value: | ||
defer.returnValue(True) | ||
elif value != public_value and prev_value == public_value: | ||
defer.returnValue(False) | ||
else: | ||
defer.returnValue(None) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You could write this as: old_value_is_public = prev_value == public_value
new_value_is_public = value == public_value
if old_value_is_public == new_value_is_public:
defer.returnValue(None)
else:
defer.returnValue(new_value_is_public) I'm not sure if it is clearer or not. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't find it any more readable tbh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be "or if neither do" ?