Mirror
/
app-MAIL-temp
mirror of https://github.com/simple-login/app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

if alias has been deleted before, do not auto-create it with directory or catch-all domain

This commit is contained in:
Son NK 2020-02-14 10:52:18 +07:00
parent 9e2121825d
commit b663703232
1 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
email_handler.py
View File

@ -68,6 +68,7 @@ from app.models import (
CustomDomain, CustomDomain,
Directory, Directory,
User, User,
DeletedAlias,
) )
from app.utils import random_string from app.utils import random_string
from server import create_app from server import create_app
@ -154,15 +155,29 @@ class MailHandler:
if directory: if directory:
dir_user: User = directory.user dir_user: User = directory.user
if dir_user.can_create_new_alias(): if dir_user.can_create_new_alias():
LOG.d("create alias %s for directory %s", alias, directory) # if alias has been deleted before, do not auto-create it
on_the_fly = True if DeletedAlias.get_by(
email=alias, user_id=directory.user_id
):
LOG.error(
"Alias %s has been deleted before, cannot auto-create using directory %s, user %s",
alias,
directory_name,
dir_user,
)
else:
gen_email = GenEmail.create( LOG.d(
email=alias, "create alias %s for directory %s", alias, directory
user_id=directory.user_id, )
directory_id=directory.id, on_the_fly = True
)
db.session.commit() gen_email = GenEmail.create(
email=alias,
user_id=directory.user_id,
directory_id=directory.id,
)
db.session.commit()
else: else:
LOG.error( LOG.error(
"User %s is not premium anymore and cannot create alias with directory", "User %s is not premium anymore and cannot create alias with directory",
@ -182,16 +197,25 @@ class MailHandler:
if custom_domain and custom_domain.catch_all: if custom_domain and custom_domain.catch_all:
domain_user: User = custom_domain.user domain_user: User = custom_domain.user
if domain_user.can_create_new_alias(): if domain_user.can_create_new_alias():
LOG.d("create alias %s for domain %s", alias, custom_domain) # if alias has been deleted before, do not auto-create it
on_the_fly = True if DeletedAlias.get_by(email=alias, user_id=custom_domain.user_id):
LOG.error(
"Alias %s has been deleted before, cannot auto-create using domain catch-all %s, user %s",
alias,
custom_domain,
domain_user,
)
else:
LOG.d("create alias %s for domain %s", alias, custom_domain)
on_the_fly = True
gen_email = GenEmail.create( gen_email = GenEmail.create(
email=alias, email=alias,
user_id=custom_domain.user_id, user_id=custom_domain.user_id,
custom_domain_id=custom_domain.id, custom_domain_id=custom_domain.id,
automatic_creation=True, automatic_creation=True,
) )
db.session.commit() db.session.commit()
else: else:
LOG.error( LOG.error(
"User %s is not premium anymore and cannot create alias with domain %s", "User %s is not premium anymore and cannot create alias with domain %s",