mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-10-01 11:49:51 -04:00
158d73ebdd
Revert "Sort internal changes in changelog" Revert "Update CHANGES.md" Revert "1.49.0rc1" Revert "Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505) (#11527)" Revert "Refactors in `_generate_sync_entry_for_rooms` (#11515)" Revert "Correctly register shutdown handler for presence workers (#11518)" Revert "Fix `ModuleApi.looping_background_call` for non-async functions (#11524)" Revert "Fix 'delete room' admin api to work on incomplete rooms (#11523)" Revert "Correctly ignore invites from ignored users (#11511)" Revert "Fix the test breakage introduced by #11435 as a result of concurrent PRs (#11522)" Revert "Stabilise support for MSC2918 refresh tokens as they have now been merged into the Matrix specification. (#11435)" Revert "Save the OIDC session ID (sid) with the device on login (#11482)" Revert "Add admin API to get some information about federation status (#11407)" Revert "Include bundled aggregations in /sync and related fixes (#11478)" Revert "Move `glob_to_regex` and `re_word_boundary` to `matrix-python-common` (#11505)" Revert "Update backward extremity docs to make it clear that it does not indicate whether we have fetched an events' `prev_events` (#11469)" Revert "Support configuring the lifetime of non-refreshable access tokens separately to refreshable access tokens. (#11445)" Revert "Add type hints to `synapse/tests/rest/admin` (#11501)" Revert "Revert accidental commits to develop." Revert "Newsfile" Revert "Give `tests.server.setup_test_homeserver` (nominally!) the same behaviour" Revert "Move `tests.utils.setup_test_homeserver` to `tests.server`" Revert "Convert one of the `setup_test_homeserver`s to `make_test_homeserver_synchronous`" Revert "Disambiguate queries on `state_key` (#11497)" Revert "Comments on the /sync tentacles (#11494)" Revert "Clean up tests.storage.test_appservice (#11492)" Revert "Clean up `tests.storage.test_main` to remove use of legacy code. (#11493)" Revert "Clean up `tests.test_visibility` to remove legacy code. (#11495)" Revert "Minor cleanup on recently ported doc pages (#11466)" Revert "Add most of the missing type hints to `synapse.federation`. (#11483)" Revert "Avoid waiting for zombie processes in `synctl stop` (#11490)" Revert "Fix media repository failing when media store path contains symlinks (#11446)" Revert "Add type annotations to `tests.storage.test_appservice`. (#11488)" Revert "`scripts-dev/sign_json`: support for signing events (#11486)" Revert "Add MSC3030 experimental client and federation API endpoints to get the closest event to a given timestamp (#9445)" Revert "Port wiki pages to documentation website (#11402)" Revert "Add a license header and comment. (#11479)" Revert "Clean-up get_version_string (#11468)" Revert "Link background update controller docs to summary (#11475)" Revert "Additional type hints for config module. (#11465)" Revert "Register the login redirect endpoint for v3. (#11451)" Revert "Update openid.md" Revert "Remove mention of OIDC certification from Dex (#11470)" Revert "Add a note about huge pages to our Postgres doc (#11467)" Revert "Don't start Synapse master process if `worker_app` is set (#11416)" Revert "Expose worker & homeserver as entrypoints in `setup.py` (#11449)" Revert "Bundle relations of relations into the `/relations` result. (#11284)" Revert "Fix `LruCache` corruption bug with a `size_callback` that can return 0 (#11454)" Revert "Eliminate a few `Any`s in `LruCache` type hints (#11453)" Revert "Remove unnecessary `json.dumps` from `tests.rest.admin` (#11461)" Revert "Merge branch 'master' into develop" This reverts commit26b5d2320f
. This reverts commitbce4220f38
. This reverts commit966b5d0fa0
. This reverts commit088d748f2c
. This reverts commit14d593f72d
. This reverts commit2a3ec6facf
. This reverts commiteccc49d755
. This reverts commitb1ecd19c5d
. This reverts commit9c55dedc8c
. This reverts commit2d42e586a8
. This reverts commit2f053f3f82
. This reverts commita15a893df8
. This reverts commit8b4b153c9e
. This reverts commit494ebd7347
. This reverts commita77c369897
. This reverts commit4eb77965cd
. This reverts commit637df95de6
. This reverts commite5f426cd54
. This reverts commit8cd68b8102
. This reverts commit6cae125e20
. This reverts commit7be88fbf48
. This reverts commitb3fd99b74a
. This reverts commitf7ec6e7d9e
. This reverts commit5640992d17
. This reverts commitd26808dd85
. This reverts commitf91624a595
. This reverts commit16d39a5490
. This reverts commit8a4c296987
. This reverts commit49e1356ee3
. This reverts commitd2279f471b
. This reverts commitb50e39df57
. This reverts commit858d80bf0f
. This reverts commit435f044807
. This reverts commitf61462e1be
. This reverts commita6f1a3abec
. This reverts commit84dc50e160
. This reverts commited635d3285
. This reverts commit7b62791e00
. This reverts commit153194c771
. This reverts commitf44d729d4c
. This reverts commita265fbd397
. This reverts commitb9fef1a7cd
. This reverts commitb0eb64ff7b
. This reverts commitf1795463bf
. This reverts commit70cbb1a5e3
. This reverts commit42bf020463
. This reverts commit379f2650cf
. This reverts commit7ff22d6da4
. This reverts commit5a0b652d36
. This reverts commit432a174bc1
. This reverts commitb14f8a1baf
, reversing changes made toe713855dca
.
220 lines
7.4 KiB
Python
220 lines
7.4 KiB
Python
# Copyright 2014-2016 OpenMarket Ltd
|
|
# Copyright 2020 The Matrix.org Foundation C.I.C.
|
|
#
|
|
# 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
|
|
import os
|
|
|
|
from synapse.config._base import Config, ConfigError
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
NON_SQLITE_DATABASE_PATH_WARNING = """\
|
|
Ignoring 'database_path' setting: not using a sqlite3 database.
|
|
--------------------------------------------------------------------------------
|
|
"""
|
|
|
|
DEFAULT_CONFIG = """\
|
|
## Database ##
|
|
|
|
# The 'database' setting defines the database that synapse uses to store all of
|
|
# its data.
|
|
#
|
|
# 'name' gives the database engine to use: either 'sqlite3' (for SQLite) or
|
|
# 'psycopg2' (for PostgreSQL).
|
|
#
|
|
# 'txn_limit' gives the maximum number of transactions to run per connection
|
|
# before reconnecting. Defaults to 0, which means no limit.
|
|
#
|
|
# 'args' gives options which are passed through to the database engine,
|
|
# except for options starting 'cp_', which are used to configure the Twisted
|
|
# connection pool. For a reference to valid arguments, see:
|
|
# * for sqlite: https://docs.python.org/3/library/sqlite3.html#sqlite3.connect
|
|
# * for postgres: https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS
|
|
# * for the connection pool: https://twistedmatrix.com/documents/current/api/twisted.enterprise.adbapi.ConnectionPool.html#__init__
|
|
#
|
|
#
|
|
# Example SQLite configuration:
|
|
#
|
|
#database:
|
|
# name: sqlite3
|
|
# args:
|
|
# database: /path/to/homeserver.db
|
|
#
|
|
#
|
|
# Example Postgres configuration:
|
|
#
|
|
#database:
|
|
# name: psycopg2
|
|
# txn_limit: 10000
|
|
# args:
|
|
# user: synapse_user
|
|
# password: secretpassword
|
|
# database: synapse
|
|
# host: localhost
|
|
# port: 5432
|
|
# cp_min: 5
|
|
# cp_max: 10
|
|
#
|
|
# For more information on using Synapse with Postgres,
|
|
# see https://matrix-org.github.io/synapse/latest/postgres.html.
|
|
#
|
|
database:
|
|
name: sqlite3
|
|
args:
|
|
database: %(database_path)s
|
|
"""
|
|
|
|
|
|
class DatabaseConnectionConfig:
|
|
"""Contains the connection config for a particular database.
|
|
|
|
Args:
|
|
name: A label for the database, used for logging.
|
|
db_config: The config for a particular database, as per `database`
|
|
section of main config. Has three fields: `name` for database
|
|
module name, `args` for the args to give to the database
|
|
connector, and optional `data_stores` that is a list of stores to
|
|
provision on this database (defaulting to all).
|
|
"""
|
|
|
|
def __init__(self, name: str, db_config: dict):
|
|
db_engine = db_config.get("name", "sqlite3")
|
|
|
|
if db_engine not in ("sqlite3", "psycopg2"):
|
|
raise ConfigError("Unsupported database type %r" % (db_engine,))
|
|
|
|
if db_engine == "sqlite3":
|
|
db_config.setdefault("args", {}).update(
|
|
{"cp_min": 1, "cp_max": 1, "check_same_thread": False}
|
|
)
|
|
|
|
data_stores = db_config.get("data_stores")
|
|
if data_stores is None:
|
|
data_stores = ["main", "state"]
|
|
|
|
self.name = name
|
|
self.config = db_config
|
|
|
|
# The `data_stores` config is actually talking about `databases` (we
|
|
# changed the name).
|
|
self.databases = data_stores
|
|
|
|
|
|
class DatabaseConfig(Config):
|
|
section = "database"
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super().__init__(*args, **kwargs)
|
|
|
|
self.databases = []
|
|
|
|
def read_config(self, config, **kwargs):
|
|
# We *experimentally* support specifying multiple databases via the
|
|
# `databases` key. This is a map from a label to database config in the
|
|
# same format as the `database` config option, plus an extra
|
|
# `data_stores` key to specify which data store goes where. For example:
|
|
#
|
|
# databases:
|
|
# master:
|
|
# name: psycopg2
|
|
# data_stores: ["main"]
|
|
# args: {}
|
|
# state:
|
|
# name: psycopg2
|
|
# data_stores: ["state"]
|
|
# args: {}
|
|
|
|
multi_database_config = config.get("databases")
|
|
database_config = config.get("database")
|
|
database_path = config.get("database_path")
|
|
|
|
if multi_database_config and database_config:
|
|
raise ConfigError("Can't specify both 'database' and 'databases' in config")
|
|
|
|
if multi_database_config:
|
|
if database_path:
|
|
raise ConfigError("Can't specify 'database_path' with 'databases'")
|
|
|
|
self.databases = [
|
|
DatabaseConnectionConfig(name, db_conf)
|
|
for name, db_conf in multi_database_config.items()
|
|
]
|
|
|
|
if database_config:
|
|
self.databases = [DatabaseConnectionConfig("master", database_config)]
|
|
|
|
if database_path:
|
|
if self.databases and self.databases[0].name != "sqlite3":
|
|
logger.warning(NON_SQLITE_DATABASE_PATH_WARNING)
|
|
return
|
|
|
|
database_config = {"name": "sqlite3", "args": {}}
|
|
self.databases = [DatabaseConnectionConfig("master", database_config)]
|
|
self.set_databasepath(database_path)
|
|
|
|
def generate_config_section(self, data_dir_path, **kwargs):
|
|
return DEFAULT_CONFIG % {
|
|
"database_path": os.path.join(data_dir_path, "homeserver.db")
|
|
}
|
|
|
|
def read_arguments(self, args):
|
|
"""
|
|
Cases for the cli input:
|
|
- If no databases are configured and no database_path is set, raise.
|
|
- No databases and only database_path available ==> sqlite3 db.
|
|
- If there are multiple databases and a database_path raise an error.
|
|
- If the database set in the config file is sqlite then
|
|
overwrite with the command line argument.
|
|
"""
|
|
|
|
if args.database_path is None:
|
|
if not self.databases:
|
|
raise ConfigError("No database config provided")
|
|
return
|
|
|
|
if len(self.databases) == 0:
|
|
database_config = {"name": "sqlite3", "args": {}}
|
|
self.databases = [DatabaseConnectionConfig("master", database_config)]
|
|
self.set_databasepath(args.database_path)
|
|
return
|
|
|
|
if self.get_single_database().name == "sqlite3":
|
|
self.set_databasepath(args.database_path)
|
|
else:
|
|
logger.warning(NON_SQLITE_DATABASE_PATH_WARNING)
|
|
|
|
def set_databasepath(self, database_path):
|
|
|
|
if database_path != ":memory:":
|
|
database_path = self.abspath(database_path)
|
|
|
|
self.databases[0].config["args"]["database"] = database_path
|
|
|
|
@staticmethod
|
|
def add_arguments(parser):
|
|
db_group = parser.add_argument_group("database")
|
|
db_group.add_argument(
|
|
"-d",
|
|
"--database-path",
|
|
metavar="SQLITE_DATABASE_PATH",
|
|
help="The path to a sqlite database to use.",
|
|
)
|
|
|
|
def get_single_database(self) -> DatabaseConnectionConfig:
|
|
"""Returns the database if there is only one, useful for e.g. tests"""
|
|
if not self.databases:
|
|
raise Exception("More than one database exists")
|
|
|
|
return self.databases[0]
|