Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dtable_events/automations/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from copy import deepcopy
from dataclasses import dataclass, field
from datetime import datetime, date, timedelta, timezone
from email.utils import parseaddr
from queue import Full
from urllib.parse import unquote, urlparse, parse_qs
from uuid import UUID
Expand Down Expand Up @@ -1131,7 +1132,8 @@ class SendEmailAction(BaseAction):
def is_valid_email(self, email):
"""A heavy email format validation.
"""
return is_valid_email(email)
parsed_email = parseaddr(email)[1]
return is_valid_email(parsed_email)

def __init__(self, auto_rule, action_type, data, send_info, account_id, repo_id):

Expand Down
15 changes: 12 additions & 3 deletions dtable_events/automations/general_actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import re
import time
from copy import deepcopy
from email.utils import parseaddr
from uuid import UUID
from datetime import datetime, timedelta

Expand Down Expand Up @@ -467,6 +468,12 @@ class SendEmailAction(BaseAction):
SEND_FROM_AUTOMATION_RULES = 'automation-rules'
SEND_FROM_WORKFLOW = 'workflow'

def is_valid_email(self, email):
"""A heavy email format validation.
"""
parsed_email = parseaddr(email)[1]
return is_valid_email(parsed_email)

def __init__(self, context: BaseContext, account_id, subject, msg, send_to, copy_to, send_from):
super().__init__(context)
self.account_id = account_id
Expand All @@ -477,12 +484,14 @@ def __init__(self, context: BaseContext, account_id, subject, msg, send_to, copy
self.subject = subject

def do_action_without_row(self):
return self.do_action_with_row(None)
return self.do_action_with_row({})

def replace_username_with_contact_emails(self, emails):
return_emails = []
usernames = []
for item in emails:
if not self.is_valid_email(item):
continue
if '@auth.local' in item:
usernames.append(item)
continue
Expand All @@ -508,15 +517,15 @@ def do_action_with_row(self, converted_row):
if self.send_to_list:
for send_to in self.send_to_list:
real_send_to = self.generate_real_msg(send_to, sql_row, convert_to_nickname=False)
if is_valid_email(real_send_to):
if self.is_valid_email(real_send_to):
valid_send_to_list.append(real_send_to)
valid_send_to_list = self.replace_username_with_contact_emails(valid_send_to_list)
if not valid_send_to_list:
return
if self.copy_to_list:
for copy_to in self.copy_to_list:
real_copy_to = self.generate_real_msg(copy_to, sql_row, convert_to_nickname=False)
if is_valid_email(real_copy_to):
if self.is_valid_email(real_copy_to):
valid_copy_to_list.append(real_copy_to)
valid_copy_to_list = self.replace_username_with_contact_emails(valid_copy_to_list)
send_info = {
Expand Down