Skip to content

feat: add SES routing for account activation emails with fallback support #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nthriveni-sonata-ship-it wants to merge 2 commits into
base: release-ulmo
Choose a base branch
from
+67 −13
Draft

feat: add SES routing for account activation emails with fallback support #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83ef742
feat: add SES routing for account activation emails with fallback sup…
nthriveni-sonata-ship-it Mar 31, 2026
3917337
refactor: simplify SES routing and fallback logic per review feedback
nthriveni-sonata-ship-it Apr 15, 2026
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
1 change: 1 addition & 0 deletions openedx/core/djangoapps/ace_common/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"""
import logging


Copy link
Copy Markdown
Member

@jsnwesson jsnwesson Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can probably remove this line and that means the only changes made are in tasks.py

log = logging.getLogger(__name__)


Expand Down
79 changes: 66 additions & 13 deletions openedx/core/djangoapps/user_authn/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,24 @@
from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
from openedx.core.djangoapps.user_authn.utils import check_pwned_password
from openedx.core.lib.celery.task_utils import emulate_http_request
from edx_toggles.toggles import WaffleFlag

log = logging.getLogger('edx.celery.task')

# .. toggle_name: user_authn.enable_ses_for_account_activation
# .. toggle_implementation: WaffleFlag
# .. toggle_default: False
# .. toggle_description: Route account activation emails via SES using ACE.
# .. toggle_use_cases: opt_in, temporary
# .. toggle_creation_date: 2026-03-31
# .. toggle_target_removal_date: None
# .. toggle_warning: Controls SES routing for account activation emails.

ENABLE_SES_FOR_ACCOUNT_ACTIVATION = WaffleFlag(
'user_authn.enable_ses_for_account_activation',
__name__,
)


@shared_task
@set_code_owner_attribute
Expand Down Expand Up @@ -60,6 +75,9 @@ def send_activation_email(self, msg_string, from_address=None, site_id=None):
max_retries = settings.RETRY_ACTIVATION_EMAIL_MAX_ATTEMPTS
retries = self.request.retries

if msg.options is None:
msg.options = {}

Comment thread
jsnwesson marked this conversation as resolved.
if from_address is None:
from_address = configuration_helpers.get_value('ACTIVATION_EMAIL_FROM_ADDRESS') or (
configuration_helpers.get_value('email_from_address', settings.DEFAULT_FROM_EMAIL)
Expand All @@ -71,28 +89,63 @@ def send_activation_email(self, msg_string, from_address=None, site_id=None):
site = Site.objects.get(id=site_id) if site_id else Site.objects.get_current()
user = User.objects.get(id=msg.recipient.lms_user_id)

route_via_ses = ENABLE_SES_FOR_ACCOUNT_ACTIVATION.is_enabled()
sent_via_ses = False

if route_via_ses:
Comment thread
jsnwesson marked this conversation as resolved.
msg.options['override_default_channel'] = 'django_email'

Comment thread
jsnwesson marked this conversation as resolved.
try:
with emulate_http_request(site=site, user=user):
ace.send(msg)
sent_via_ses = route_via_ses

except RecoverableChannelDeliveryError:
log.info('Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format(
dest_addr=dest_addr,
attempt=retries,
max_attempts=max_retries
))
try:
self.retry(countdown=settings.RETRY_ACTIVATION_EMAIL_TIMEOUT, max_retries=max_retries)
except MaxRetriesExceededError:
log.error(
'Unable to send activation email to user from "%s" to "%s"',
from_address,
if route_via_ses:
log.warning(
"SES send failed for %s, falling back to default ACE channel",
dest_addr,
exc_info=True
exc_info=True,
)

msg.options.pop('override_default_channel', None)

with emulate_http_request(site=site, user=user):
ace.send(msg)
sent_via_ses = False

else:
log.info(
'Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format(
dest_addr=dest_addr,
attempt=retries,
max_attempts=max_retries
)
)
try:
self.retry(
countdown=settings.RETRY_ACTIVATION_EMAIL_TIMEOUT,
max_retries=max_retries
)
except MaxRetriesExceededError:
log.error(
'Unable to send activation email to user from "%s" to "%s"',
from_address,
dest_addr,
exc_info=True
)
return

except Exception:
log.exception(
'Unable to send activation email to user from "%s" to "%s"',
from_address,
dest_addr,
)
raise Exception # lint-amnesty, pylint: disable=raise-missing-from
raise

log.info(
'Activation email for %s sent via %s',
dest_addr,
'SES' if sent_via_ses else 'default ACE channel',
)
Loading