Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Convert new postfix_tls_* keys to use underscore separators only
Also: convert signature_size parameter to integer.
  • Loading branch information
whyscream committed Jan 29, 2024
commit 46f5bec5af1307aab981ef77d6d8beae74552328
1 change: 1 addition & 0 deletions 50-filter-postfix.conf
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,7 @@ filter {
"postfix_size", "integer",
"postfix_status_code", "integer",
"postfix_termination_signal", "integer",
"postfix_tls_server_signature_size", "integer",
"postfix_verify_cache_dropped", "integer",
"postfix_verify_cache_retained", "integer",

Expand Down
2 changes: 1 addition & 1 deletion postfix.grok
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ POSTFIX_KEYVALUE %{POSTFIX_QUEUEID:postfix_queueid}: %{POSTFIX_KEYVALUE_DATA:pos
POSTFIX_WARNING_LEVEL (warning|fatal|info)
POSTFIX_VERIFY_CLEANUP_TYPE (full|partial)

POSTFIX_TLSCONN (Anonymous|Trusted|Untrusted|Verified) TLS connection established (to %{POSTFIX_RELAY_INFO}|from %{POSTFIX_CLIENT_INFO}): %{DATA:postfix_tls_version} with cipher %{DATA:postfix_tls_cipher} \(%{DATA:postfix_tls_cipher_size} bits\)( key-exchange %{DATA:postfix_tls_key-exchange} server-signature %{DATA:postfix_tls_server-signature} \(%{DATA:postfix_tls_server-signature_size} bits\) server-digest %{DATA:postfix_tls_server-digest})?
POSTFIX_TLSCONN (Anonymous|Trusted|Untrusted|Verified) TLS connection established (to %{POSTFIX_RELAY_INFO}|from %{POSTFIX_CLIENT_INFO}): %{DATA:postfix_tls_version} with cipher %{DATA:postfix_tls_cipher} \(%{DATA:postfix_tls_cipher_size} bits\)( key-exchange %{DATA:postfix_tls_key_exchange} server-signature %{DATA:postfix_tls_server_signature} \(%{DATA:postfix_tls_server_signature_size} bits\) server-digest %{DATA:postfix_tls_server_digest})?
POSTFIX_TLSVERIFICATION certificate verification failed for %{POSTFIX_RELAY_INFO}: %{GREEDYDATA:postfix_tls_error}

POSTFIX_DELAYS %{NUMBER:postfix_delay_before_qmgr}/%{NUMBER:postfix_delay_in_qmgr}/%{NUMBER:postfix_delay_conn_setup}/%{NUMBER:postfix_delay_transmission}
Expand Down
8 changes: 4 additions & 4 deletions test/smtpd_0037.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ results:
postfix_tls_version: TLSv1.3
postfix_tls_cipher: TLS_AES_256_GCM_SHA384
postfix_tls_cipher_size: 256/256
postfix_tls_key-exchange: X25519
postfix_tls_server-signature: RSA-PSS
postfix_tls_server-signature_size: 4096
postfix_tls_server-digest: SHA256
postfix_tls_key_exchange: X25519
postfix_tls_server_signature: RSA-PSS
postfix_tls_server_signature_size: 4096
postfix_tls_server_digest: SHA256