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.1 KiB
Python
Executable File
84 lines
2.1 KiB
Python
Executable File
#!/usr/bin/env python
|
|
|
|
import argparse
|
|
import getpass
|
|
import sys
|
|
import unicodedata
|
|
|
|
import bcrypt
|
|
import yaml
|
|
|
|
|
|
def prompt_for_pass() -> str:
|
|
password = getpass.getpass("Password: ")
|
|
|
|
if not password:
|
|
raise Exception("Password cannot be blank.")
|
|
|
|
confirm_password = getpass.getpass("Confirm password: ")
|
|
|
|
if password != confirm_password:
|
|
raise Exception("Passwords do not match.")
|
|
|
|
return password
|
|
|
|
|
|
def main() -> None:
|
|
bcrypt_rounds = 12
|
|
password_pepper = ""
|
|
|
|
parser = argparse.ArgumentParser(
|
|
description=(
|
|
"Calculate the hash of a new password, so that passwords can be reset"
|
|
)
|
|
)
|
|
parser.add_argument(
|
|
"-p",
|
|
"--password",
|
|
default=None,
|
|
help="New password for user. Will prompt if omitted.",
|
|
)
|
|
parser.add_argument(
|
|
"-c",
|
|
"--config",
|
|
type=argparse.FileType("r"),
|
|
help=(
|
|
"Path to server config file. "
|
|
"Used to read in bcrypt_rounds and password_pepper."
|
|
),
|
|
)
|
|
|
|
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)
|
|
password = args.password
|
|
|
|
if not password:
|
|
password = prompt_for_pass()
|
|
|
|
# On Python 2, make sure we decode it to Unicode before we normalise it
|
|
if isinstance(password, bytes):
|
|
try:
|
|
password = password.decode(sys.stdin.encoding)
|
|
except UnicodeDecodeError:
|
|
print(
|
|
"ERROR! Your password is not decodable using your terminal encoding (%s)."
|
|
% (sys.stdin.encoding,)
|
|
)
|
|
|
|
pw = unicodedata.normalize("NFKC", password)
|
|
|
|
hashed = bcrypt.hashpw(
|
|
pw.encode("utf8") + password_pepper.encode("utf8"),
|
|
bcrypt.gensalt(bcrypt_rounds),
|
|
).decode("ascii")
|
|
|
|
print(hashed)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|