High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
feat: add Lettermint as bounce webhook provider (#2935)
Bjorn Antonissen1525852e8036
diff --git a/cmd/bounce.go b/cmd/bounce.goindex 6536f330..965d0a88 100644--- a/cmd/bounce.go+++ b/cmd/bounce.go@@ -152,7 +152,7 @@ func (a *App) BounceWebhook(c echo.Context) error {bounces = append(bounces, b)// Amazon SES.- case service == "ses" && a.cfg.BounceSESEnabled:+ case service == "ses" && a.bounce.SES != nil:switch c.Request().Header.Get("X-Amz-Sns-Message-Type") {// SNS webhook registration confirmation. Only after these are processed will the endpoint// start getting bounce notifications.@@ -176,7 +176,7 @@ func (a *App) BounceWebhook(c echo.Context) error {}// SendGrid.- case service == "sendgrid" && a.cfg.BounceSendgridEnabled:+ case service == "sendgrid" && a.bounce.Sendgrid != nil:var (sig = c.Request().Header.Get("X-Twilio-Email-Event-Webhook-Signature")ts = c.Request().Header.Get("X-Twilio-Email-Event-Webhook-Timestamp")@@ -191,7 +191,7 @@ func (a *App) BounceWebhook(c echo.Context) error {bounces = append(bounces, bs...)// Postmark.- case service == "postmark" && a.cfg.BouncePostmarkEnabled:+ case service == "postmark" && a.bounce.Postmark != nil:bs, err := a.bounce.Postmark.ProcessBounce(rawReq, c)if err != nil {a.log.Printf("error processing postmark notification: %v", err)@@ -204,7 +204,7 @@ func (a *App) BounceWebhook(c echo.Context) error {bounces = append(bounces, bs...)// ForwardEmail.- case service == "forwardemail" && a.cfg.BounceForwardemailEnabled:+ case service == "forwardemail" && a.bounce.Forwardemail != nil:var (sig = c.Request().Header.Get("X-Webhook-Signature"))@@ -220,6 +220,20 @@ func (a *App) BounceWebhook(c echo.Context) error {}bounces = append(bounces, bs...)+ // Lettermint.+ case service == "lettermint" && a.bounce.Lettermint != nil:+ sig := c.Request().Header.Get("X-Lettermint-Signature")+ bs, err := a.bounce.Lettermint.ProcessBounce(sig, rawReq)+ if err != nil {+ a.log.Printf("error processing lettermint notification: %v", err)+ if _, ok := err.(*echo.HTTPError); ok {+ return err+ }++ return echo.NewHTTPError(http.StatusBadRequest, a.i18n.T("globals.messages.invalidData"))+ }+ bounces = append(bounces, bs...)+default:return echo.NewHTTPError(http.StatusBadRequest, a.i18n.Ts("bounces.unknownService"))}diff --git a/cmd/init.go b/cmd/init.goindex c434fcf5..93d8748a 100644--- a/cmd/init.go+++ b/cmd/init.go@@ -146,6 +146,7 @@ type Config struct {BounceSendgridEnabled boolBouncePostmarkEnabled boolBounceForwardemailEnabled bool+ BounceLettermintEnabled boolPermissionsRaw json.RawMessagePermissions map[string]struct{}@@ -485,6 +486,7 @@ func initConstConfig(ko *koanf.Koanf) *Config {c.BounceSendgridEnabled = ko.Bool("bounce.sendgrid_enabled")c.BouncePostmarkEnabled = ko.Bool("bounce.postmark.enabled")c.BounceForwardemailEnabled = ko.Bool("bounce.forwardemail.enabled")+ c.BounceLettermintEnabled = ko.Bool("bounce.lettermint.enabled")c.HasLegacyUser = ko.Exists("app.admin_username") || ko.Exists("app.admin_password")b := md5.Sum([]byte(time.Now().String()))@@ -809,6 +811,13 @@ func initBounceManager(cb func(models.Bounce) error, stmt *sqlx.Stmt, lo *log.Loko.Bool("bounce.forwardemail.enabled"),ko.String("bounce.forwardemail.key"),},+ Lettermint: struct {+ Enabled bool+ Key string+ }{+ ko.Bool("bounce.lettermint.enabled"),+ ko.String("bounce.lettermint.key"),+ },RecordBounceCB: cb,}diff --git a/cmd/settings.go b/cmd/settings.goindex 12ecf2f7..d1441a61 100644--- a/cmd/settings.go+++ b/cmd/settings.go@@ -76,6 +76,7 @@ func (a *App) GetSettings(c echo.Context) error {s.SendgridKey = strings.Repeat(pwdMask, utf8.RuneCountInString(s.SendgridKey))s.BouncePostmark.Password = strings.Repeat(pwdMask, utf8.RuneCountInString(s.BouncePostmark.Password))s.BounceForwardEmail.Key = strings.Repeat(pwdMask, utf8.RuneCountInString(s.BounceForwardEmail.Key))+ s.BounceLettermint.Key = strings.Repeat(pwdMask, utf8.RuneCountInString(s.BounceLettermint.Key))s.SecurityCaptcha.HCaptcha.Secret = strings.Repeat(pwdMask, utf8.RuneCountInString(s.SecurityCaptcha.HCaptcha.Secret))s.OIDC.ClientSecret = strings.Repeat(pwdMask, utf8.RuneCountInString(s.OIDC.ClientSecret))@@ -222,6 +223,9 @@ func (a *App) UpdateSettings(c echo.Context) error {if set.BounceForwardEmail.Key == "" {set.BounceForwardEmail.Key = cur.BounceForwardEmail.Key}+ if set.BounceLettermint.Key == "" {+ set.BounceLettermint.Key = cur.BounceLettermint.Key+ }if set.SecurityCaptcha.HCaptcha.Secret == "" {set.SecurityCaptcha.HCaptcha.Secret = cur.SecurityCaptcha.HCaptcha.Secret}diff --git a/docs/docs/content/bounces.md b/docs/docs/content/bounces.mdindex b0c967f2..3d96e2f2 100644--- a/docs/docs/content/bounces.md+++ b/docs/docs/content/bounces.md@@ -46,11 +46,12 @@ curl -u 'api_username:access_token' -X POST 'http://localhost:9000/webhooks/bounlistmonk supports receiving bounce webhook events from the following SMTP providers.| Endpoint | Description | More info |-| :------------------------------------------------------------ | :------------------------------------- | :-------------------------------------------------------------------------------------------------------------------- |+|:--------------------------------------------------------------|:---------------------------------------|:----------------------------------------------------------------------------------------------------------------------|| `https://listmonk.yoursite.com/webhooks/service/ses` | Amazon (AWS) SES | See below || `https://listmonk.yoursite.com/webhooks/service/sendgrid` | Sendgrid / Twilio Signed event webhook | [More info](https://docs.sendgrid.com/for-developers/tracking-events/getting-started-event-webhook-security-features) || `https://listmonk.yoursite.com/webhooks/service/postmark` | Postmark webhook | [More info](https://postmarkapp.com/developer/webhooks/webhooks-overview) || `https://listmonk.yoursite.com/webhooks/service/forwardemail` | Forward Email webhook | [More info](https://forwardemail.net/en/faq#do-you-support-bounce-webhooks) |+| `https://listmonk.yoursite.com/webhooks/service/lettermint` | Lettermint webhook | [More info](https://docs.lettermint.co/platform/webhooks/introduction) |## Amazon Simple Email Service (SES)diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vueindex d476055e..effd6835 100644--- a/frontend/src/views/Settings.vue+++ b/frontend/src/views/Settings.vue@@ -178,6 +178,12 @@ export default Vue.extend({hasDummy = 'forwardemail';}+ if (this.isDummy(form['bounce.lettermint'].key)) {+ form['bounce.lettermint'].key = '';+ } else if (this.hasDummy(form['bounce.lettermint'].key)) {+ hasDummy = 'lettermint';+ }+for (let i = 0; i < form.messengers.length; i += 1) {// If it's the dummy UI password placeholder, ignore it.if (this.isDummy(form.messengers[i].password)) {diff --git a/frontend/src/views/settings/bounces.vue b/frontend/src/views/settings/bounces.vueindex 5b834a95..d5be2170 100644--- a/frontend/src/views/settings/bounces.vue+++ b/frontend/src/views/settings/bounces.vue@@ -112,6 +112,21 @@</b-field></div></div>+ <div class="columns">+ <div class="column is-3">+ <b-field :label="$t('settings.bounces.enableLettermint')">+ <b-switch v-model="data['bounce.lettermint'].enabled" name="lettermint_enabled" :native-value="true"+ data-cy="btn-enable-bounce-lettermint" />+ </b-field>+ </div>+ <div class="column">+ <b-field :label="$t('settings.bounces.lettermintKey')" :message="$t('globals.messages.passwordChange')">+ <b-input v-model="data['bounce.lettermint'].key" type="password"+ :disabled="!data['bounce.lettermint'].enabled" name="lettermint_key"+ data-cy="bounce-lettermint-key" />+ </b-field>+ </div>+ </div></div></div>diff --git a/i18n/bg.json b/i18n/bg.jsonindex 458d09d3..224181b8 100644--- a/i18n/bg.json+++ b/i18n/bg.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Папка","settings.bounces.folderHelp": "Име на IMAP папката за сканиране. Напр.: Inbox.","settings.bounces.forwardemailKey": "Forward Email ключ",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Интервалът за сканиране на bounces трябва да бъде минимум 1 минута.","settings.bounces.name": "Отскоци","settings.bounces.none": "Няма",diff --git a/i18n/ca.json b/i18n/ca.jsonindex 1a76b53e..952e71e6 100644--- a/i18n/ca.json+++ b/i18n/ca.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Carpeta","settings.bounces.folderHelp": "Nom de la carpeta IMAP a escanejar. Ex: Safata d'entrada.","settings.bounces.forwardemailKey": "Reenviar clau de correu",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "L'interval d'escaneig ha de ser com a mínim d'1 minut.","settings.bounces.name": "Rebots","settings.bounces.none": "Cap",diff --git a/i18n/cs-cz.json b/i18n/cs-cz.jsonindex 0886df42..e06aafb1 100644--- a/i18n/cs-cz.json+++ b/i18n/cs-cz.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Složka","settings.bounces.folderHelp": "Název složky IMAP ke skenování. Např.: Došlá pošta.","settings.bounces.forwardemailKey": "Klíč pro přeposílání e-mailů",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Interval skenování v případě nedoručitelnosti by měl být minimálně 1 minuta.","settings.bounces.name": "Případy nedoručitelnosti","settings.bounces.none": "Žádné",diff --git a/i18n/cy.json b/i18n/cy.jsonindex 39d4f652..bc7d7fa4 100644--- a/i18n/cy.json+++ b/i18n/cy.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Ffolder","settings.bounces.folderHelp": "Enw'r ffolder IMAP i'w sganio. ee: blwch derbyn.","settings.bounces.forwardemailKey": "Allwedd Anfon E-bost ymlaen",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Dylai'r cyfnod sganio ar gyfer negeseuon sydd wedi sboncio'n ôl bara o leiaf 1 munud","settings.bounces.name": "Wedi sboncio'n ôl","settings.bounces.none": "Dim",diff --git a/i18n/da.json b/i18n/da.jsonindex 2c33e1ca..ed79ffbd 100644--- a/i18n/da.json+++ b/i18n/da.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Mappe","settings.bounces.folderHelp": "Navnet på den IMAP-mappe, der skal scannes. F.eks.: Indbakke.","settings.bounces.forwardemailKey": "Nøgle til videresendelse af e-mail",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Skanningsinterval for afviste emails skal være mindst 1 minut.","settings.bounces.name": "Afviste emails","settings.bounces.none": "Ingen",diff --git a/i18n/de.json b/i18n/de.jsonindex c7fe730d..75c0435f 100644--- a/i18n/de.json+++ b/i18n/de.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Ordner","settings.bounces.folderHelp": "Name des zu scannenden IMAP-Ordners. z.B.: Inbox.","settings.bounces.forwardemailKey": "Weiterleitungs-E-Mail Schlüssel",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Der Bounce Scan-Interval sollte mindestens 1 Minute betragen.","settings.bounces.name": "Bounces","settings.bounces.none": "Keine",diff --git a/i18n/el.json b/i18n/el.jsonindex c02b14fc..43755b53 100644--- a/i18n/el.json+++ b/i18n/el.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Φάκελος","settings.bounces.folderHelp": "Όνομα του φακέλου IMAP προς περιοδική σάρωση. Π.χ.: Εισερχόμενα.","settings.bounces.forwardemailKey": "Κλειδί προώθησης email",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Το διάστημα σάρωσης για αναγνώριση των bounce πρέπει να είναι τουλάχιστον 1 λεπτό.","settings.bounces.name": "Bounce","settings.bounces.none": "Κανένα",diff --git a/i18n/en.json b/i18n/en.jsonindex 13004514..0c284b01 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -400,6 +400,8 @@"settings.bounces.folder": "Folder","settings.bounces.folderHelp": "Name of the IMAP folder to scan. Eg: Inbox.","settings.bounces.forwardemailKey": "Forward Email Key",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Bounce scan interval should be minimum 1 minute.","settings.bounces.name": "Bounces","settings.bounces.none": "None",diff --git a/i18n/eo.json b/i18n/eo.jsonindex c9e495c5..042b7deb 100644--- a/i18n/eo.json+++ b/i18n/eo.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Carpeta","settings.bounces.folderHelp": "Nom de la carpeta IMAP a escanejar. Ex: Safata d'entrada.","settings.bounces.forwardemailKey": "Ŝlosilo por retpoŝta plusendo",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "L'interval d'escaneig ha de ser com a mínim d'1 minut.","settings.bounces.name": "Rebots","settings.bounces.none": "Cap",diff --git a/i18n/es.json b/i18n/es.jsonindex e9fc038b..d5a71a01 100644--- a/i18n/es.json+++ b/i18n/es.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Carpeta","settings.bounces.folderHelp": "Nombre de la carpeta IMAP a escanear, por ejemplo: Entrada.","settings.bounces.forwardemailKey": "Clave de Reenvío de Email",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "El intervalo mínimo de escanéo de los rebotes debería de ser 1 minuto.","settings.bounces.name": "Rebotes","settings.bounces.none": "Ninguno",diff --git a/i18n/fi.json b/i18n/fi.jsonindex e7cb1ac7..fba88551 100644--- a/i18n/fi.json+++ b/i18n/fi.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Kansio","settings.bounces.folderHelp": "IMAP-kansion nimi, joka tarkistetaan. Esim. Saapuneet.","settings.bounces.forwardemailKey": "Välitysavaimen sähköposti",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Bounce skannausintervallin pitää olla vähintään 1 minuutti.","settings.bounces.name": "Bouncet","settings.bounces.none": "Ei mitään",diff --git a/i18n/fr-CA.json b/i18n/fr-CA.jsonindex 016bba9e..bd9eced7 100644--- a/i18n/fr-CA.json+++ b/i18n/fr-CA.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Dossier","settings.bounces.folderHelp": "Nom du dossier IMAP à scanner. Exple : InBox.","settings.bounces.forwardemailKey": "Clé de transfert d'e-mails",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "L'intervalle de 'scan' des rebonds doit être d'au moins 1 minute.","settings.bounces.name": "Rebonds","settings.bounces.none": "Aucun",diff --git a/i18n/fr.json b/i18n/fr.jsonindex 6d1d6e8b..3e74e4af 100644--- a/i18n/fr.json+++ b/i18n/fr.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Dossier","settings.bounces.folderHelp": "Nom du dossier IMAP à scanner. Exple : InBox.","settings.bounces.forwardemailKey": "Clé de transfert d'e-mail",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "L'intervalle de 'scan' des rebonds doit être d'au moins 1 minute.","settings.bounces.name": "Rebonds","settings.bounces.none": "Aucun",diff --git a/i18n/he.json b/i18n/he.jsonindex c4d0e87a..084a3b3f 100644--- a/i18n/he.json+++ b/i18n/he.json@@ -407,6 +407,8 @@"settings.bounces.folder": "תיקייה","settings.bounces.folderHelp": "שם התיקייה של שורת הכתובת החדשה שמתקשרת עם שימוש. לדוגמה: Inbox.","settings.bounces.forwardemailKey": "מפתח העברת מייל",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "מרווח הסריקה לשטחות צריך להיות מינימום של דקה אחת.","settings.bounces.name": "השטחות","settings.bounces.none": "אין",diff --git a/i18n/hu.json b/i18n/hu.jsonindex c059c638..4815540b 100644--- a/i18n/hu.json+++ b/i18n/hu.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Mappa","settings.bounces.folderHelp": "A vizsgálandó IMAP mappa neve. Például: Beérkezett üzenetek","settings.bounces.forwardemailKey": "Továbbító e-mail kulcs",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Az ellenőrzés gyakorisága 1 percnél nagyobb kell legyen.","settings.bounces.name": "Visszapattanók","settings.bounces.none": "Nincs",diff --git a/i18n/it.json b/i18n/it.jsonindex 4893eb8c..d4a29440 100644--- a/i18n/it.json+++ b/i18n/it.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Cartella","settings.bounces.folderHelp": "Nome della cartella IMAP da analizzare. Ad esempio: Posta in arrivo.","settings.bounces.forwardemailKey": "Chiave inoltro email",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "L'intervallo di scansione dei rimbalzi deve essere di almeno 1 minuto.","settings.bounces.name": "Rimbalzi","settings.bounces.none": "Nessuno",diff --git a/i18n/jp.json b/i18n/jp.jsonindex 118249f5..e3e7f02b 100644--- a/i18n/jp.json+++ b/i18n/jp.json@@ -407,6 +407,8 @@"settings.bounces.folder": "フォルダ","settings.bounces.folderHelp": "スキャンするIMAPフォルダの名前。 例: Inbox.","settings.bounces.forwardemailKey": "転送メールキー",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "バウンススキャン間隔は最低1分。","settings.bounces.name": "バウンス","settings.bounces.none": "なし",diff --git a/i18n/ko.json b/i18n/ko.jsonindex ef3212de..0873e566 100644--- a/i18n/ko.json+++ b/i18n/ko.json@@ -407,6 +407,8 @@"settings.bounces.folder": "폴더","settings.bounces.folderHelp": "스캔할 IMAP 폴더 이름. 예: Inbox.","settings.bounces.forwardemailKey": "Forward Email 키",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "바운스 스캔 간격은 최소 1분이어야 합니다.","settings.bounces.name": "바운스","settings.bounces.none": "없음",diff --git a/i18n/ml.json b/i18n/ml.jsonindex ec0dafe9..bf7bff61 100644--- a/i18n/ml.json+++ b/i18n/ml.json@@ -407,6 +407,8 @@"settings.bounces.folder": "ഫോൾഡർ","settings.bounces.folderHelp": "സ്കാൻ ചെയ്യാനുള്ള IMAP ഫോൾഡറിന്റെ പേര്. ഉദാ: ഇൻബോക്സ്.","settings.bounces.forwardemailKey": "ഫോറ്വേഡ് ഇമെയിൽ കീ",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "ബൗൺസ് സ്കാൻ ചെയ്യാനുള്ള ഏറ്റവും കുറഞ്ഞ ഇടവേള 1 മിനിറ്റായിരിക്കണം.","settings.bounces.name": "ബൗൺസുകൾ","settings.bounces.none": "ഒന്നുമില്ല",diff --git a/i18n/nl.json b/i18n/nl.jsonindex e499eaea..94222b7b 100644--- a/i18n/nl.json+++ b/i18n/nl.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Map","settings.bounces.folderHelp": "Naam van de IMAP map om te scannen. Bv.: Inbox.","settings.bounces.forwardemailKey": "Forward Email-sleutel",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Bounce scan interval moet minstens 1 minuut zijn.","settings.bounces.name": "Bounces","settings.bounces.none": "Geen",diff --git a/i18n/no.json b/i18n/no.jsonindex f68284cf..e5090b57 100644--- a/i18n/no.json+++ b/i18n/no.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Mappe","settings.bounces.folderHelp": "Navn på IMAP-mappen som skal skannes, f.eks. Innboks.","settings.bounces.forwardemailKey": "Videresend e-postnøkkel",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Skanningsintervallet må være minst 1 minutt.","settings.bounces.name": "Feilmeldinger","settings.bounces.none": "Ingen",diff --git a/i18n/pl.json b/i18n/pl.jsonindex 30163bfa..934b8443 100644--- a/i18n/pl.json+++ b/i18n/pl.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Folder","settings.bounces.folderHelp": "Nazwa folderu IMAP do skanowania. Np: Inbox.","settings.bounces.forwardemailKey": "Klucz przekazywania e-maili",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Interwał czasu powinien być minimum 1 minuta.","settings.bounces.name": "Odbicia","settings.bounces.none": "Brak",diff --git a/i18n/pt-BR.json b/i18n/pt-BR.jsonindex 4251e81b..22a5080c 100644--- a/i18n/pt-BR.json+++ b/i18n/pt-BR.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Pasta","settings.bounces.folderHelp": "Noma da pasta IMAP para escanear. Ex: Inbox.","settings.bounces.forwardemailKey": "Chave de Encaminhamento de Email",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Intervalo de escaneamento de Bounce deve ser no mínimo 1 minuto.","settings.bounces.name": "Rejeições","settings.bounces.none": "Nenhuma",diff --git a/i18n/pt.json b/i18n/pt.jsonindex 3043cbba..5c51b437 100644--- a/i18n/pt.json+++ b/i18n/pt.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Pasta","settings.bounces.folderHelp": "Nome da pasta IMAP para procurar. E.g.: Inbox.","settings.bounces.forwardemailKey": "Chave de encaminhamento de e-mail",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Intervalo de procura de bounces deve ser, no mínimo, 1 minuto.","settings.bounces.name": "Rejeições","settings.bounces.none": "Nenhum",diff --git a/i18n/ro.json b/i18n/ro.jsonindex 29f6622d..41a5c82b 100644--- a/i18n/ro.json+++ b/i18n/ro.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Director","settings.bounces.folderHelp": "Numele folderului IMAP pentru a scana. De exemplu: Inbox.","settings.bounces.forwardemailKey": "Cheie redirecționare e-mail",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Intervalul de scanare a săririi ar trebui să fie de minim 1 minut.","settings.bounces.name": "Neachitate","settings.bounces.none": "Nimic",diff --git a/i18n/ru.json b/i18n/ru.jsonindex becfb6df..d447e599 100644--- a/i18n/ru.json+++ b/i18n/ru.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Папка","settings.bounces.folderHelp": "Имя IMAP-папки для сканирования. Например: Входящие.","settings.bounces.forwardemailKey": "Ключ Forward Email",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Интервал сканирования отказов должен быть не менее 1 минуты.","settings.bounces.name": "Отказы","settings.bounces.none": "Нет",diff --git a/i18n/se.json b/i18n/se.jsonindex c9173754..7f5b98e1 100644--- a/i18n/se.json+++ b/i18n/se.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Mapp","settings.bounces.folderHelp": "Namn på IMAP-mappen att skanna. t.ex: Inkorgen.","settings.bounces.forwardemailKey": "Nyckel för vidarebefordrad e-post",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Studsskanningsintervall bör vara minst 1 minut.","settings.bounces.name": "Bounceadresser","settings.bounces.none": "Ingen",diff --git a/i18n/sk.json b/i18n/sk.jsonindex 22442300..54515b8b 100644--- a/i18n/sk.json+++ b/i18n/sk.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Priečinok","settings.bounces.folderHelp": "Názov kontrolovaného priečinku IMAP. Napríklad INBOX.","settings.bounces.forwardemailKey": "Kľúč preposielania emailov",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Interval kontroly nedoručiteľných by mal byť minimálne 1 minúta.","settings.bounces.name": "Nedoručiteľné","settings.bounces.none": "Žiadne",diff --git a/i18n/sl.json b/i18n/sl.jsonindex 93f61f67..5f86515e 100644--- a/i18n/sl.json+++ b/i18n/sl.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Mapa","settings.bounces.folderHelp": "Ime mape IMAP za skeniranje. Npr.: Prejeto.","settings.bounces.forwardemailKey": "Ključ za posredovanje e-pošte",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Interval odbojnega skeniranja mora biti najmanj 1 minuta.","settings.bounces.name": "Odboji","settings.bounces.none": "Brez",diff --git a/i18n/tr.json b/i18n/tr.jsonindex 32fb2fd1..8a5b90b2 100644--- a/i18n/tr.json+++ b/i18n/tr.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Dizin","settings.bounces.folderHelp": "Taranacak IMAP klasörünün adı. Örn: Gelen Kutusu.","settings.bounces.forwardemailKey": "Yönlendirme E-posta Anahtarı",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Sıçrama tarama aralığı en az 1 dakika olmalıdır.","settings.bounces.name": "Sıçramalar","settings.bounces.none": "Hiçbiri",diff --git a/i18n/uk.json b/i18n/uk.jsonindex e2923255..c0d5bc94 100644--- a/i18n/uk.json+++ b/i18n/uk.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Тека","settings.bounces.folderHelp": "Назва IMAP-теки, яку слід сканувати, наприклад Inbox.","settings.bounces.forwardemailKey": "Ключ переадресації",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Мінімальна частота опитування скриньки помилок — 1 хвилина.","settings.bounces.name": "Помилки","settings.bounces.none": "Нема",diff --git a/i18n/vi.json b/i18n/vi.jsonindex 2c141991..a8bce22d 100644--- a/i18n/vi.json+++ b/i18n/vi.json@@ -407,6 +407,8 @@"settings.bounces.folder": "Thư mục","settings.bounces.folderHelp": "Tên của thư mục IMAP để quét. Vd: Hộp thư đến.","settings.bounces.forwardemailKey": "Khóa chuyển tiếp email",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "Khoảng thời gian quét bị trả lại phải tối thiểu là 1 phút.","settings.bounces.name": "Bị trả lại","settings.bounces.none": "Không có",diff --git a/i18n/zh-CN.json b/i18n/zh-CN.jsonindex 36a018ce..5a3a6725 100644--- a/i18n/zh-CN.json+++ b/i18n/zh-CN.json@@ -407,6 +407,8 @@"settings.bounces.folder": "文件夹","settings.bounces.folderHelp": "要扫描的 IMAP 文件夹的名称。例如:收件箱。","settings.bounces.forwardemailKey": "转发邮件密钥",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "反弹扫描间隔应至少为 1 分钟。","settings.bounces.name": "反弹","settings.bounces.none": "无",diff --git a/i18n/zh-TW.json b/i18n/zh-TW.jsonindex 8a3a329f..aec2cb33 100644--- a/i18n/zh-TW.json+++ b/i18n/zh-TW.json@@ -407,6 +407,8 @@"settings.bounces.folder": "資料夾","settings.bounces.folderHelp": "要掃描的 IMAP 資料夾名稱。例如:收件匣。","settings.bounces.forwardemailKey": "轉寄電子郵件鍵",+ "settings.bounces.enableLettermint": "Enable Lettermint",+ "settings.bounces.lettermintKey": "Lettermint Webhook Secret","settings.bounces.invalidScanInterval": "退回信件的偵測間隔應至少為 1 分鐘。","settings.bounces.name": "退回","settings.bounces.none": "無",diff --git a/internal/bounce/bounce.go b/internal/bounce/bounce.goindex 7400d247..e8bcdcee 100644--- a/internal/bounce/bounce.go+++ b/internal/bounce/bounce.go@@ -35,6 +35,10 @@ type Opt struct {Enabled boolKey string}+ Lettermint struct {+ Enabled bool+ Key string+ }RecordBounceCB func(models.Bounce) error}@@ -47,6 +51,7 @@ type Manager struct {Sendgrid *webhooks.SendgridPostmark *webhooks.PostmarkForwardemail *webhooks.Forwardemail+ Lettermint *webhooks.Lettermintqueries *Queriesopt Optlog *log.Logger@@ -99,6 +104,10 @@ func New(opt Opt, q *Queries, lo *log.Logger) (*Manager, error) {fe := webhooks.NewForwardemail([]byte(opt.ForwardEmail.Key))m.Forwardemail = fe}++ if opt.Lettermint.Enabled {+ m.Lettermint = webhooks.NewLettermint([]byte(opt.Lettermint.Key))+ }}return m, nildiff --git a/internal/bounce/webhooks/lettermint.go b/internal/bounce/webhooks/lettermint.gonew file mode 100644index 00000000..235918d2--- /dev/null+++ b/internal/bounce/webhooks/lettermint.go@@ -0,0 +1,142 @@+package webhooks++import (+ "crypto/hmac"+ "crypto/sha256"+ "encoding/hex"+ "encoding/json"+ "fmt"+ "math"+ "strings"+ "time"++ "github.com/knadh/listmonk/models"+)++type lettermintNotif struct {+ ID string `json:"id"`+ Event string `json:"event"`+ Timestamp string `json:"timestamp"`+ Data struct {+ MessageID string `json:"message_id"`+ Subject string `json:"subject"`+ Recipient string `json:"recipient"`+ Response *struct {+ StatusCode int `json:"status_code"`+ EnhancedStatus string `json:"enhanced_status_code"`+ Content string `json:"content"`+ } `json:"response"`+ Metadata json.RawMessage `json:"metadata"`+ Tag string `json:"tag"`+ } `json:"data"`+}++// Lettermint handles bounce webhook notifications from Lettermint.+type Lettermint struct {+ hmacKey []byte+}++// NewLettermint returns a new Lettermint webhook handler.+func NewLettermint(key []byte) *Lettermint {+ return &Lettermint{hmacKey: key}+}++// ProcessBounce processes an incoming Lettermint webhook payload and returns a bounce object.+func (l *Lettermint) ProcessBounce(sig string, body []byte) ([]models.Bounce, error) {+ // Parse the signature header: t={timestamp},v1={hex_signature}.+ ts, sigHex, err := parseLettermintSignature(sig)+ if err != nil {+ return nil, err+ }++ // Verify timestamp tolerance (300 seconds).+ if math.Abs(float64(time.Now().Unix()-ts)) > 300 {+ return nil, fmt.Errorf("signature timestamp expired")+ }++ // Decode the hex signature from the header.+ sigB, err := hex.DecodeString(strings.TrimSpace(sigHex))+ if err != nil {+ return nil, fmt.Errorf("invalid signature encoding: %v", err)+ }++ // Compute HMAC-SHA256 of "{timestamp}.{body}" and compare.+ mac := hmac.New(sha256.New, l.hmacKey)+ mac.Write([]byte(fmt.Sprintf("%d.%s", ts, body)))++ if !hmac.Equal(mac.Sum(nil), sigB) {+ return nil, fmt.Errorf("invalid signature")+ }++ var n lettermintNotif+ if err := json.Unmarshal(body, &n); err != nil {+ return nil, fmt.Errorf("error unmarshalling Lettermint notification: %v", err)+ }++ // Map event to bounce type.+ var typ string+ switch n.Event {+ case "message.hard_bounced":+ typ = models.BounceTypeHard+ case "message.soft_bounced":+ typ = models.BounceTypeSoft+ case "message.spam_complaint":+ typ = models.BounceTypeComplaint+ default:+ // Ignore irrelevant events (e.g. webhook.test).+ return nil, nil+ }++ campUUID := ""+ if len(n.Data.Metadata) > 0 {+ var meta map[string]string+ if err := json.Unmarshal(n.Data.Metadata, &meta); err == nil {+ if v, ok := meta["X-Listmonk-Campaign"]; ok {+ campUUID = v+ }+ }+ }++ t, _ := time.Parse(time.RFC3339, n.Timestamp)+ if t.IsZero() {+ t = time.Now()+ }++ return []models.Bounce{{+ Email: strings.ToLower(n.Data.Recipient),+ CampaignUUID: campUUID,+ Type: typ,+ Source: "lettermint",+ Meta: json.RawMessage(body),+ CreatedAt: t,+ }}, nil+}++// parseLettermintSignature parses a signature header of the form "t={timestamp},v1={hex}".+func parseLettermintSignature(sig string) (int64, string, error) {+ var (+ ts int64+ hash string+ )++ for _, part := range strings.Split(sig, ",") {+ kv := strings.SplitN(strings.TrimSpace(part), "=", 2)+ if len(kv) != 2 {+ continue+ }+ switch kv[0] {+ case "t":+ if _, err := fmt.Sscanf(kv[1], "%d", &ts); err != nil {+ return 0, "", fmt.Errorf("invalid timestamp in signature: %v", err)+ }+ case "v1":+ hash = kv[1]+ }+ }++ if ts == 0 || hash == "" {+ return 0, "", fmt.Errorf("invalid signature format")+ }++ return ts, hash, nil+}diff --git a/internal/migrations/v6.1.0.go b/internal/migrations/v6.1.0.goindex 5681c44a..8026eea6 100644--- a/internal/migrations/v6.1.0.go+++ b/internal/migrations/v6.1.0.go@@ -10,7 +10,8 @@ import (func V6_1_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Logger) error {if _, err := db.Exec(`- INSERT INTO settings (key, value, updated_at) VALUES ('privacy.disable_tracking', 'false', NOW()) ON CONFLICT (key) DO NOTHING+ INSERT INTO settings (key, value, updated_at) VALUES ('privacy.disable_tracking', 'false', NOW()) ON CONFLICT (key) DO NOTHING;+ INSERT INTO settings (key, value) VALUES('bounce.lettermint', '{"enabled": false, "key": ""}') ON CONFLICT DO NOTHING;`); err != nil {return err}@@ -72,4 +73,4 @@ func V6_1_0(db *sqlx.DB, fs stuffbin.FileSystem, ko *koanf.Koanf, lo *log.Logger}return nil-}+}\ No newline at end of filediff --git a/models/settings.go b/models/settings.goindex d2fb5aa1..ffb12745 100644--- a/models/settings.go+++ b/models/settings.go@@ -129,6 +129,10 @@ type Settings struct {Enabled bool `json:"enabled"`Key string `json:"key"`} `json:"bounce.forwardemail"`+ BounceLettermint struct {+ Enabled bool `json:"enabled"`+ Key string `json:"key"`+ } `json:"bounce.lettermint"`BounceBoxes []struct {UUID string `json:"uuid"`Enabled bool `json:"enabled"`diff --git a/schema.sql b/schema.sqlindex 5ea54e16..eab1edc8 100644--- a/schema.sql+++ b/schema.sql@@ -289,6 +289,7 @@ INSERT INTO settings (key, value) VALUES('bounce.sendgrid_key', '""'),('bounce.postmark', '{"enabled": false, "username": "", "password": ""}'),('bounce.forwardemail', '{"enabled": false, "key": ""}'),+ ('bounce.lettermint', '{"enabled": false, "key": ""}'),('bounce.mailboxes','[{"enabled":false, "type": "pop", "host":"pop.yoursite.com","port":995,"auth_protocol":"userpass","username":"username","password":"password","return_path": "[email protected]","scan_interval":"15m","tls_enabled":true,"tls_skip_verify":false}]'),('appearance.admin.custom_css', '""'),