MSC3861: m.3pid_changes capability should be disabled

synapse/config/experimental.py

@@ -216,6 +216,12 @@ def check_config_conflicts(self, root: RootConfig) -> None:
                 ("session_lifetime",),
             )
 
+        if root.registration.enable_3pid_changes:
+            raise ConfigError(
+                "enable_3pid_changes cannot be enabled when OAuth delegation is enabled",
+                ("enable_3pid_changes",),
+            )
+
 
 @attr.s(auto_attribs=True, frozen=True, slots=True)
 class MSC3866Config:

synapse/config/registration.py

@@ -133,7 +133,16 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
 
         self.enable_set_displayname = config.get("enable_set_displayname", True)
         self.enable_set_avatar_url = config.get("enable_set_avatar_url", True)
-        self.enable_3pid_changes = config.get("enable_3pid_changes", True)
+
+        # The default value of enable_3pid_changes is True, unless msc3861 is enabled.
+        msc3861_enabled = (
+            (config.get("experimental_features") or {})
+            .get("msc3861", {})
+            .get("enabled", False)
+        )
+        self.enable_3pid_changes = config.get(
+            "enable_3pid_changes", not msc3861_enabled
+        )
 
         self.disable_msisdn_registration = config.get(
             "disable_msisdn_registration", False

tests/config/test_oauth_delegation.py

@@ -255,3 +255,8 @@ def test_session_lifetime_cannot_be_set(self) -> None:
         self.config_dict["session_lifetime"] = "24h"
         with self.assertRaises(ConfigError):
             self.parse_config()
+
+    def test_enable_3pid_changes_cannot_be_enabled(self) -> None:
+        self.config_dict.update(enable_3pid_changes=True)
+        with self.assertRaises(ConfigError):
+            self.parse_config()