Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-16 17:08:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Mark if a verification code has been deleted (#2290)

Browse source
This commit is contained in:
Adrià Casajús 2024-10-25 10:29:33 +02:00 committed by GitHub
parent 01d5f40580
commit 7295a2052f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/mailbox_utils.py
View file

@ -37,8 +37,9 @@ class OnlyPaidError(MailboxError):
class CannotVerifyError(MailboxError): class CannotVerifyError(MailboxError):
def __init__(self, msg: str): def __init__(self, msg: str, deleted_activation_code: bool = False):
self.msg = msg self.msg = msg
self.deleted_activation_code = deleted_activation_code
MAX_ACTIVATION_TRIES = 3 MAX_ACTIVATION_TRIES = 3
@ -196,7 +197,10 @@ def verify_mailbox_code(user: User, mailbox_id: int, code: str) -> Mailbox:
if activation.tries >= MAX_ACTIVATION_TRIES: if activation.tries >= MAX_ACTIVATION_TRIES:
LOG.i(f"User {user} failed to verify mailbox {mailbox_id} more than 3 times") LOG.i(f"User {user} failed to verify mailbox {mailbox_id} more than 3 times")
clear_activation_codes_for_mailbox(mailbox) clear_activation_codes_for_mailbox(mailbox)
raise CannotVerifyError("Invalid activation code. Please request another code.") raise CannotVerifyError(
"Invalid activation code. Please request another code.",
deleted_activation_code=True,
)
if activation.created_at < arrow.now().shift(minutes=-15): if activation.created_at < arrow.now().shift(minutes=-15):
LOG.i( LOG.i(
f"User {user} failed to verify mailbox {mailbox_id} because code is too old" f"User {user} failed to verify mailbox {mailbox_id} because code is too old"

5
tests/test_mailbox_utils.py
View file

@ -314,10 +314,13 @@ def test_verify_too_may():
output = mailbox_utils.create_mailbox(user, random_email()) output = mailbox_utils.create_mailbox(user, random_email())
output.activation.tries = mailbox_utils.MAX_ACTIVATION_TRIES output.activation.tries = mailbox_utils.MAX_ACTIVATION_TRIES
Session.commit() Session.commit()
with pytest.raises(mailbox_utils.CannotVerifyError): try:
mailbox_utils.verify_mailbox_code( mailbox_utils.verify_mailbox_code(
user, output.mailbox.id, output.activation.code user, output.mailbox.id, output.activation.code
) )
assert False
except mailbox_utils.CannotVerifyError as e:
assert e.deleted_activation_code
@mail_sender.store_emails_test_decorator @mail_sender.store_emails_test_decorator