Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add a user directory #2252

Merged
merged 34 commits into from
Jun 1, 2017
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
eeb2f9e
Add user_directory to database
erikjohnston May 31, 2017
42137ef
Don't go round in circles
erikjohnston May 31, 2017
3e123b8
Start later
erikjohnston May 31, 2017
1685245
Add call later
erikjohnston May 31, 2017
b5db4ed
Update room column when room becomes unpublic
erikjohnston May 31, 2017
3b5f22c
Add search
erikjohnston May 31, 2017
45a5df5
Add REST API
erikjohnston May 31, 2017
535c99f
Use POST
erikjohnston May 31, 2017
293ef29
Weight differently
erikjohnston May 31, 2017
63fda37
Add comments
erikjohnston May 31, 2017
350622a
Handle the server leaving a public room
erikjohnston May 31, 2017
dc51af3
Pull max id from correct table
erikjohnston May 31, 2017
5d79d72
Split out directory and search tables
erikjohnston May 31, 2017
304880d
Add stream change cache
erikjohnston May 31, 2017
63c58c2
Limit number of things we fetch out of the db
erikjohnston May 31, 2017
4abcff0
Fix typo
erikjohnston May 31, 2017
f091061
Fix tests
erikjohnston May 31, 2017
f979149
Typos
erikjohnston May 31, 2017
b2d8d07
Lifts things into separate function
erikjohnston May 31, 2017
f1378ae
Convert to int
erikjohnston May 31, 2017
cc7609a
Comment briefly on how we keep user_directory up to date
erikjohnston May 31, 2017
5dd1b2c
Use unique indices
erikjohnston May 31, 2017
f5cc22b
Comment on why arbitrary comments
erikjohnston May 31, 2017
a757dd4
Use prefix matching
erikjohnston May 31, 2017
036362e
Order by if they have profile info
erikjohnston May 31, 2017
0fe6f3c
Bug fixes and logging
erikjohnston Jun 1, 2017
9c7db24
Fix removing users
erikjohnston Jun 1, 2017
59dbb47
Remove spurious inlineCallbacks
erikjohnston Jun 1, 2017
8be6fd9
Check if host is still in room
erikjohnston Jun 1, 2017
7233341
Comments
erikjohnston Jun 1, 2017
02a6108
Tweak search query
erikjohnston Jun 1, 2017
d5477c7
Tweak search query
erikjohnston Jun 1, 2017
21e255a
Split the table in two
erikjohnston Jun 1, 2017
4d039aa
Fix sqlite
erikjohnston Jun 1, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
345 changes: 345 additions & 0 deletions synapse/handlers/user_directory.py
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.
Copy link
Contributor

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" ?

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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The None is redundant.


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)
Copy link
Contributor

Choose a reason for hiding this comment

The 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.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't find it any more readable tbh

6 changes: 5 additions & 1 deletion synapse/notifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ def __init__(self, hs):

self.clock = hs.get_clock()
self.appservice_handler = hs.get_application_service_handler()
self.user_directory_handler = hs.get_user_directory_handler()

if hs.should_send_federation():
self.federation_sender = hs.get_federation_sender()
Expand Down Expand Up @@ -251,7 +252,10 @@ def _on_new_room_event(self, event, room_stream_id, extra_users=[]):
"""Notify any user streams that are interested in this room event"""
# poke any interested application service.
preserve_fn(self.appservice_handler.notify_interested_services)(
room_stream_id)
room_stream_id
)

preserve_fn(self.user_directory_handler.notify_new_event)()

if self.federation_sender:
preserve_fn(self.federation_sender.notify_new_events)(
Expand Down
2 changes: 2 additions & 0 deletions synapse/rest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
devices,
thirdparty,
sendtodevice,
user_directory,
)

from synapse.http.server import JsonResource
Expand Down Expand Up @@ -100,3 +101,4 @@ def register_servlets(client_resource, hs):
devices.register_servlets(hs, client_resource)
thirdparty.register_servlets(hs, client_resource)
sendtodevice.register_servlets(hs, client_resource)
user_directory.register_servlets(hs, client_resource)
Loading