TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Fixed MailgunEmailSuppressionList adding non-5xx failures to the list

Browse Source 
The MailgunEmailSuppression list was incorrectly adding emails
to the suppression list for permanent failure events which have
an error code outside of the 5xx range.
This commit is contained in:
Fabien 'egg' O'Carroll 2023-01-04 17:03:52 +07:00 committed by GitHub
parent ea9c8c03fe
commit e78612bb66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,6 +97,14 @@ class MailgunEmailSuppressionList extends AbstractEmailSuppressionList {
async init() {
const handleEvent = reason => async (event) => {
try {
if (reason === 'bounce') {
if (!Number.isInteger(event.error?.code)) {
return;
}
if (event.error.code < 500 || event.error.code > 599) {
return;
}
}
await this.Suppression.add({
email_address: event.email,
email_id: event.emailId,

7
ghost/core/test/integration/services/email-service/email-event-storage.test.js
View File

@ -208,6 +208,9 @@ describe('EmailEventStorage', function () {
const providerId = emailBatch.provider_id;
const timestamp = new Date(2000, 0, 1);
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');
events = [{
event: 'failed',
id: 'pl271FzxTTmGRW8Uj3dUWw',
@ -297,6 +300,10 @@ describe('EmailEventStorage', function () {
assert.equal(permanentFailures.models[0].get('event_id'), 'pl271FzxTTmGRW8Uj3dUWw');
assert.equal(permanentFailures.models[0].get('severity'), 'permanent');
assert.equal(permanentFailures.models[0].get('failed_at').toUTCString(), timestamp.toUTCString());
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);
});
it('Ignores permanent failures if already failed', async function () {