Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

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

Merged
merged 6 commits into from
May 19, 2022
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df081a9
hash_password: raise an error if no config file is specified (#11548)
jae1911 May 18, 2022
59cf3e3
hash_password: more explicit error message
jae1911 May 18, 2022
22aba37
changelod.d: add changelog file
jae1911 May 18, 2022
1c6648e
hash_password: use required=True to have cleaner logic
jae1911 May 19, 2022
c4f129c
Merge branch 'develop' into enhancement-hash-password-config-fail
jae1911 May 19, 2022
0d7b1f8
Tweak the changelog
DMRobertson May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12789.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The hash_password script now returns an exception when it is called without specifying a config file.
2 changes: 2 additions & 0 deletions synapse/_scripts/hash_password.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ def main() -> None:
bcrypt_rounds = config.get("bcrypt_rounds", bcrypt_rounds)
password_config = config.get("password_config", None) or {}
password_pepper = password_config.get("pepper", password_pepper)
else:
raise Exception("Please specify a path to a config file (-c).")
password = args.password

if not password:
Expand Down