Fix running with an empty experimental features section. (matrix-org#…

…15925)
beeper · Aug 29, 2023 · f41381a · f41381a
1 parent 2f43d63
commit f41381a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/15925.bugfix b/changelog.d/15925.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.86.0 where Synapse starting with an empty `experimental_features` configuration setting.
diff --git a/synapse/config/auth.py b/synapse/config/auth.py
@@ -31,7 +31,7 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
 
         # The default value of password_config.enabled is True, unless msc3861 is enabled.
         msc3861_enabled = (
-            config.get("experimental_features", {})
+            (config.get("experimental_features") or {})
             .get("msc3861", {})
             .get("enabled", False)
         )