summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2019-01-21 14:59:37 +0000
committerNeil Johnson <neil@matrix.org>2019-01-21 14:59:37 +0000
commit534926230257ef65b683f439dd71156c359d5004 (patch)
treeffc9b4b2df8d4dd78fa7b937de58e706bfc9628d /synapse/config
parentMerge pull request #4390 from matrix-org/erikj/versioned_fed_apis (diff)
downloadsynapse-534926230257ef65b683f439dd71156c359d5004.tar.xz
Config option to disable requesting MSISDN on registration
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/registration.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 6c2b543b8c..e725773735 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -50,6 +50,8 @@ class RegistrationConfig(Config):
                 raise ConfigError('Invalid auto_join_rooms entry %s' % (room_alias,))
         self.autocreate_auto_join_rooms = config.get("autocreate_auto_join_rooms", True)
 
+        self.disable_msisdn_registration = config.get("disable_msisdn_registration", False)
+
     def default_config(self, generate_secrets=False, **kwargs):
         if generate_secrets:
             registration_shared_secret = 'registration_shared_secret: "%s"' % (
@@ -70,6 +72,11 @@ class RegistrationConfig(Config):
         #     - email
         #     - msisdn
 
+        # Explicitly disable asking for MSISDNs from the registration
+        # flow (overrides registrations_require_3pid if MSISDNs are set as required)
+        #
+        # disable_msisdn_registration = True
+
         # Mandate that users are only allowed to associate certain formats of
         # 3PIDs with accounts on this server.
         #