Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-19 22:44:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the register_new_matrix_user script failing. (#14637)

Browse Source
This commit is contained in:
reivilibre 2022-12-07 13:39:27 +00:00 committed by GitHub
parent d69bf3b24c
commit 96251af50d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/14637.bugfix Normal file
View File

@ -0,0 +1 @@
Fix a bug introduced in v1.67.0 where not specifying a config file or a server URL would lead to the `register_new_matrix_user` script failing.

5
synapse/_scripts/register_new_matrix_user.py
View File

@ -222,6 +222,7 @@ def main() -> None:
args = parser.parse_args() args = parser.parse_args()
config: Optional[Dict[str, Any]] = None
if "config" in args and args.config: if "config" in args and args.config:
config = yaml.safe_load(args.config) config = yaml.safe_load(args.config)
@ -229,7 +230,7 @@ def main() -> None:
secret = args.shared_secret secret = args.shared_secret
else: else:
# argparse should check that we have either config or shared secret # argparse should check that we have either config or shared secret
assert config assert config is not None
secret = config.get("registration_shared_secret") secret = config.get("registration_shared_secret")
secret_file = config.get("registration_shared_secret_path") secret_file = config.get("registration_shared_secret_path")
@ -244,7 +245,7 @@ def main() -> None:
if args.server_url: if args.server_url:
server_url = args.server_url server_url = args.server_url
elif config: elif config is not None:
server_url = _find_client_listener(config) server_url = _find_client_listener(config)
if not server_url: if not server_url:
server_url = _DEFAULT_SERVER_URL server_url = _DEFAULT_SERVER_URL