Просмотр исходного кода

Improve contact manager: lowercase the contact address before adding

Son NK 5 лет назад
Родитель
Сommit
7f85ec30bd
2 измененных файлов с 7 добавлено и 7 удалено
  1. 6 6
      app/api/views/alias.py
  2. 1 1
      app/dashboard/views/alias_contact_manager.py

+ 6 - 6
app/api/views/alias.py

@@ -326,7 +326,7 @@ def create_contact_route(alias_id):
     if alias.user_id != user.id:
         return jsonify(error="Forbidden"), 403
 
-    contact_email = data.get("contact")
+    contact_addr = data.get("contact").lower()
 
     # generate a reply_email, make sure it is unique
     # not use while to avoid infinite loop
@@ -336,21 +336,21 @@ def create_contact_route(alias_id):
         if not Contact.get_by(reply_email=reply_email):
             break
 
-    _, website_email = parseaddr(contact_email)
+    _, contact_email = parseaddr(contact_addr)
 
     # already been added
-    if Contact.get_by(alias_id=alias.id, website_email=website_email):
+    if Contact.get_by(alias_id=alias.id, website_email=contact_email):
         return jsonify(error="Contact already added"), 409
 
     contact = Contact.create(
         user_id=alias.user_id,
         alias_id=alias.id,
-        website_email=website_email,
-        website_from=contact_email,
+        website_email=contact_email,
+        website_from=contact_addr,
         reply_email=reply_email,
     )
 
-    LOG.d("create reverse-alias for %s %s", contact_email, alias)
+    LOG.d("create reverse-alias for %s %s", contact_addr, alias)
     db.session.commit()
 
     return jsonify(**serialize_contact(contact)), 201

+ 1 - 1
app/dashboard/views/alias_contact_manager.py

@@ -68,7 +68,7 @@ def alias_contact_manager(alias_id):
     if request.method == "POST":
         if request.form.get("form-name") == "create":
             if new_contact_form.validate():
-                contact_email = new_contact_form.email.data.strip()
+                contact_email = new_contact_form.email.data.strip().lower()
 
                 # generate a reply_email, make sure it is unique
                 # not use while to avoid infinite loop