Bladeren bron

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

tags/v1.60.0rc1
Jae Lo Presti 2 jaren geleden
committed by GitHub
bovenliggende
commit
f16ec055cc
Geen bekende sleutel gevonden voor deze handtekening in de database GPG sleutel-ID: 4AEE18F83AFDEB23
2 gewijzigde bestanden met toevoegingen van 6 en 5 verwijderingen
  1. +1
    -0
      changelog.d/12789.misc
  2. +5
    -5
      synapse/_scripts/hash_password.py

+ 1
- 0
changelog.d/12789.misc Bestand weergeven

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

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


Laden…
Annuleren
Opslaan