TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-24 06:35:49 +03:00
Code Issues Projects Releases Wiki Activity

Updated MailgunEmailSuppressionList to only handle previous bounces

Browse Source 
We're seeing behaviour from Mailgun where permanent failures with a
5xx error code are not being added to their internal suppression list,
which is resulting in the Ghost list becoming out of sync with
Mailgun.

Rather than adding emails to the suppression list when Mailgun does,
we're instead going to add emails _after_ Mailgun does, by waiting for
an error code which tells us the email is already on the suppression
list.

Those codes are 605 for previous bounces and 607 for previous spam complaints.
This commit is contained in:
Fabien "egg" O'Carroll 2023-01-11 09:30:15 +07:00 committed by Fabien 'egg' O'Carroll
parent 9c664c8d02
commit 49af26279d
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ghost/core/core/server/services/email-suppression-list/MailgunEmailSuppressionList.js
View File

@ -101,7 +101,7 @@ class MailgunEmailSuppressionList extends AbstractEmailSuppressionList {
if (!Number.isInteger(event.error?.code)) {
return;
}
if (event.error.code < 500 || event.error.code > 599 && event.error.code !== 605) {
if (event.error.code !== 607 && event.error.code !== 605) {
return;
}
}

14
ghost/core/test/integration/services/mailgun-email-suppression-list.test.js
View File

@ -58,7 +58,7 @@ describe('MailgunEmailSuppressionList', function () {
assert.equal(memberAfter.email_suppression.info.reason, 'fail');
});
it('Can handle permanent failure events with an error code of 6xx', async function () {
it('Can handle permanent failure events with an error code of 607', async function () {
const emailBatch = fixtureManager.get('email_batches', 0);
const emailRecipient = fixtureManager.get('email_recipients', 1);
@ -71,10 +71,8 @@ describe('MailgunEmailSuppressionList', function () {
const {body: {members: [member]}} = await agent.get(`/members/${memberId}`);
assert.equal(member.email_suppression.suppressed, false, 'This test requires a member that does not have a suppressed email');
const errorCode = 600 + Math.floor(Math.random() * 100);
events = [createPermanentFailedEvent({
errorCode: errorCode === 605 ? 606 : errorCode, // Random number between 600-699, but not 605
errorCode: 607,
providerId,
timestamp,
recipient
@ -87,8 +85,8 @@ describe('MailgunEmailSuppressionList', function () {
await DomainEvents.allSettled();
const {body: {members: [memberAfter]}} = await agent.get(`/members/${memberId}`);
assert.equal(memberAfter.email_suppression.suppressed, false, 'The member should not have a suppressed email');
assert.equal(memberAfter.email_suppression.info, null);
assert.equal(memberAfter.email_suppression.suppressed, true, 'The member should have a suppressed email');
assert.equal(memberAfter.email_suppression.info.reason, 'fail');
});
it('Can handle permanent failure events with an error code of 4xx', async function () {
@ -149,8 +147,8 @@ describe('MailgunEmailSuppressionList', function () {
await DomainEvents.allSettled();
const {body: {members: [memberAfter]}} = await agent.get(`/members/${memberId}`);
assert.equal(memberAfter.email_suppression.suppressed, true, 'The member should have a suppressed email');
assert.equal(memberAfter.email_suppression.info.reason, 'fail');
assert.equal(memberAfter.email_suppression.suppressed, false, 'The member should not have a suppressed email');
assert.equal(memberAfter.email_suppression.info, null);
});
it('Can handle complaint events', async function () {