diff --git a/src/sentry/tasks/email.py b/src/sentry/tasks/email.py index 140875e4d948..3d51d473c748 100644 --- a/src/sentry/tasks/email.py +++ b/src/sentry/tasks/email.py @@ -6,10 +6,12 @@ from sentry.auth import access from sentry.issues.action_log import ActionSource, GroupActionActor, action_context_scope +from sentry.models.activity import Activity from sentry.models.group import Group from sentry.silo.base import SiloMode from sentry.tasks.base import instrumented_task from sentry.taskworker.namespaces import notifications_control_tasks, notifications_tasks +from sentry.types.activity import ActivityType from sentry.users.services.user.model import RpcUser from sentry.users.services.user.service import user_service from sentry.utils.email import send_messages @@ -31,9 +33,6 @@ def _get_user_from_email(group: Group, email: str) -> RpcUser | None: def process_inbound_email(mailfrom: str, group_id: int, payload: str) -> None: - from sentry.models.group import Group - from sentry.web.forms import NewNoteForm - try: group = Group.objects.select_related("project").get(pk=group_id) except Group.DoesNotExist: @@ -45,10 +44,23 @@ def process_inbound_email(mailfrom: str, group_id: int, payload: str) -> None: logger.warning("Inbound email from unknown address: %s", mailfrom) return - form = NewNoteForm({"text": payload}) - if form.is_valid(): - with action_context_scope(ActionSource.EMAIL, GroupActionActor.user(user.id)): - form.save(group, user) + text = payload.strip() + if not text or "\x00" in text: + return + + data = {"text": text} + # Outbox delivery can retry, so identical comments must be idempotent. + if Activity.objects.filter( + group=group, + project_id=group.project_id, + user_id=user.id, + type=ActivityType.NOTE.value, + data=data, + ).exists(): + return + + with action_context_scope(ActionSource.EMAIL, GroupActionActor.user(user.id)): + Activity.objects.create_group_activity(group, ActivityType.NOTE, user=user, data=data) class TemporaryEmailError(Exception): diff --git a/src/sentry/web/forms/__init__.py b/src/sentry/web/forms/__init__.py index 5cd84e991779..e69de29bb2d1 100644 --- a/src/sentry/web/forms/__init__.py +++ b/src/sentry/web/forms/__init__.py @@ -1,26 +0,0 @@ -from django import forms - -from sentry.models.activity import Activity -from sentry.types.activity import ActivityType - - -class NewNoteForm(forms.Form): - text = forms.CharField( - widget=forms.Textarea(attrs={"rows": "1", "placeholder": "Type a note and press enter..."}) - ) - - def save(self, group, user): - qs = Activity.objects.filter( - group=group, - project_id=group.project_id, - user_id=user.id, - type=ActivityType.NOTE.value, - data=self.cleaned_data, - ) - # Prevent duplicate comments, this is necessary for outbox based - # delivery to be idempotent - if qs.exists(): - return - return Activity.objects.create_group_activity( - group, ActivityType.NOTE, user=user, data=self.cleaned_data - ) diff --git a/tests/sentry/tasks/test_email.py b/tests/sentry/tasks/test_email.py index 78fbcd185fed..94039bac25bc 100644 --- a/tests/sentry/tasks/test_email.py +++ b/tests/sentry/tasks/test_email.py @@ -8,6 +8,25 @@ class ProcessInboundEmailTest(TestCase): + def test_invalid_text(self) -> None: + group = self.create_group() + + for payload in ("", " \t\n", "hello\x00world"): + process_inbound_email(mailfrom=self.user.email, group_id=group.id, payload=payload) + + assert not Activity.objects.filter(group=group, type=ActivityType.NOTE.value).exists() + + def test_duplicate_delivery(self) -> None: + group = self.create_group() + + process_inbound_email( + mailfrom=self.user.email, group_id=group.id, payload=" \thello world!\n" + ) + process_inbound_email(mailfrom=self.user.email, group_id=group.id, payload="hello world!") + + activity = Activity.objects.get(group=group, type=ActivityType.NOTE.value) + assert activity.data == {"text": "hello world!"} + def test_simple(self) -> None: group = self.create_group()