diff --git a/synapse/config/appservice.py b/synapse/config/appservice.py
index 439bfe1526..ada165f238 100644
--- a/synapse/config/appservice.py
+++ b/synapse/config/appservice.py
@@ -170,6 +170,7 @@ def _load_appservice(
# When enabled, appservice transactions contain the following information:
# - device One-Time Key counts
# - device unused fallback key usage states
+ # - device list changes
msc3202_transaction_extensions = as_info.get("org.matrix.msc3202", False)
if not isinstance(msc3202_transaction_extensions, bool):
raise ValueError(
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
index 064db4487c..43db5fcdd9 100644
--- a/synapse/config/experimental.py
+++ b/synapse/config/experimental.py
@@ -59,8 +59,9 @@ class ExperimentalConfig(Config):
"msc3202_device_masquerading", False
)
- # Portion of MSC3202 related to transaction extensions:
- # sending one-time key counts and fallback key usage to application services.
+ # The portion of MSC3202 related to transaction extensions:
+ # sending device list changes, one-time key counts and fallback key
+ # usage to application services.
self.msc3202_transaction_extensions: bool = experimental.get(
"msc3202_transaction_extensions", False
)
@@ -77,3 +78,6 @@ class ExperimentalConfig(Config):
# The deprecated groups feature.
self.groups_enabled: bool = experimental.get("groups_enabled", True)
+
+ # MSC2654: Unread counts
+ self.msc2654_enabled: bool = experimental.get("msc2654_enabled", False)
diff --git a/synapse/config/key.py b/synapse/config/key.py
index ee83c6c06b..f5377e7d9c 100644
--- a/synapse/config/key.py
+++ b/synapse/config/key.py
@@ -16,7 +16,7 @@
import hashlib
import logging
import os
-from typing import Any, Dict, Iterator, List, Optional
+from typing import TYPE_CHECKING, Any, Dict, Iterator, List, Optional
import attr
import jsonschema
@@ -38,6 +38,9 @@ from synapse.util.stringutils import random_string, random_string_with_symbols
from ._base import Config, ConfigError
+if TYPE_CHECKING:
+ from signedjson.key import VerifyKeyWithExpiry
+
INSECURE_NOTARY_ERROR = """\
Your server is configured to accept key server responses without signature
validation or TLS certificate validation. This is likely to be very insecure. If
@@ -300,7 +303,7 @@ class KeyConfig(Config):
def read_old_signing_keys(
self, old_signing_keys: Optional[JsonDict]
- ) -> Dict[str, VerifyKey]:
+ ) -> Dict[str, "VerifyKeyWithExpiry"]:
if old_signing_keys is None:
return {}
keys = {}
@@ -308,8 +311,8 @@ class KeyConfig(Config):
if is_signing_algorithm_supported(key_id):
key_base64 = key_data["key"]
key_bytes = decode_base64(key_base64)
- verify_key = decode_verify_key_bytes(key_id, key_bytes)
- verify_key.expired_ts = key_data["expired_ts"]
+ verify_key: "VerifyKeyWithExpiry" = decode_verify_key_bytes(key_id, key_bytes) # type: ignore[assignment]
+ verify_key.expired = key_data["expired_ts"]
keys[key_id] = verify_key
else:
raise ConfigError(
@@ -422,7 +425,7 @@ def _parse_key_servers(
server_name = server["server_name"]
result = TrustedKeyServer(server_name=server_name)
- verify_keys = server.get("verify_keys")
+ verify_keys: Optional[Dict[str, str]] = server.get("verify_keys")
if verify_keys is not None:
result.verify_keys = {}
for key_id, key_base64 in verify_keys.items():
diff --git a/synapse/config/server.py b/synapse/config/server.py
index 38de4b8000..b3a9e50752 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -680,6 +680,18 @@ class ServerConfig(Config):
config.get("use_account_validity_in_account_status") or False
)
+ # This is a temporary option that enables fully using the new
+ # `device_lists_changes_in_room` without the backwards compat code. This
+ # is primarily for testing. If enabled the server should *not* be
+ # downgraded, as it may lead to missing device list updates.
+ self.use_new_device_lists_changes_in_room = (
+ config.get("use_new_device_lists_changes_in_room") or False
+ )
+
+ self.rooms_to_exclude_from_sync: List[str] = (
+ config.get("exclude_rooms_from_sync") or []
+ )
+
def has_tls_listener(self) -> bool:
return any(listener.tls for listener in self.listeners)
@@ -1234,6 +1246,15 @@ class ServerConfig(Config):
# information about using custom templates.
#
#custom_template_directory: /path/to/custom/templates/
+
+ # List of rooms to exclude from sync responses. This is useful for server
+ # administrators wishing to group users into a room without these users being able
+ # to see it from their client.
+ #
+ # By default, no room is excluded.
+ #
+ #exclude_rooms_from_sync:
+ # - !foo:example.com
"""
% locals()
)
|
