Disable legacy unsub messages

Author: acasajus

app/handler/unsubscribe_encoder.py

@@ -108,27 +108,7 @@ def _get_signer() -> itsdangerous.Signer:
     @classmethod
     def decode_subject(cls, data: str) -> Optional[UnsubscribeData]:
         if data.find(UNSUB_PREFIX) == -1:
-            try:
-                # subject has the format {alias.id}=
-                if data.endswith("="):
-                    alias_id = int(data[:-1])
-                    return UnsubscribeData(UnsubscribeAction.DisableAlias, alias_id)
-                # {contact.id}_
-                elif data.endswith("_"):
-                    contact_id = int(data[:-1])
-                    return UnsubscribeData(UnsubscribeAction.DisableContact, contact_id)
-                # {user.id}*
-                elif data.endswith("*"):
-                    user_id = int(data[:-1])
-                    return UnsubscribeData(
-                        UnsubscribeAction.UnsubscribeNewsletter, user_id
-                    )
-                else:
-                    # some email providers might strip off the = suffix
-                    alias_id = int(data)
-                    return UnsubscribeData(UnsubscribeAction.DisableAlias, alias_id)
-            except ValueError:
-                return None
+            return None
 
         signer = cls._get_signer()
         try:

tests/handler/test_unsubscribe_encoder.py

@@ -9,16 +9,15 @@
 )
 
 legacy_subject_test_data = [
-    ("3=", UnsubscribeData(UnsubscribeAction.DisableAlias, 3)),
-    ("438_", UnsubscribeData(UnsubscribeAction.DisableContact, 438)),
-    ("4325*", UnsubscribeData(UnsubscribeAction.UnsubscribeNewsletter, 4325)),
+    "3=",
+    "438_",
+    "4325*",
 ]
 
 
-@pytest.mark.parametrize("expected_subject, expected_deco", legacy_subject_test_data)
-def test_legacy_unsub_subject(expected_subject, expected_deco):
-    info = UnsubscribeEncoder.decode_subject(expected_subject)
-    assert info == expected_deco
+@pytest.mark.parametrize("legacy_subject", legacy_subject_test_data)
+def test_legacy_unsub_subject_rejected(legacy_subject):
+    assert UnsubscribeEncoder.decode_subject(legacy_subject) is None
 
 
 legacy_url_test_data = [

tests/handler/test_unsubscribe_handler.py

@@ -29,19 +29,18 @@ def _get_envelope_and_message(user: User, subject: str) -> (Envelope, Message):
 
 
 @mail_sender.store_emails_test_decorator
-def test_old_subject_disable_alias():
+def test_old_subject_disable_alias_rejected():
     user = create_new_user()
     alias = Alias.create_new_random(user)
     Session.commit()
     envelope, message = _get_envelope_and_message(user, f"{alias.id}=")
     response = UnsubscribeHandler().handle_unsubscribe_from_message(envelope, message)
-    assert status.E202 == response
-    assert not Alias.get(alias.id).enabled
-    assert 1 == len(mail_sender.get_stored_emails())
+    assert status.E507 == response
+    assert Alias.get(alias.id).enabled
 
 
 @mail_sender.store_emails_test_decorator
-def test_old_subject_block_contact():
+def test_old_subject_block_contact_rejected():
     user = create_new_user()
     alias = Alias.create_new_random(user)
     Session.commit()
@@ -55,19 +54,17 @@ def test_old_subject_block_contact():
     )
     envelope, message = _get_envelope_and_message(user, f"{contact.id}_")
     response = UnsubscribeHandler().handle_unsubscribe_from_message(envelope, message)
-    assert status.E202 == response
-    assert Contact.get(contact.id).block_forward
-    assert 1 == len(mail_sender.get_stored_emails())
+    assert status.E507 == response
+    assert not Contact.get(contact.id).block_forward
 
 
 @mail_sender.store_emails_test_decorator
-def test_old_subject_disable_newsletter():
+def test_old_subject_disable_newsletter_rejected():
     user = create_new_user()
     envelope, message = _get_envelope_and_message(user, f"{user.id}*")
     response = UnsubscribeHandler().handle_unsubscribe_from_message(envelope, message)
-    assert status.E202 == response
-    assert not User.get(user.id).notification
-    assert 1 == len(mail_sender.get_stored_emails())
+    assert status.E507 == response
+    assert User.get(user.id).notification
 
 
 @mail_sender.store_emails_test_decorator