Skip to content

Commit 46f5bec

Browse files
committed
Convert new postfix_tls_* keys to use underscore separators only
Also: convert signature_size parameter to integer.
1 parent 85c3ad4 commit 46f5bec

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

50-filter-postfix.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ filter {
277277
"postfix_size", "integer",
278278
"postfix_status_code", "integer",
279279
"postfix_termination_signal", "integer",
280+
"postfix_tls_server_signature_size", "integer",
280281
"postfix_verify_cache_dropped", "integer",
281282
"postfix_verify_cache_retained", "integer",
282283

postfix.grok

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ POSTFIX_KEYVALUE %{POSTFIX_QUEUEID:postfix_queueid}: %{POSTFIX_KEYVALUE_DATA:pos
2323
POSTFIX_WARNING_LEVEL (warning|fatal|info)
2424
POSTFIX_VERIFY_CLEANUP_TYPE (full|partial)
2525

26-
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})?
26+
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})?
2727
POSTFIX_TLSVERIFICATION certificate verification failed for %{POSTFIX_RELAY_INFO}: %{GREEDYDATA:postfix_tls_error}
2828

2929
POSTFIX_DELAYS %{NUMBER:postfix_delay_before_qmgr}/%{NUMBER:postfix_delay_in_qmgr}/%{NUMBER:postfix_delay_conn_setup}/%{NUMBER:postfix_delay_transmission}

test/smtpd_0037.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ results:
66
postfix_tls_version: TLSv1.3
77
postfix_tls_cipher: TLS_AES_256_GCM_SHA384
88
postfix_tls_cipher_size: 256/256
9-
postfix_tls_key-exchange: X25519
10-
postfix_tls_server-signature: RSA-PSS
11-
postfix_tls_server-signature_size: 4096
12-
postfix_tls_server-digest: SHA256
9+
postfix_tls_key_exchange: X25519
10+
postfix_tls_server_signature: RSA-PSS
11+
postfix_tls_server_signature_size: 4096
12+
postfix_tls_server_digest: SHA256

0 commit comments

Comments
 (0)