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

Avoid attribute error when password_config present but empty #6753

Merged
merged 3 commits into from
Jan 22, 2020
Merged

Avoid attribute error when password_config present but empty #6753

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e753f66
Avoid attribute error when `password_config` present but empty
ivilata Jan 20, 2020
b2693d3
Changelog
ivilata Jan 21, 2020
1bab5dc
ack contribution
richvdh Jan 22, 2020
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/6753.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix `AttributeError: 'NoneType' object has no attribute 'get'` in `hash_password` when configuration has an empty `password_config`.
2 changes: 1 addition & 1 deletion scripts/hash_password
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if __name__ == "__main__":
if "config" in args and args.config:
config = yaml.safe_load(args.config)
bcrypt_rounds = config.get("bcrypt_rounds", bcrypt_rounds)
password_config = config.get("password_config", {})
password_config = config.get("password_config", None) or {}
password_pepper = password_config.get("pepper", password_pepper)
password = args.password

Expand Down