summary refs log tree commit diff
path: root/synapse/config/registration.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-05-13 14:46:53 +0100
committerErik Johnston <erik@matrix.org>2016-05-13 14:46:53 +0100
commit99b5a2e560d28894710e1bebaa1977cfebc7963d (patch)
tree88e0f3de599addc0a129d3c94212aef674c5c24d /synapse/config/registration.py
parentMerge pull request #778 from matrix-org/erikj/add_pusher (diff)
parentCreate user with expiry (diff)
downloadsynapse-99b5a2e560d28894710e1bebaa1977cfebc7963d.tar.xz
Merge pull request #741 from negzi/create_user_with_expiry
Create user with expiry
Diffstat (limited to 'synapse/config/registration.py')
-rw-r--r--synapse/config/registration.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py

index 87e500c97a..cc3f879857 100644 --- a/synapse/config/registration.py +++ b/synapse/config/registration.py
@@ -32,6 +32,7 @@ class RegistrationConfig(Config): ) self.registration_shared_secret = config.get("registration_shared_secret") + self.user_creation_max_duration = int(config["user_creation_max_duration"]) self.bcrypt_rounds = config.get("bcrypt_rounds", 12) self.trusted_third_party_id_servers = config["trusted_third_party_id_servers"] @@ -54,6 +55,11 @@ class RegistrationConfig(Config): # secret, even if registration is otherwise disabled. registration_shared_secret: "%(registration_shared_secret)s" + # Sets the expiry for the short term user creation in + # milliseconds. For instance the bellow duration is two weeks + # in milliseconds. + user_creation_max_duration: 1209600000 + # Set the number of bcrypt rounds used to generate password hash. # Larger numbers increase the work factor needed to generate the hash. # The default number of rounds is 12.