Skip to content

Commit 1588888

Browse files
authored
Merge pull request #185 from whyscream/respectful-logging
Allow parsing of postscreen actions when `respectful_logging=yes`
2 parents d0ae57c + bf55b32 commit 1588888

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

postfix.grok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ POSTFIX_ACTION (accept|defer|discard|filter|header-redirect|reject|reject_warnin
1515
POSTFIX_STATUS_CODE \d{3}
1616
POSTFIX_STATUS_CODE_ENHANCED \d\.\d+\.\d+
1717
POSTFIX_DNSBL_MESSAGE Service unavailable; .* \[%{GREEDYDATA:postfix_status_data}\] %{GREEDYDATA:postfix_status_message};
18-
POSTFIX_PS_ACCESS_ACTION (DISCONNECT|BLACKLISTED|WHITELISTED|WHITELIST VETO|PASS NEW|PASS OLD)
18+
POSTFIX_PS_ACCESS_ACTION (DISCONNECT|DENYLISTED|BLACKLISTED|ALLOWLISTED|WHITELISTED|ALLOWLIST VETO|WHITELIST VETO|PASS NEW|PASS OLD)
1919
POSTFIX_PS_VIOLATION (BARE NEWLINE|COMMAND (TIME|COUNT|LENGTH) LIMIT|COMMAND PIPELINING|DNSBL|HANGUP|NON-SMTP COMMAND|PREGREET)
2020
POSTFIX_TIME_UNIT %{NUMBER}[smhd]
2121
POSTFIX_KEYVALUE_DATA [\w-]+=[^;]*

test/postscreen_0030.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pattern: ^%{POSTFIX_POSTSCREEN}$
2+
data: "ALLOWLIST VETO [61.238.241.86]:53024"
3+
results:
4+
postfix_postscreen_access: ALLOWLIST VETO
5+
postfix_client_ip: 61.238.241.86
6+
postfix_client_port: 53024

0 commit comments

Comments
 (0)