diff --git a/cmd/bounce.go b/cmd/bounce.go
index 0c2231a5..6f418a41 100644
--- a/cmd/bounce.go
+++ b/cmd/bounce.go
@@ -191,6 +191,19 @@ func handleBounceWebhook(c echo.Context) error {
}
bounces = append(bounces, bs...)
+ // Postmark.
+ case service == "postmark" && app.constants.BouncePostmarkEnabled:
+ bs, err := app.bounce.Postmark.ProcessBounce(rawReq, c)
+ if err != nil {
+ app.log.Printf("error processing postmark notification: %v", err)
+ if _, ok := err.(*echo.HTTPError); ok {
+ return err
+ }
+
+ return echo.NewHTTPError(http.StatusBadRequest, app.i18n.T("globals.messages.invalidData"))
+ }
+ bounces = append(bounces, bs...)
+
default:
return echo.NewHTTPError(http.StatusBadRequest, app.i18n.Ts("bounces.unknownService"))
}
diff --git a/cmd/init.go b/cmd/init.go
index f5c481a0..25f05bc3 100644
--- a/cmd/init.go
+++ b/cmd/init.go
@@ -103,6 +103,7 @@ type constants struct {
BounceWebhooksEnabled bool
BounceSESEnabled bool
BounceSendgridEnabled bool
+ BouncePostmarkEnabled bool
}
type notifTpls struct {
@@ -400,6 +401,8 @@ func initConstants() *constants {
c.BounceWebhooksEnabled = ko.Bool("bounce.webhooks_enabled")
c.BounceSESEnabled = ko.Bool("bounce.ses_enabled")
c.BounceSendgridEnabled = ko.Bool("bounce.sendgrid_enabled")
+ c.BouncePostmarkEnabled = ko.Bool("bounce.postmark.enabled")
+
return &c
}
@@ -668,7 +671,15 @@ func initBounceManager(app *App) *bounce.Manager {
SESEnabled: ko.Bool("bounce.ses_enabled"),
SendgridEnabled: ko.Bool("bounce.sendgrid_enabled"),
SendgridKey: ko.String("bounce.sendgrid_key"),
-
+ Postmark: struct {
+ Enabled bool
+ Username string
+ Password string
+ }{
+ ko.Bool("bounce.postmark.enabled"),
+ ko.String("bounce.postmark.username"),
+ ko.String("bounce.postmark.password"),
+ },
RecordBounceCB: app.core.RecordBounce,
}
diff --git a/cmd/settings.go b/cmd/settings.go
index cbef5325..f8411b33 100644
--- a/cmd/settings.go
+++ b/cmd/settings.go
@@ -69,6 +69,7 @@ func handleGetSettings(c echo.Context) error {
s.UploadS3AwsSecretAccessKey = strings.Repeat(pwdMask, utf8.RuneCountInString(s.UploadS3AwsSecretAccessKey))
s.SendgridKey = strings.Repeat(pwdMask, utf8.RuneCountInString(s.SendgridKey))
s.SecurityCaptchaSecret = strings.Repeat(pwdMask, utf8.RuneCountInString(s.SecurityCaptchaSecret))
+ s.BouncePostmark.Password = strings.Repeat(pwdMask, utf8.RuneCountInString(s.BouncePostmark.Password))
return c.JSON(http.StatusOK, okResp{s})
}
@@ -183,6 +184,9 @@ func handleUpdateSettings(c echo.Context) error {
if set.SendgridKey == "" {
set.SendgridKey = cur.SendgridKey
}
+ if set.BouncePostmark.Password == "" {
+ set.BouncePostmark.Password = cur.BouncePostmark.Password
+ }
if set.SecurityCaptchaSecret == "" {
set.SecurityCaptchaSecret = cur.SecurityCaptchaSecret
}
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
index bd0c1759..3eedb1a3 100644
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@@ -36,6 +36,7 @@ var migList = []migFunc{
{"v2.3.0", migrations.V2_3_0},
{"v2.4.0", migrations.V2_4_0},
{"v2.5.0", migrations.V2_5_0},
+ {"v2.6.0", migrations.V2_6_0},
}
// upgrade upgrades the database to the current version by running SQL migration files
diff --git a/docs/docs/content/bounces.md b/docs/docs/content/bounces.md
index 15332df7..c13c83aa 100644
--- a/docs/docs/content/bounces.md
+++ b/docs/docs/content/bounces.md
@@ -18,12 +18,12 @@ Some mail servers may also return the bounce to the `Reply-To` address, which ca
The bounce webhook API can be used to record bounce events with custom scripting. This could be by reading a mailbox, a database, or mail server logs.
| Method | Endpoint | Description |
-|--------|------------------|------------------------|
+| ------ | ---------------- | ---------------------- |
| `POST` | /webhooks/bounce | Record a bounce event. |
| Name | Data type | Required/Optional | Description |
-|-------------------|-----------|-------------------|--------------------------------------------------------------------------------------|
+| ----------------- | --------- | ----------------- | ------------------------------------------------------------------------------------ |
| `subscriber_uuid` | String | Optional | The UUID of the subscriber. Either this or `email` is required. |
| `email` | String | Optional | The e-mail of the subscriber. Either this or `subscriber_uuid` is required. |
| `campaign_uuid` | String | Optional | UUID of the campaign for which the bounce happened. |
@@ -46,7 +46,7 @@ listmonk supports receiving bounce webhook events from the following SMTP provid
|-----------------------------|------------------|-----------|
| `https://listmonk.yoursite.com/webhooks/service/ses` | Amazon (AWS) SES | You can use these [Mautic steps](https://docs.mautic.org/en/channels/emails/bounce-management#amazon-webhook) as a general guide, but use your listmonk's endpoint instead. - When creating the *topic* select "standard" instead of the preselected "FIFO". You can put a name and leave everything else at default.
- When creating a *subscription* choose HTTPS for "Protocol", and leave *"Enable raw message delivery"* UNCHECKED.
- On the _"SES -> verified identities"_ page, make sure to check **"[include original headers](https://github.com/knadh/listmonk/issues/720#issuecomment-1046877192)"**.
- The Mautic screenshot suggests you should turn off _email feedback forwarding_, but that's completely optional depending on whether you want want email notifications.
|
| `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)
## Verification
diff --git a/docs/swagger/collections.yaml b/docs/swagger/collections.yaml
index 7cb37c86..d68df248 100644
--- a/docs/swagger/collections.yaml
+++ b/docs/swagger/collections.yaml
@@ -2703,6 +2703,8 @@ components:
type: string
settings.bounces.enableSendgrid:
type: string
+ settings.bounces.enablePostmark:
+ type: string
settings.bounces.enableWebhooks:
type: string
settings.bounces.enabled:
@@ -2721,6 +2723,12 @@ components:
type: string
settings.bounces.sendgridKey:
type: string
+ settings.bounces.postmarkUsername:
+ type: string
+ settings.bounces.postmarkUsernameHelp:
+ type: string
+ settings.bounces.postmarkPassword:
+ type: string
settings.bounces.type:
type: string
settings.bounces.username:
@@ -3398,6 +3406,12 @@ components:
type: boolean
bounce.sendgrid_key:
type: string
+ bounce.postmark_enabled:
+ type: boolean
+ bounce.postmark_username:
+ type: string
+ bounce.postmark_password:
+ type: string
bounce.mailboxes:
type: array
items:
diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue
index e04e4bb9..6fd4e06d 100644
--- a/frontend/src/views/Settings.vue
+++ b/frontend/src/views/Settings.vue
@@ -155,6 +155,12 @@ export default Vue.extend({
hasDummy = 'captcha';
}
+ if (this.isDummy(form['bounce.postmark'].password)) {
+ form['bounce.postmark'].password = '';
+ } else if (this.hasDummy(form['bounce.postmark'].password)) {
+ hasDummy = 'postmark';
+ }
+
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.vue
index c1714d4c..8ffbc8c3 100644
--- a/frontend/src/views/settings/bounces.vue
+++ b/frontend/src/views/settings/bounces.vue
@@ -73,6 +73,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+