Sfoglia il codice sorgente

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

Jae Lo Presti 2 anni fa
parent
commit
f16ec055cc
2 ha cambiato i file con 6 aggiunte e 5 eliminazioni
  1. 1 0
      changelog.d/12789.misc
  2. 5 5
      synapse/_scripts/hash_password.py

+ 1 - 0
changelog.d/12789.misc

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

+ 5 - 5
synapse/_scripts/hash_password.py

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