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
26 changes: 19 additions & 7 deletions src/sentry/tasks/email.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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):
Expand Down
26 changes: 0 additions & 26 deletions src/sentry/web/forms/__init__.py
Original file line number Diff line number Diff line change
@@ -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
)
19 changes: 19 additions & 0 deletions tests/sentry/tasks/test_email.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading