added a check in the make_reply function to ensure that mails have a body

core/mail-097f1cf1adf66ab1e18cb70b065e45914c084d52520436c74dab18d5055101cd

@@ -1,26 +0,0 @@
-Subject: test
-From: test1@test
-To: test2@test
-Message-ID: <1@test>
-Content-Type: multipart/alternative; boundary="abc"
-
---abc
-Content-Type: text/plain; charset=utf-8
-
-test1
-
---abc
-Content-Type: image/jpeg; name="test.jpg"
-Content-Disposition: inline; filename="test.jpg"
-Content-Transfer-Encoding: base64
-Content-ID: <1>
-X-Attachment-Id: 1
-
-dGVzdGltYWdl
-
---abc
-Content-Type: text/plain; charset=utf-8
-
-test2
-
---abc--

core/mail-3254edd41df7e7f27bf80698b647a51a36ef62f226f33b3e51072fdb900390df

@@ -1,5 +0,0 @@
-Subject: test
-From: <test1@test>
-To: test2@test
-Message-ID: <1@test>
-

core/mail-3b1343b8f18b2e991acf80395c1338a2fafee4df705c9584058eed0de16afb31

@@ -1,8 +0,0 @@
-Subject: test
-From: test1@test
-To: test2@test
-Message-ID: <1@test>
-Content-Type: text/html; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
-
-hello =C3=A4=C3=B6=C3=BC

core/mail-42ee4087f0d74559768fe22003e82df5834974122a50fd5b5e24840acc74356d

@@ -1,6 +0,0 @@
-Subject: test
-From: test3@test
-To: test4@localhost
-Message-ID: <1@test>
-
-test

core/mail-4cd6cf91c51b3d75b92d7d5e4334b1f7a24f587ca48ca72a0382f39c3c0be11b

@@ -1,6 +0,0 @@
-Subject: =?UTF-8?Q?suche_M=C3=BCtze?=
-From: test3@test
-To: test4@test
-Message-ID: <1@test>
-
-Text mit Quoted-Printable-Kodierung: =?utf-8?Q?=C3=A4=C3=B6=C3=BC=C3=9F?=

core/mail-5c35987b7a827fed89a3d65142b95ab90452fdd563bf4647fee7d3d215032307

@@ -1,7 +0,0 @@
-Subject: test
-From: test1@test
-To: test2@test
-Message-ID: <1@test>
-Content-Type: text/html; charset=iso-8859-1
-
-hello äöü

core/mail-723cc57085d5747cddd1c2f5bcdcf4b81cc3c215fb255805b938fc08a1603157

@@ -1,21 +0,0 @@
-Subject: test
-From: test1@test
-To: test2@test
-Message-ID: <1@test>
-Content-Type: multipart/mixed; boundary="abc"
-
---abc
-Content-Type: text/plain; charset=utf-8
-
-test1
-
---abc
-Content-Type: image/jpeg; name="test.jpg"
-Content-Disposition: attachment; filename="test.jpg"
-Content-Transfer-Encoding: base64
-Content-ID: <1>
-X-Attachment-Id: 1
-
-dGVzdGltYWdl
-
---abc--

core/mail-73be0be950bbfdabdcbd7d5298d9133ba285ea99c7e86e172c18bfae1efe6e18

@@ -1,11 +0,0 @@
-Subject: test
-From: test1@test
-To: test2@test
-Message-ID: <1@test>
-Content-Type: text/html; charset=utf-8
-
-<div>
-<div>
-<p>test</p>
-</div>
-</div>

core/mail-9d5401a2107e1cbc42d75dae9eff4e24772415b41d5ff6daf5c79c97e398225a

@@ -1,6 +0,0 @@
-Subject: test =?utf-8?Q?=C3=A4?=
-From: test3@test
-To: test4@test
-Message-ID: <1@test>
-
-Text mit Quoted-Printable-Kodierung: =?utf-8?Q?=C3=A4=C3=B6=C3=BC=C3=9F?=

core/mail-a1bdb097374b6062732207f4a87fd41c9bb3d1c230a722bfc4c07f9c8ca68713

@@ -1,6 +0,0 @@
-Subject: =?utf-8?B?dGVzdA==?=
-From: test3@test
-To: test4@test
-Message-ID: <1@test>
-
-Text mit Base64-Kodierung: =?utf-8?B?w6TDtsO8w58=?=

