diff options
| author | Erik Johnston <erikj@jki.re> | 2016-07-05 11:26:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-05 11:26:22 +0100 |
| commit | e34cb5e7dc0c4858e955eace999499fcc46a404b (patch) | |
| tree | dea95524ba78e288645ecc49571e5df43f2f7765 /synapse/config | |
| parent | Merge pull request #905 from KentShikama/add-password-hash (diff) | |
| parent | Remove default password pepper string (diff) | |
| download | synapse-e34cb5e7dc0c4858e955eace999499fcc46a404b.tar.xz | |
Merge pull request #907 from KentShikama/pepper
Add pepper to password hashing
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/password.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/config/password.py b/synapse/config/password.py index dec801ef41..66f0d93eea 100644 --- a/synapse/config/password.py +++ b/synapse/config/password.py @@ -23,10 +23,14 @@ class PasswordConfig(Config): def read_config(self, config): password_config = config.get("password_config", {}) self.password_enabled = password_config.get("enabled", True) + self.password_pepper = password_config.get("pepper", "") def default_config(self, config_dir_path, server_name, **kwargs): return """ # Enable password for login. password_config: enabled: true + # Change to a secret random string. + # DO NOT CHANGE THIS AFTER INITIAL SETUP! + #pepper: "" """ |