From d331119758d0b5eea0c47c7292c84a01c1d060a8 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 10 Jun 2019 11:30:10 +0100 Subject: Hide new users from the user directory if enabled in the server config. --- synapse/config/server.py | 11 +++++++++++ synapse/handlers/register.py | 10 ++++++++++ 2 files changed, 21 insertions(+) (limited to 'synapse') diff --git a/synapse/config/server.py b/synapse/config/server.py index 1b8968608e..2913f64dd2 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -178,6 +178,12 @@ class ServerConfig(Config): # events with profile information that differ from the target's global profile. self.allow_per_room_profiles = config.get("allow_per_room_profiles", True) + # Whether to show the users on this homeserver in the user directory. Defaults to + # True. + self.show_users_in_user_directory = config.get( + "show_users_in_user_directory", True, + ) + self.listeners = [] for listener in config.get("listeners", []): if not isinstance(listener.get("port", None), int): @@ -577,6 +583,11 @@ class ServerConfig(Config): # Defaults to 'true'. # #allow_per_room_profiles: false + + # Whether to show the users on this homeserver in the user directory. Defaults to + # 'true'. + # + #show_users_in_user_directory: false """ % locals() def read_arguments(self, args): diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index 68d87163af..bd8f522fad 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -74,6 +74,8 @@ class RegistrationHandler(BaseHandler): ) self._server_notices_mxid = hs.config.server_notices_mxid + self._show_in_user_directory = self.hs.show_users_in_user_directory + if hs.config.worker_app: self._register_client = ReplicationRegisterServlet.make_client(hs) self._register_device_client = ( @@ -289,6 +291,14 @@ class RegistrationHandler(BaseHandler): user_id, threepid_dict, None, False, ) + # Prevent the new user from showing up in the user directory if the server + # mandates it. + if self._show_in_user_directory: + yield self.store.add_account_data_for_user( + user_id, "im.vector.hide_profile", {'hide_profile': True}, + ) + yield self.profile_handler.set_active(user, False, True) + defer.returnValue((user_id, token)) @defer.inlineCallbacks -- cgit 1.5.1 From 0e63dd89a49f5448b08f89100c053cb95fab620c Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 10 Jun 2019 12:10:29 +0100 Subject: Fix condition --- synapse/handlers/register.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index bd8f522fad..c73f636122 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -293,7 +293,7 @@ class RegistrationHandler(BaseHandler): # Prevent the new user from showing up in the user directory if the server # mandates it. - if self._show_in_user_directory: + if not self._show_in_user_directory: yield self.store.add_account_data_for_user( user_id, "im.vector.hide_profile", {'hide_profile': True}, ) -- cgit 1.5.1 From deee82aebc95b471988002fcea17768c3e57b53f Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Mon, 10 Jun 2019 17:16:03 +0100 Subject: Fix variable definition --- synapse/handlers/register.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'synapse') diff --git a/synapse/handlers/register.py b/synapse/handlers/register.py index c73f636122..744ead6c01 100644 --- a/synapse/handlers/register.py +++ b/synapse/handlers/register.py @@ -74,7 +74,7 @@ class RegistrationHandler(BaseHandler): ) self._server_notices_mxid = hs.config.server_notices_mxid - self._show_in_user_directory = self.hs.show_users_in_user_directory + self._show_in_user_directory = self.hs.config.show_users_in_user_directory if hs.config.worker_app: self._register_client = ReplicationRegisterServlet.make_client(hs) -- cgit 1.5.1 From 1c7628eb3aee3c182b3ef4b39811915becd9e7e8 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Wed, 12 Jun 2019 16:36:28 +0100 Subject: Lint --- synapse/rest/client/v1/profile.py | 1 - 1 file changed, 1 deletion(-) (limited to 'synapse') diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py index 202a9f21ad..064bcddaeb 100644 --- a/synapse/rest/client/v1/profile.py +++ b/synapse/rest/client/v1/profile.py @@ -22,7 +22,6 @@ from synapse.http.servlet import RestServlet, parse_json_object_from_request from synapse.rest.client.v2_alpha._base import client_patterns from synapse.types import UserID - logger = logging.getLogger(__name__) -- cgit 1.5.1