core/mail-a75fd27ca0fb10aeae58c7c28dce16f1413fd846b7ccafed99e6c065bbbc3bee

@@ -1,6 +0,0 @@
-Subject: test
-From: test1@test
-To: test_event@localhost
-Message-ID: <1@test>
-
-test

core/mail-c5c0aacdf241ebcd654f3b41a6ffc04c38fccd675c0d3c8bee3c9745773eb143

@@ -1,5 +0,0 @@
-From: noreply@test
-To: test2@test
-Message-ID: <1@test>
-
-test

core/mail-d35ad18b5ce7ed9c2153dccf2a76218833082af12eddaf0a3a0acf5fc719e847

@@ -1,7 +0,0 @@
-Subject: test
-From: test1@test
-To: test2@test
-Message-ID: <1@test>
-Content-Type: text/html; charset=utf-8
-
-thank you =?utf-8?Q?=F0=9F=98=8A?=

core/mail/protocol.py

@@ -103,7 +103,7 @@ async def send_smtp(message):
     await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
 
 
-def find_active_issue_thread(in_reply_to, address, subject, event):
+def find_active_issue_thread(in_reply_to, address, subject, event, spam=False):
     from re import match
     uuid_match = match(r'^ticket\+([a-f0-9-]{36})@', address)
     if uuid_match:
@@ -114,7 +114,8 @@ def find_active_issue_thread(in_reply_to, address, subject, event):
     if reply_to.exists():
         return reply_to.first().issue_thread, False
     else:
-        issue = IssueThread.objects.create(name=subject, event=event)
+        issue = IssueThread.objects.create(name=subject, event=event,
+                                           initial_state='pending_suspected_spam' if spam else 'pending_new')
         return issue, True
 
 
@@ -213,6 +214,8 @@ def receive_email(envelope, log=None):
     header_to = parsed.get('To')
     header_in_reply_to = ascii_strip(parsed.get('In-Reply-To'))
     header_message_id = ascii_strip(parsed.get('Message-ID'))
+    maybe_spam = parsed.get('X-Spam')
+    suspected_spam = (maybe_spam and maybe_spam.lower() == 'yes')
 
     if match(r'^([a-zA-Z ]*<)?MAILER-DAEMON@', header_from) and envelope.mail_from.strip("<>") == "":
         log.warning("Ignoring mailer daemon")
@@ -232,7 +235,8 @@ def receive_email(envelope, log=None):
     sender = decode_inline_encodings(sender)
     target_event = find_target_event(recipient)
 
-    active_issue_thread, new = find_active_issue_thread(header_in_reply_to, recipient, subject, target_event)
+    active_issue_thread, new = find_active_issue_thread(
+        header_in_reply_to, recipient, subject, target_event, suspected_spam)
 
     from hashlib import sha256
     random_filename = 'mail-' + sha256(envelope.content).hexdigest()
@@ -250,7 +254,7 @@ def receive_email(envelope, log=None):
     if new:
         # auto reply if new issue
         references = collect_references(active_issue_thread)
