Browse Source

Avoid attribute error when `password_config` present but empty (#6753)

The old statement returned `None` for such a `password_config` (like the one
created on first run), thus retrieval of the `pepper` key failed with
`AttributeError`.

Fixes #5315

Signed-off-by: Ivan Vilata i Balaguer <ivan@selidor.net>
Ivan Vilata-i-Balaguer 4 years ago
parent
commit
837f62266b
2 changed files with 2 additions and 1 deletions
  1. 1 0
      changelog.d/6753.bugfix
  2. 1 1
      scripts/hash_password

+ 1 - 0
changelog.d/6753.bugfix

@@ -0,0 +1 @@
+Fix `AttributeError: 'NoneType' object has no attribute 'get'` in `hash_password` when configuration has an empty `password_config`. Contributed by @ivilata.

+ 1 - 1
scripts/hash_password

@@ -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