Merge pull request #201 from whyscream/199-postmaster-bounces

Added support for postmaster bounces
whyscream · Jul 4, 2024 · 5dc376a · 5dc376a
2 parents de15798 + efd9cec
commit 5dc376a
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/postfix.grok b/postfix.grok
@@ -112,7 +112,7 @@ POSTFIX_MASTER_START (daemon started|reload) -- version %{DATA:postfix_version},
 POSTFIX_MASTER_EXIT terminating on signal %{INT:postfix_termination_signal}
 
 # bounce patterns
-POSTFIX_BOUNCE_NOTIFICATION %{POSTFIX_QUEUEID:postfix_queueid}: sender (non-delivery|delivery status|delay) notification: %{POSTFIX_QUEUEID:postfix_bounce_queueid}
+POSTFIX_BOUNCE_NOTIFICATION %{POSTFIX_QUEUEID:postfix_queueid}: (?<postfix_bounce_recipient>(sender|postmaster)) (?<postfix_bounce_reason>(non-delivery|delivery status|delay)) notification: %{POSTFIX_QUEUEID:postfix_bounce_queueid}
 
 # scache patterns
 POSTFIX_SCACHE_LOOKUPS statistics: (address|domain) lookup hits=%{INT:postfix_scache_hits} miss=%{INT:postfix_scache_miss} success=%{INT:postfix_scache_success}%

diff --git a/test/bounce_0001.yaml b/test/bounce_0001.yaml
@@ -3,3 +3,5 @@ data: "17CCA8044: sender non-delivery notification: ADD2F8052"
 results:
     postfix_queueid: 17CCA8044
     postfix_bounce_queueid: ADD2F8052
+    postfix_bounce_recipient: sender
+    postfix_bounce_reason: non-delivery
diff --git a/test/bounce_0002.yaml b/test/bounce_0002.yaml
@@ -3,3 +3,5 @@ data: "65AFB8B5: sender delivery status notification: 1DF35917"
 results:
     postfix_queueid: 65AFB8B5
     postfix_bounce_queueid: 1DF35917
+    postfix_bounce_recipient: sender
+    postfix_bounce_reason: delivery status
diff --git a/test/bounce_0003.yaml b/test/bounce_0003.yaml
@@ -3,3 +3,5 @@ data: "264FE1A18: sender delay notification: 0A87A1A08"
 results:
     postfix_queueid: 264FE1A18
     postfix_bounce_queueid: 0A87A1A08
+    postfix_bounce_recipient: sender
+    postfix_bounce_reason: delay
diff --git a/test/bounce_0004.yaml b/test/bounce_0004.yaml
@@ -0,0 +1,7 @@
+pattern: ^%{POSTFIX_BOUNCE}$
+data: "482E4404AC8: postmaster non-delivery notification: 47335405A44"
+results:
+    postfix_queueid: 482E4404AC8
+    postfix_bounce_queueid: 47335405A44
+    postfix_bounce_recipient: postmaster
+    postfix_bounce_reason: non-delivery