forked from clan/clan-core
85 lines
3.0 KiB
Diff
85 lines
3.0 KiB
Diff
From df45634a92944dcab4edb02fb5e478911c58fdd6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
|
|
Date: Tue, 11 Jun 2024 11:40:47 +0200
|
|
Subject: [PATCH] register_new_matrix_user: add password-file flag
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
getpass in python exist on stdin to be a tty, hence we cannot just pipe
|
|
into register_new_matrix_user. --password-file instead works better and
|
|
it would also allow the use of stdin if /dev/stdin is passed.
|
|
|
|
Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
|
|
---
|
|
debian/register_new_matrix_user.ronn | 6 +++++-
|
|
synapse/_scripts/register_new_matrix_user.py | 16 ++++++++++++++--
|
|
2 files changed, 19 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/debian/register_new_matrix_user.ronn b/debian/register_new_matrix_user.ronn
|
|
index 0410b1f4c..e39bef448 100644
|
|
--- a/debian/register_new_matrix_user.ronn
|
|
+++ b/debian/register_new_matrix_user.ronn
|
|
@@ -32,7 +32,11 @@ A sample YAML file accepted by `register_new_matrix_user` is described below:
|
|
|
|
* `-p`, `--password`:
|
|
New password for user. Will prompt if omitted. Supplying the password
|
|
- on the command line is not recommended. Use the STDIN instead.
|
|
+ on the command line is not recommended. Use password-file if possible.
|
|
+
|
|
+ * `--password-file`:
|
|
+ File containing the new password for user. Will prompt if omitted.
|
|
+ This is a more secure alternative to specifying the password on the command line.
|
|
|
|
* `-a`, `--admin`:
|
|
Register new user as an admin. Will prompt if omitted.
|
|
diff --git a/synapse/_scripts/register_new_matrix_user.py b/synapse/_scripts/register_new_matrix_user.py
|
|
index 77a7129ee..f067e6832 100644
|
|
--- a/synapse/_scripts/register_new_matrix_user.py
|
|
+++ b/synapse/_scripts/register_new_matrix_user.py
|
|
@@ -173,12 +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.",
|
|
)
|
|
+ password_group.add_argument(
|
|
+ "--password-file",
|
|
+ default=None,
|
|
+ help="File containing the new password for user. Will prompt if omitted.",
|
|
+ )
|
|
parser.add_argument(
|
|
"-t",
|
|
"--user_type",
|
|
@@ -247,6 +253,12 @@ def main() -> None:
|
|
print(_NO_SHARED_SECRET_OPTS_ERROR, file=sys.stderr)
|
|
sys.exit(1)
|
|
|
|
+ password = ""
|
|
+ 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:
|
|
@@ -270,7 +282,7 @@ def main() -> None:
|
|
admin = args.admin
|
|
|
|
register_new_user(
|
|
- args.user, args.password, server_url, secret, admin, args.user_type
|
|
+ args.user, password, server_url, secret, admin, args.user_type
|
|
)
|
|
|
|
|
|
--
|
|
2.44.1
|
|
|