mirror of
https://mau.dev/maunium/synapse.git
synced 2024-10-01 01:36:05 -04:00
961ee75a9b
Of note: * No untyped defs in `register_new_matrix_user` This one might be contraversial. `request_registration` has three dependency-injection arguments used for testing. I'm removing the injection of the `requests` module and using `unitest.mock.patch` in the test cases instead. Doing `reveal_type(requests)` and `reveal_type(requests.get)` before the change: ``` synapse/_scripts/register_new_matrix_user.py:45: note: Revealed type is "Any" synapse/_scripts/register_new_matrix_user.py:46: note: Revealed type is "Any" ``` And after: ``` synapse/_scripts/register_new_matrix_user.py:44: note: Revealed type is "types.ModuleType" synapse/_scripts/register_new_matrix_user.py:45: note: Revealed type is "def (url: Union[builtins.str, builtins.bytes], params: Union[Union[_typeshed.SupportsItems[Union[builtins.str, builtins.bytes, builtins.int, builtins.float], Union[builtins.str, builtins.bytes, builtins.int, builtins.float, typing.Iterable[Union[builtins.str, builtins.bytes, builtins.int, builtins.float]], None]], Tuple[Union[builtins.str, builtins.bytes, builtins.int, builtins.float], Union[builtins.str, builtins.bytes, builtins.int, builtins.float, typing.Iterable[Union[builtins.str, builtins.bytes, builtins.int, builtins.float]], None]], typing.Iterable[Tuple[Union[builtins.str, builtins.bytes, builtins.int, builtins.float], Union[builtins.str, builtins.bytes, builtins.int, builtins.float, typing.Iterable[Union[builtins.str, builtins.bytes, builtins.int, builtins.float]], None]]], builtins.str, builtins.bytes], None] =, data: Union[Any, None] =, headers: Union[Any, None] =, cookies: Union[Any, None] =, files: Union[Any, None] =, auth: Union[Any, None] =, timeout: Union[Any, None] =, allow_redirects: builtins.bool =, proxies: Union[Any, None] =, hooks: Union[Any, None] =, stream: Union[Any, None] =, verify: Union[Any, None] =, cert: Union[Any, None] =, json: Union[Any, None] =) -> requests.models.Response" ``` * Drive-by comment in `synapse.storage.types` * No untyped defs in `synapse_port_db` This was by far the most painful. I'm happy to break this up into smaller pieces for review if it's not managable as-is.
84 lines
2.3 KiB
Python
Executable File
84 lines
2.3 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
import argparse
|
|
import shutil
|
|
import sys
|
|
|
|
from synapse.config.homeserver import HomeServerConfig
|
|
|
|
|
|
def main() -> None:
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument(
|
|
"--config-dir",
|
|
default="CONFDIR",
|
|
help="The path where the config files are kept. Used to create filenames for "
|
|
"things like the log config and the signing key. Default: %(default)s",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--data-dir",
|
|
default="DATADIR",
|
|
help="The path where the data files are kept. Used to create filenames for "
|
|
"things like the database and media store. Default: %(default)s",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--server-name",
|
|
default="SERVERNAME",
|
|
help="The server name. Used to initialise the server_name config param, but also "
|
|
"used in the names of some of the config files. Default: %(default)s",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--report-stats",
|
|
action="store",
|
|
help="Whether the generated config reports anonymized usage statistics",
|
|
choices=["yes", "no"],
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--generate-secrets",
|
|
action="store_true",
|
|
help="Enable generation of new secrets for things like the macaroon_secret_key."
|
|
"By default, these parameters will be left unset.",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"-o",
|
|
"--output-file",
|
|
type=argparse.FileType("w"),
|
|
default=sys.stdout,
|
|
help="File to write the configuration to. Default: stdout",
|
|
)
|
|
|
|
parser.add_argument(
|
|
"--header-file",
|
|
type=argparse.FileType("r"),
|
|
help="File from which to read a header, which will be printed before the "
|
|
"generated config.",
|
|
)
|
|
|
|
args = parser.parse_args()
|
|
|
|
report_stats = args.report_stats
|
|
if report_stats is not None:
|
|
report_stats = report_stats == "yes"
|
|
|
|
conf = HomeServerConfig().generate_config(
|
|
config_dir_path=args.config_dir,
|
|
data_dir_path=args.data_dir,
|
|
server_name=args.server_name,
|
|
generate_secrets=args.generate_secrets,
|
|
report_stats=report_stats,
|
|
)
|
|
|
|
if args.header_file:
|
|
shutil.copyfileobj(args.header_file, args.output_file)
|
|
|
|
args.output_file.write(conf)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|