Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

hash_password: raise an error if no config file is specified (#12789)

Browse Source
This commit is contained in:
Jae Lo Presti 2022-05-19 14:03:13 +01:00 committed by GitHub
parent b935c9529c
commit f16ec055cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/12789.misc Normal file
View File

@ -0,0 +1 @@
The `hash_password` script now fails when it is called without specifying a config file.

10
synapse/_scripts/hash_password.py
View File

@ -46,14 +46,14 @@ def main() -> None:
"Path to server config file. " "Path to server config file. "
"Used to read in bcrypt_rounds and password_pepper." "Used to read in bcrypt_rounds and password_pepper."
), ),
required=True,
) )
args = parser.parse_args() args = parser.parse_args()
if "config" in args and args.config: config = yaml.safe_load(args.config)
config = yaml.safe_load(args.config) bcrypt_rounds = config.get("bcrypt_rounds", bcrypt_rounds)
bcrypt_rounds = config.get("bcrypt_rounds", bcrypt_rounds) password_config = config.get("password_config", None) or {}
password_config = config.get("password_config", None) or {} password_pepper = password_config.get("pepper", password_pepper)
password_pepper = password_config.get("pepper", password_pepper)
password = args.password password = args.password
if not password: if not password: