Skip to content

Commit 3fd11a4

Browse files
committed
fix lint
1 parent e683d13 commit 3fd11a4

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

chatmaild/src/chatmaild/config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def __init__(self, inipath, params):
3131
self.username_min_length = int(params["username_min_length"])
3232
self.username_max_length = int(params["username_max_length"])
3333
self.password_min_length = int(params["password_min_length"])
34-
self.invite_token = params["invite_token"]
34+
self.invite_token = params.get("invite_token", "")
3535
self.passthrough_senders = params["passthrough_senders"].split()
3636
self.passthrough_recipients = params["passthrough_recipients"].split()
3737
self.filtermail_smtp_port = int(params["filtermail_smtp_port"])

chatmaild/src/chatmaild/doveauth.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,15 @@ def is_allowed_to_create(config: Config, user, cleartext_password) -> bool:
2525
"""Return True if user and password are admissable."""
2626
if os.path.exists(NOCREATE_FILE):
2727
if config.invite_token and config.invite_token not in cleartext_password:
28-
logging.warning(f"blocked account creation because {NOCREATE_FILE!r} exists.")
28+
logging.warning(
29+
f"blocked account creation because {NOCREATE_FILE!r} exists."
30+
)
2931
return False
3032

31-
if len(cleartext_password.replace(config.invite_token, "")) < config.password_min_length:
33+
if (
34+
len(cleartext_password.replace(config.invite_token, ""))
35+
< config.password_min_length
36+
):
3237
logging.warning(
3338
"Password needs to be at least %s characters long",
3439
config.password_min_length,

chatmaild/src/chatmaild/newemail.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ def create_newemail_dict(config: Config):
2121
secrets.choice(ALPHANUMERIC_PUNCT)
2222
for _ in range(config.password_min_length + 3)
2323
)
24-
redirect_uri = os.getenv("REQUEST_URI")
25-
invite_token = redirect_uri[5:] if redirect_uri != "/new" else ""
26-
return dict(email=f"{user}@{config.mail_domain}", password=f"{invite_token}{password}")
24+
redirect_uri = os.getenv("REQUEST_URI", "/new")
25+
invite_token = "" if redirect_uri == "/new" else redirect_uri[5:]
26+
return dict(
27+
email=f"{user}@{config.mail_domain}", password=f"{invite_token}{password}"
28+
)
2729

2830

2931
def print_new_account():

0 commit comments

Comments
 (0)