-        if not sender.startswith('noreply'):
+        if not sender.startswith('noreply') and not sender.startswith('no-reply') and not suspected_spam:
             subject = f"Re: {subject} [#{active_issue_thread.short_uuid()}]"
             body = '''Your request (#{}) has been received and will be reviewed by our lost&found angels.
 

core/mail/tests/v2/test_mails.py

@@ -812,6 +812,44 @@ dGVzdGltYWdl
         self.assertEqual(None, IssueThread.objects.all()[0].assigned_to)
         aiosmtplib.send.assert_called_once()
 
+    def test_mail_spam_header(self):
+        from aiosmtpd.smtp import Envelope
+        from asgiref.sync import async_to_sync
+        import aiosmtplib
+        aiosmtplib.send = make_mocked_coro()
+        handler = LMTPHandler()
+        server = mock.Mock()
+        session = mock.Mock()
+        envelope = Envelope()
+        envelope.mail_from = 'test1@test'
+        envelope.rcpt_tos = ['test2@test']
+        envelope.content = b'''Subject: test
+From: test1@test
+To: test2@test
+Message-ID: <1@test>
+X-Spam: Yes
+
+test'''
+        result = async_to_sync(handler.handle_DATA)(server, session, envelope)
+
+        self.assertEqual(result, '250 Message accepted for delivery')
+        self.assertEqual(len(Email.objects.all()), 1) # do not send auto reply if spam is suspected
+        self.assertEqual(len(IssueThread.objects.all()), 1)
+        aiosmtplib.send.assert_not_called()
+        self.assertEqual('test', Email.objects.all()[0].subject)
+        self.assertEqual('test1@test', Email.objects.all()[0].sender)
+        self.assertEqual('test2@test', Email.objects.all()[0].recipient)
+        self.assertEqual('test', Email.objects.all()[0].body)
+        self.assertEqual(IssueThread.objects.all()[0], Email.objects.all()[0].issue_thread)
+        self.assertEqual('<1@test>', Email.objects.all()[0].reference)
+        self.assertEqual(None, Email.objects.all()[0].in_reply_to)
+        self.assertEqual('test', IssueThread.objects.all()[0].name)
+        self.assertEqual('pending_suspected_spam', IssueThread.objects.all()[0].state)
+        self.assertEqual(None, IssueThread.objects.all()[0].assigned_to)
+        states = StateChange.objects.filter(issue_thread=IssueThread.objects.all()[0])
+        self.assertEqual(1, len(states))
+        self.assertEqual('pending_suspected_spam', states[0].state)
+
     def test_mail_4byte_unicode_emoji(self):
         from aiosmtpd.smtp import Envelope
         from asgiref.sync import async_to_sync

core/tickets/models.py

@@ -16,6 +16,7 @@ STATE_CHOICES = (
     ('pending_physical_confirmation', 'Needs to be confirmed physically'),
     ('pending_return', 'Needs to be returned'),
     ('pending_postponed', 'Postponed'),
+    ('pending_suspected_spam', 'Suspected Spam'),
     ('waiting_details', 'Waiting for details'),
     ('waiting_pre_shipping', 'Waiting for Address/Shipping Info'),
     ('closed_returned', 'Closed: Returned'),
@@ -46,6 +47,11 @@ class IssueThread(SoftDeleteModel):
     event = models.ForeignKey(Event, null=True, on_delete=models.SET_NULL, related_name='issue_threads')
     manually_created = models.BooleanField(default=False)
 
+    def __init__(self, *args, **kwargs):
+        if 'initial_state' in kwargs:
+            self._initial_state = kwargs.pop('initial_state')
+        super().__init__(*args, **kwargs)
+
     def short_uuid(self):
         return self.uuid[:8]
 
@@ -110,8 +116,9 @@ def set_uuid(sender, instance, **kwargs):
 
 @receiver(post_save, sender=IssueThread)
 def create_issue_thread(sender, instance, created, **kwargs):
-    if created:
-        StateChange.objects.create(issue_thread=instance, state='pending_new')
+    if created and instance.state_changes.count() == 0:
+        initial_state = getattr(instance, '_initial_state', None)
+        StateChange.objects.create(issue_thread=instance, state=initial_state if initial_state else 'pending_new')
 
 
 class Comment(models.Model):

web/src/views/TicketSearch.vue

@@ -25,7 +25,7 @@
                               :columns="['id', 'name', 'last_activity', 'assigned_to',
                                         ...(getEventSlug==='all'?['event']:[])]"
                               :keyName="'state'" :sections="['pending_new', 'pending_open','pending_shipping',
-                          'pending_physical_confirmation','pending_return','pending_postponed'].map(stateInfo)">
+                          'pending_physical_confirmation','pending_return','pending_postponed','pending_suspected_spam'].map(stateInfo)">
                 <template #section_header="{index, section, count}">
                     {{ section.text }} <span class="badge badge-light ml-1">{{ count }}</span>
                 </template>

web/src/views/Tickets.vue

@@ -26,7 +26,7 @@
                               :columns="['id', 'name', 'last_activity', 'assigned_to',
                                         ...(getEventSlug==='all'?['event']:[])]"
                               :keyName="'state'" :sections="['pending_new', 'pending_open','pending_shipping',
-                          'pending_physical_confirmation','pending_return','pending_postponed'].map(stateInfo)">
+                          'pending_physical_confirmation','pending_return','pending_postponed','pending_suspected_spam'].map(stateInfo)">
                 <template #section_header="{index, section, count}">
                     {{ section.text }} <span class="badge badge-light ml-1">{{ count }}</span>
                 </template>