diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-09-15 08:34:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 08:34:52 -0400 |
| commit | 8c7a531e277f98ac6b7981b9738649f3a70feb94 (patch) | |
| tree | a6e0088d17ee9c12218d3c21bc163f5cc7231848 /synapse/api | |
| parent | Verify `?chunk_id` actually corresponds to an insertion event that exists (MS... (diff) | |
| download | synapse-8c7a531e277f98ac6b7981b9738649f3a70feb94.tar.xz | |
Use direct references for some configuration variables (part 2) (#10812)
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/auth.py | 4 | ||||
| -rw-r--r-- | synapse/api/auth_blocking.py | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/synapse/api/auth.py b/synapse/api/auth.py index 05699714ee..e6ca9232ee 100644 --- a/synapse/api/auth.py +++ b/synapse/api/auth.py @@ -70,8 +70,8 @@ class Auth: self._auth_blocking = AuthBlocking(self.hs) - self._track_appservice_user_ips = hs.config.track_appservice_user_ips - self._macaroon_secret_key = hs.config.macaroon_secret_key + self._track_appservice_user_ips = hs.config.appservice.track_appservice_user_ips + self._macaroon_secret_key = hs.config.key.macaroon_secret_key self._force_tracing_for_users = hs.config.tracing.force_tracing_for_users async def check_user_in_room( diff --git a/synapse/api/auth_blocking.py b/synapse/api/auth_blocking.py index e6bced93d5..a3b95f4de0 100644 --- a/synapse/api/auth_blocking.py +++ b/synapse/api/auth_blocking.py @@ -30,13 +30,15 @@ class AuthBlocking: def __init__(self, hs: "HomeServer"): self.store = hs.get_datastore() - self._server_notices_mxid = hs.config.server_notices_mxid - self._hs_disabled = hs.config.hs_disabled - self._hs_disabled_message = hs.config.hs_disabled_message - self._admin_contact = hs.config.admin_contact - self._max_mau_value = hs.config.max_mau_value - self._limit_usage_by_mau = hs.config.limit_usage_by_mau - self._mau_limits_reserved_threepids = hs.config.mau_limits_reserved_threepids + self._server_notices_mxid = hs.config.servernotices.server_notices_mxid + self._hs_disabled = hs.config.server.hs_disabled + self._hs_disabled_message = hs.config.server.hs_disabled_message + self._admin_contact = hs.config.server.admin_contact + self._max_mau_value = hs.config.server.max_mau_value + self._limit_usage_by_mau = hs.config.server.limit_usage_by_mau + self._mau_limits_reserved_threepids = ( + hs.config.server.mau_limits_reserved_threepids + ) self._server_name = hs.hostname self._track_appservice_user_ips = hs.config.appservice.track_appservice_user_ips |