summary refs log tree commit diff
path: root/synapse/config/registration.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-10-16 14:52:08 +0100
committerMark Haines <mark.haines@matrix.org>2015-10-16 14:52:08 +0100
commitf2f031fd57e0ad16c321584bae94487422d89853 (patch)
treeeefae13ff3e4d4f09b37cf3228f1c77e7faf1da3 /synapse/config/registration.py
parentMerge pull request #305 from matrix-org/markjh/v2_sync_api (diff)
downloadsynapse-f2f031fd57e0ad16c321584bae94487422d89853.tar.xz
Add config for how many bcrypt rounds to use for password hashes
By default we leave it at the default value of 12. But now we can reduce
it for preparing users for loadtests or running integration tests.
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 fa98eced34..f5ef36a9f4 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -33,6 +33,7 @@ class RegistrationConfig(Config):
 
         self.registration_shared_secret = config.get("registration_shared_secret")
         self.macaroon_secret_key = config.get("macaroon_secret_key")
+        self.bcrypt_rounds = config.get("bcrypt_rounds", 12)
 
     def default_config(self, **kwargs):
         registration_shared_secret = random_string_with_symbols(50)
@@ -48,6 +49,11 @@ class RegistrationConfig(Config):
         registration_shared_secret: "%(registration_shared_secret)s"
 
         macaroon_secret_key: "%(macaroon_secret_key)s"
+
+        # 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.
+        bcrypt_rounds: 12
         """ % locals()
 
     def add_arguments(self, parser):