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

Add an option to disable search for homeservers which may not be interested in it #4230

Merged
merged 4 commits into from Dec 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4230.feature
@@ -0,0 +1 @@
Add an option to disable search for homeservers that may not be interested in it.
12 changes: 11 additions & 1 deletion synapse/config/server.py
Expand Up @@ -62,6 +62,11 @@ def read_config(self, config):
# master, potentially causing inconsistency.
self.enable_media_repo = config.get("enable_media_repo", True)

# whether to enable search. If disabled, new entries will not be inserted
# into the search tables and they will not be indexed. Users will receive
# errors when attempting to search for messages.
self.enable_search = config.get("enable_search", True)

self.filter_timeline_limit = config.get("filter_timeline_limit", -1)

# Whether we should block invites sent to users on this server
Expand Down Expand Up @@ -384,7 +389,12 @@ def default_config(self, server_name, **kwargs):
# mau_limit_reserved_threepids:
# - medium: 'email'
# address: 'reserved_user@example.com'

#
# Room searching
#
# If disabled, new messages will not be indexed for searching and users
# will receive errors when searching for messages. Defaults to enabled.
# enable_search: true
""" % locals()

def read_arguments(self, args):
Expand Down
3 changes: 3 additions & 0 deletions synapse/handlers/search.py
Expand Up @@ -50,6 +50,9 @@ def search(self, user, content, batch=None):
dict to be returned to the client with results of search
"""

if not self.hs.config.enable_search:
raise SynapseError(400, "Search is disabled on this homeserver")

batch_group = None
batch_group_key = None
batch_token = None
Expand Down
6 changes: 6 additions & 0 deletions synapse/storage/search.py
Expand Up @@ -45,6 +45,10 @@ class SearchStore(BackgroundUpdateStore):

def __init__(self, db_conn, hs):
super(SearchStore, self).__init__(db_conn, hs)

if not hs.config.enable_search:
return

self.register_background_update_handler(
self.EVENT_SEARCH_UPDATE_NAME, self._background_reindex_search
)
Expand Down Expand Up @@ -316,6 +320,8 @@ def store_search_entries_txn(self, txn, entries):
entries (iterable[SearchEntry]):
entries to be added to the table
"""
if not self.hs.config.enable_search:
return
if isinstance(self.database_engine, PostgresEngine):
sql = (
"INSERT INTO event_search"
Expand Down