diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-06-18 17:21:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-18 16:21:51 +0100 |
| commit | 97c3d988161f69821f00b722aafaea4fcb31759f (patch) | |
| tree | f30651a502235dc1f3af67a63961223f770cba10 /synapse | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-97c3d988161f69821f00b722aafaea4fcb31759f.tar.xz | |
register_new_matrix_user: add password-file flag (#17294)
Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> Co-authored-by: Andrew Morgan <andrew@amorgan.xyz>
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/_scripts/register_new_matrix_user.py | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/synapse/_scripts/register_new_matrix_user.py b/synapse/_scripts/register_new_matrix_user.py index 77a7129ee2..972b35e2dc 100644 --- a/synapse/_scripts/register_new_matrix_user.py +++ b/synapse/_scripts/register_new_matrix_user.py @@ -173,11 +173,18 @@ def main() -> None: default=None, help="Local part of the new user. Will prompt if omitted.", ) - parser.add_argument( + password_group = parser.add_mutually_exclusive_group() + password_group.add_argument( "-p", "--password", default=None, - help="New password for user. Will prompt if omitted.", + help="New password for user. Will prompt for a password if " + "this flag and `--password-file` are both omitted.", + ) + password_group.add_argument( + "--password-file", + default=None, + help="File containing the new password for user. If set, will override `--password`.", ) parser.add_argument( "-t", @@ -247,6 +254,11 @@ def main() -> None: print(_NO_SHARED_SECRET_OPTS_ERROR, file=sys.stderr) sys.exit(1) + if args.password_file: + password = _read_file(args.password_file, "password-file").strip() + else: + password = args.password + if args.server_url: server_url = args.server_url elif config is not None: @@ -269,9 +281,7 @@ def main() -> None: if args.admin or args.no_admin: admin = args.admin - register_new_user( - args.user, args.password, server_url, secret, admin, args.user_type - ) + register_new_user(args.user, password, server_url, secret, admin, args.user_type) def _read_file(file_path: Any, config_path: str) -> str: |