From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id B742A93725 for ; Tue, 20 Feb 2024 11:07:48 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9973F4274 for ; Tue, 20 Feb 2024 11:07:18 +0100 (CET) Received: from nena.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 20 Feb 2024 11:07:14 +0100 (CET) Received: by nena.proxmox.com (Postfix, from userid 1000) id E47C1CC687; Tue, 20 Feb 2024 11:07:14 +0100 (CET) From: Mira Limbeck To: pmg-devel@lists.proxmox.com Date: Tue, 20 Feb 2024 11:06:46 +0100 Message-Id: <20240220100648.44119-3-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240220100648.44119-1-m.limbeck@proxmox.com> References: <20240220100648.44119-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.611 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pmg-devel] [PATCH v3 pmg-log-tracker 3/5] tests: update for log tracker time handling changes X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Feb 2024 10:07:48 -0000 since we now calculate the time in UTC rather than local time, the time values of each test had to be touched. those should differ by `E10` (3600 seconds) in most cases since we set the TZ to Europe/Vienna for the tests. Signed-off-by: Mira Limbeck --- v3: - unchanged tests/test_output_after_queue | 40 ++++---- tests/test_output_after_queue_duplicate_msgid | 8 +- tests/test_output_after_queue_host | 18 ++-- tests/test_output_after_queue_qid | 4 +- .../test_output_after_queue_relay_before_lmtp | 8 +- tests/test_output_after_queue_search_string | 12 +-- tests/test_output_before_queue | 40 ++++---- tests/test_output_before_queue_from_to | 6 +- tests/test_output_before_queue_host | 34 +++---- ...before_queue_mixed_accept_block_quarantine | 8 +- .../test_output_before_queue_mixed_downstream | 18 ++-- tests/test_output_before_queue_qid | 10 +- tests/test_output_before_queue_search_string | 12 +-- tests/test_output_before_queue_syntax_reject | 6 +- tests/test_output_before_queue_to | 6 +- .../test_output_before_queue_to_search_string | 18 ++-- tests/test_output_time_rfc3339_mixed | 22 ++--- tests/test_output_timechange | 94 +++++++++---------- 18 files changed, 182 insertions(+), 182 deletions(-) diff --git a/tests/test_output_after_queue b/tests/test_output_after_queue index dfcd4ee..6e9f277 100644 --- a/tests/test_output_after_queue +++ b/tests/test_output_after_queue @@ -5,11 +5,11 @@ # End Query Options QENTRY: 21BCE3807B6 -CTIME: 5FDCCEB8 +CTIME: 5FDCC0A8 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCCEB8:21BCE3807B6:Q: from to (381C6F5DFA39502F470) +TO:5FDCC0A8:21BCE3807B6:Q: from to (381C6F5DFA39502F470) SMTP: L00000002 Dec 18 15:46:00 pmg postfix/smtpd[24784]: connect from pmg.localhost[192.168.22.40] L00000003 Dec 18 15:46:00 pmg postfix/smtpd[24784]: 21BCE3807B6: client=pmg.localhost[192.168.22.40] @@ -25,14 +25,14 @@ L0000000A Dec 18 15:46:00 pmg postfix/lmtp[24788]: 21BCE3807B6: to= -TO:5FDCCFCE:CFC5F42740:A: from to (88F2E42667) -TO:5FDCCFCE:CFC5F42740:A: from to (88F2E42667) -TO:5FDCCFCE:CFC5F42740:A: from to (88F2E42667) -TO:5FDCCFCE:CFC5F42740:A: from to (88F2E42667) +TO:5FDCC1BE:CFC5F42740:A: from to (88F2E42667) +TO:5FDCC1BE:CFC5F42740:A: from to (88F2E42667) +TO:5FDCC1BE:CFC5F42740:A: from to (88F2E42667) +TO:5FDCC1BE:CFC5F42740:A: from to (88F2E42667) SMTP: L0000000C Dec 18 15:50:34 proxmox-new postfix/smtpd[13169]: connect from test.localdomain[192.168.22.40] L0000000D Dec 18 15:50:34 proxmox-new postfix/smtpd[13169]: CFC5F42740: client=test.localdomain[192.168.22.40] @@ -55,14 +55,14 @@ L00000022 Dec 18 15:50:38 proxmox-new postfix/lmtp[13174]: CFC5F42740: to= -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) SMTP: L00000014 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: connect from localhost.localdomain[127.0.0.1] L00000015 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: 88F2E42667: client=localhost.localdomain[127.0.0.1], orig_client=test.localdomain[192.168.22.40] @@ -77,19 +77,19 @@ L00000026 Dec 18 15:50:38 proxmox-new postfix/smtp[13180]: 88F2E42667: to=, relay=192.168.22.40[192.168.22.40]:25, delay=0.15, delays=0.05/0/0.04/0.05, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as C928BF624F6) L00000028 Dec 18 15:50:38 proxmox-new postfix/qmgr[18171]: 88F2E42667: removed -SMTPD: T5FDCCFDAL00000000 -CTIME: 5FDCCFDA +SMTPD: T5FDCC1CAL00000000 +CTIME: 5FDCC1CA CLIENT: 10.0.0.1 -TO:5FDCCFDA:T5FDCCFDAL00000000:N: from to +TO:5FDCC1CA:T5FDCC1CAL00000000:N: from to LOGS: L00000029 Dec 18 15:50:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=, to=, proto=ESMTP, helo= QENTRY: 0022C3801B5 -CTIME: 5FDCD100 +CTIME: 5FDCC2F0 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCD100:0022C3801B5:B: from to (none) +TO:5FDCC2F0:0022C3801B5:B: from to (none) SMTP: L0000002A Dec 18 15:55:43 pmg postfix/smtpd[29323]: connect from pmg.localhost[192.168.22.40] L0000002B Dec 18 15:55:44 pmg postfix/smtpd[29323]: 0022C3801B5: client=pmg.localhost[192.168.22.40] @@ -104,10 +104,10 @@ L0000002D Dec 18 15:55:44 pmg postfix/qmgr[24651]: 0022C3801B5: from=, relay=127.0.0.1[127.0.0.1]:10023, delay=0.07, delays=0.02/0.01/0.02/0.02, dsn=2.7.0, status=sent (250 2.7.0 BLOCKED (3802E45DFA503808B06)) L00000035 Dec 18 15:55:44 pmg postfix/qmgr[24651]: 0022C3801B5: removed -SMTPD: T5FDCD200L00000001 -CTIME: 5FDCD200 +SMTPD: T5FDCC3F0L00000001 +CTIME: 5FDCC3F0 CLIENT: 192.0.2.0 -TO:5FDCD200:T5FDCD200L00000001:N: from to <> +TO:5FDCC3F0:T5FDCC3F0L00000001:N: from to <> LOGS: L00000037 Dec 18 16:00:00 pmg postfix/postscreen[42055]: NOQUEUE: reject: RCPT from [192.0.2.0]:38834: 550 5.7.1 Service unavailable; client [192.0.2.0] blocked using testbl.example; from=, to=<>, proto=ESMTP, helo= diff --git a/tests/test_output_after_queue_duplicate_msgid b/tests/test_output_after_queue_duplicate_msgid index 80e29dd..9f8bb0c 100644 --- a/tests/test_output_after_queue_duplicate_msgid +++ b/tests/test_output_after_queue_duplicate_msgid @@ -5,11 +5,11 @@ # End Query Options QENTRY: A673520AB5 -CTIME: 5E26A944 +CTIME: 5E269B34 SIZE: 162287 CLIENT: localhost[127.0.0.1], MSGID: -TO:5E26A944:A673520AB5:2: from to (192.168.1.002[192.168.1.002]:25) +TO:5E269B34:A673520AB5:2: from to (192.168.1.002[192.168.1.002]:25) SMTP: L0000000A Jan 21 07:33:24 pmghost postfix/smtpd[29375]: connect from localhost[127.0.0.1] L0000000B Jan 21 07:33:24 pmghost postfix/smtpd[29375]: A673520AB5: client=localhost[127.0.0.1], orig_client=pmghost.mydomain.tld[192.168.1.001] @@ -21,11 +21,11 @@ L00000010 Jan 21 07:33:24 pmghost postfix/smtp[29376]: A673520AB5: to= -TO:5E26A944:DEF2520A69:A: from to (A673520AB5) +TO:5E269B34:DEF2520A69:A: from to (A673520AB5) SMTP: L00000001 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: connect from pmghost.mydomain.tld[192.168.1.001] L00000002 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: DEF2520A69: client=pmghost.mydomain.tld[192.168.1.001] diff --git a/tests/test_output_after_queue_host b/tests/test_output_after_queue_host index 219bdb9..90da867 100644 --- a/tests/test_output_after_queue_host +++ b/tests/test_output_after_queue_host @@ -6,11 +6,11 @@ # End Query Options QENTRY: 21BCE3807B6 -CTIME: 5FDCCEB8 +CTIME: 5FDCC0A8 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCCEB8:21BCE3807B6:Q: from to (381C6F5DFA39502F470) +TO:5FDCC0A8:21BCE3807B6:Q: from to (381C6F5DFA39502F470) SMTP: L00000002 Dec 18 15:46:00 pmg postfix/smtpd[24784]: connect from pmg.localhost[192.168.22.40] L00000003 Dec 18 15:46:00 pmg postfix/smtpd[24784]: 21BCE3807B6: client=pmg.localhost[192.168.22.40] @@ -26,14 +26,14 @@ L0000000A Dec 18 15:46:00 pmg postfix/lmtp[24788]: 21BCE3807B6: to= -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCFCE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCC1BE:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) SMTP: L00000014 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: connect from localhost.localdomain[127.0.0.1] L00000015 Dec 18 15:50:38 proxmox-new postfix/smtpd[13179]: 88F2E42667: client=localhost.localdomain[127.0.0.1], orig_client=test.localdomain[192.168.22.40] @@ -49,11 +49,11 @@ L00000027 Dec 18 15:50:38 proxmox-new postfix/smtp[13180]: 88F2E42667: to= -TO:5FDCD100:0022C3801B5:B: from to (none) +TO:5FDCC2F0:0022C3801B5:B: from to (none) SMTP: L0000002A Dec 18 15:55:43 pmg postfix/smtpd[29323]: connect from pmg.localhost[192.168.22.40] L0000002B Dec 18 15:55:44 pmg postfix/smtpd[29323]: 0022C3801B5: client=pmg.localhost[192.168.22.40] diff --git a/tests/test_output_after_queue_qid b/tests/test_output_after_queue_qid index 6cc9a9e..791d29a 100644 --- a/tests/test_output_after_queue_qid +++ b/tests/test_output_after_queue_qid @@ -6,11 +6,11 @@ # End Query Options QENTRY: 0022C3801B5 -CTIME: 5FDCD100 +CTIME: 5FDCC2F0 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCD100:0022C3801B5:B: from to (none) +TO:5FDCC2F0:0022C3801B5:B: from to (none) SMTP: L0000002A Dec 18 15:55:43 pmg postfix/smtpd[29323]: connect from pmg.localhost[192.168.22.40] L0000002B Dec 18 15:55:44 pmg postfix/smtpd[29323]: 0022C3801B5: client=pmg.localhost[192.168.22.40] diff --git a/tests/test_output_after_queue_relay_before_lmtp b/tests/test_output_after_queue_relay_before_lmtp index c4d0fdf..df54c09 100644 --- a/tests/test_output_after_queue_relay_before_lmtp +++ b/tests/test_output_after_queue_relay_before_lmtp @@ -5,11 +5,11 @@ # End Query Options QENTRY: A673520AB5 -CTIME: 5E26A944 +CTIME: 5E269B34 SIZE: 162287 CLIENT: localhost[127.0.0.1], MSGID: -TO:5E26A944:A673520AB5:2: from to (192.168.1.002[192.168.1.002]:25) +TO:5E269B34:A673520AB5:2: from to (192.168.1.002[192.168.1.002]:25) SMTP: L00000009 Jan 21 07:33:24 pmghost postfix/smtpd[29375]: connect from localhost[127.0.0.1] L0000000A Jan 21 07:33:24 pmghost postfix/smtpd[29375]: A673520AB5: client=localhost[127.0.0.1], orig_client=pmghost.mydomain.tld[192.168.1.001] @@ -21,11 +21,11 @@ L0000000F Jan 21 07:33:24 pmghost postfix/smtp[29376]: A673520AB5: to= -TO:5E26A944:DEF2520A69:A: from to (A673520AB5) +TO:5E269B34:DEF2520A69:A: from to (A673520AB5) SMTP: L00000001 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: connect from pmghost.mydomain.tld[192.168.1.001] L00000002 Jan 21 07:33:20 pmghost postfix/smtpd[29361]: DEF2520A69: client=pmghost.mydomain.tld[192.168.1.001] diff --git a/tests/test_output_after_queue_search_string b/tests/test_output_after_queue_search_string index f658b9d..a513167 100644 --- a/tests/test_output_after_queue_search_string +++ b/tests/test_output_after_queue_search_string @@ -5,17 +5,17 @@ # END: 2020-12-18 16:00:00 (1608307200) # End Query Options -SMTPD: T5FDCCFDAL00000000 -CTIME: 5FDCCFDA +SMTPD: T5FDCC1CAL00000000 +CTIME: 5FDCC1CA CLIENT: 10.0.0.1 -TO:5FDCCFDA:T5FDCCFDAL00000000:N: from to +TO:5FDCC1CA:T5FDCC1CAL00000000:N: from to LOGS: L00000029 Dec 18 15:50:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=, to=, proto=ESMTP, helo= -SMTPD: T5FDCD200L00000001 -CTIME: 5FDCD200 +SMTPD: T5FDCC3F0L00000001 +CTIME: 5FDCC3F0 CLIENT: 192.0.2.0 -TO:5FDCD200:T5FDCD200L00000001:N: from to <> +TO:5FDCC3F0:T5FDCC3F0L00000001:N: from to <> LOGS: L00000037 Dec 18 16:00:00 pmg postfix/postscreen[42055]: NOQUEUE: reject: RCPT from [192.0.2.0]:38834: 550 5.7.1 Service unavailable; client [192.0.2.0] blocked using testbl.example; from=, to=<>, proto=ESMTP, helo= diff --git a/tests/test_output_before_queue b/tests/test_output_before_queue index aca61b9..62ab849 100644 --- a/tests/test_output_before_queue +++ b/tests/test_output_before_queue @@ -4,10 +4,10 @@ # End: 2020-12-18 15:40:00 (1608306000) # End Query Options -SMTPD: T5FDCC4EFL00000000 -CTIME: 5FDCC4EF +SMTPD: T5FDCB6DFL00000000 +CTIME: 5FDCB6DF CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC4EF:T5FDCC4EFL00000000:B: from to +TO:5FDCB6DF:T5FDCB6DFL00000000:B: from to LOGS: L00000002 Dec 18 15:04:15 pmg postfix/smtpd[21842]: connect from pmg.localhost[192.168.22.40] L00000003 Dec 18 15:04:15 pmg postfix/smtpd[21842]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -17,10 +17,10 @@ L00000007 Dec 18 15:04:15 pmg pmg-smtp-filter[1565]: 381C4E5DFA31DF9E90F: proces L00000008 Dec 18 15:04:15 pmg postfix/smtpd[21842]: proxy-reject: END-OF-MESSAGE: 554 5.7.1 Rejected for policy reasons (381C4E5DFA31DF9E90F); from= to= proto=ESMTP helo= L00000009 Dec 18 15:04:15 pmg postfix/smtpd[21842]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=0/1 commands=3/4 -SMTPD: T5FDCC572L00000000 -CTIME: 5FDCC572 +SMTPD: T5FDCB762L00000000 +CTIME: 5FDCB762 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC572:T5FDCC572L00000000:Q: from to +TO:5FDCB762:T5FDCB762L00000000:Q: from to LOGS: L0000000A Dec 18 15:06:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L0000000B Dec 18 15:06:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -30,10 +30,10 @@ L00000010 Dec 18 15:06:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces L00000011 Dec 18 15:06:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from= to= proto=ESMTP helo= L00000012 Dec 18 15:06:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4 -SMTPD: T5FDCC5EAL00000000 -CTIME: 5FDCC5EA +SMTPD: T5FDCB7DAL00000000 +CTIME: 5FDCB7DA CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from to +TO:5FDCB7DA:T5FDCB7DAL00000000:Q: from to LOGS: L00000013 Dec 18 15:08:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L00000014 Dec 18 15:08:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -43,10 +43,10 @@ L00000019 Dec 18 15:08:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces L0000001A Dec 18 15:08:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from= to= proto=ESMTP helo= L0000001B Dec 18 15:08:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4 -SMTPD: T5FDCC662L00000000 -CTIME: 5FDCC662 +SMTPD: T5FDCB852L00000000 +CTIME: 5FDCB852 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC662:T5FDCC662L00000000:Q: from to +TO:5FDCB852:T5FDCB852L00000000:Q: from to LOGS: L0000001C Dec 18 15:10:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L0000001D Dec 18 15:10:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -57,14 +57,14 @@ L00000023 Dec 18 15:10:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE L00000024 Dec 18 15:10:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4 QENTRY: 1C6B541C5D -CTIME: 5FDCCD39 +CTIME: 5FDCBF29 SIZE: 7298 CLIENT: localhost.localdomain[127.0.0.1], MSGID: -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) SMTP: L00000025 Dec 18 15:36:32 proxmox-new postfix/smtpd[29902]: connect from test.localdomain[192.168.22.40] L00000026 Dec 18 15:36:33 proxmox-new postfix/smtpd[29902]: NOQUEUE: client=test.localdomain[192.168.22.40] @@ -90,10 +90,10 @@ L00000036 Dec 18 15:36:37 proxmox-new postfix/smtp[29913]: 1C6B541C5D: to=, relay=192.168.22.40[192.168.22.40]:25, delay=0.15, delays=0.05/0/0.05/0.05, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as C19A3F62578) L00000038 Dec 18 15:36:37 proxmox-new postfix/qmgr[6194]: 1C6B541C5D: removed -SMTPD: T5FDCCD46L00000000 -CTIME: 5FDCCD46 +SMTPD: T5FDCBF36L00000000 +CTIME: 5FDCBF36 CLIENT: 10.0.0.1 -TO:5FDCCD46:T5FDCCD46L00000000:N: from to +TO:5FDCBF36:T5FDCBF36L00000000:N: from to LOGS: L0000003A Dec 18 15:39:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=, to=, proto=ESMTP, helo= diff --git a/tests/test_output_before_queue_from_to b/tests/test_output_before_queue_from_to index 610bf34..7e499d8 100644 --- a/tests/test_output_before_queue_from_to +++ b/tests/test_output_before_queue_from_to @@ -6,10 +6,10 @@ # End: 2020-12-18 15:40:00 (1608306000) # End Query Options -SMTPD: T5FDCC662L00000000 -CTIME: 5FDCC662 +SMTPD: T5FDCB852L00000000 +CTIME: 5FDCB852 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC662:T5FDCC662L00000000:Q: from to +TO:5FDCB852:T5FDCB852L00000000:Q: from to LOGS: L0000001C Dec 18 15:10:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L0000001D Dec 18 15:10:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] diff --git a/tests/test_output_before_queue_host b/tests/test_output_before_queue_host index 4595d25..5460e32 100644 --- a/tests/test_output_before_queue_host +++ b/tests/test_output_before_queue_host @@ -5,10 +5,10 @@ # End: 2020-12-18 15:40:00 (1608306000) # End Query Options -SMTPD: T5FDCC4EFL00000000 -CTIME: 5FDCC4EF +SMTPD: T5FDCB6DFL00000000 +CTIME: 5FDCB6DF CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC4EF:T5FDCC4EFL00000000:B: from to +TO:5FDCB6DF:T5FDCB6DFL00000000:B: from to LOGS: L00000002 Dec 18 15:04:15 pmg postfix/smtpd[21842]: connect from pmg.localhost[192.168.22.40] L00000003 Dec 18 15:04:15 pmg postfix/smtpd[21842]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -18,10 +18,10 @@ L00000007 Dec 18 15:04:15 pmg pmg-smtp-filter[1565]: 381C4E5DFA31DF9E90F: proces L00000008 Dec 18 15:04:15 pmg postfix/smtpd[21842]: proxy-reject: END-OF-MESSAGE: 554 5.7.1 Rejected for policy reasons (381C4E5DFA31DF9E90F); from= to= proto=ESMTP helo= L00000009 Dec 18 15:04:15 pmg postfix/smtpd[21842]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=0/1 commands=3/4 -SMTPD: T5FDCC572L00000000 -CTIME: 5FDCC572 +SMTPD: T5FDCB762L00000000 +CTIME: 5FDCB762 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC572:T5FDCC572L00000000:Q: from to +TO:5FDCB762:T5FDCB762L00000000:Q: from to LOGS: L0000000A Dec 18 15:06:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L0000000B Dec 18 15:06:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -31,10 +31,10 @@ L00000010 Dec 18 15:06:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces L00000011 Dec 18 15:06:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from= to= proto=ESMTP helo= L00000012 Dec 18 15:06:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4 -SMTPD: T5FDCC5EAL00000000 -CTIME: 5FDCC5EA +SMTPD: T5FDCB7DAL00000000 +CTIME: 5FDCB7DA CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from to +TO:5FDCB7DA:T5FDCB7DAL00000000:Q: from to LOGS: L00000013 Dec 18 15:08:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L00000014 Dec 18 15:08:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -44,10 +44,10 @@ L00000019 Dec 18 15:08:26 pmg pmg-smtp-filter[1564]: 381C4E5DFA32622BFC4: proces L0000001A Dec 18 15:08:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE: 250 2.5.0 OK (381C4E5DFA32622BFC4); from= to= proto=ESMTP helo= L0000001B Dec 18 15:08:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4 -SMTPD: T5FDCC662L00000000 -CTIME: 5FDCC662 +SMTPD: T5FDCB852L00000000 +CTIME: 5FDCB852 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC662:T5FDCC662L00000000:Q: from to +TO:5FDCB852:T5FDCB852L00000000:Q: from to LOGS: L0000001C Dec 18 15:10:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L0000001D Dec 18 15:10:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -58,14 +58,14 @@ L00000023 Dec 18 15:10:26 pmg postfix/smtpd[21949]: proxy-accept: END-OF-MESSAGE L00000024 Dec 18 15:10:26 pmg postfix/smtpd[21949]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=1 commands=4 QENTRY: 1C6B541C5D -CTIME: 5FDCCD39 +CTIME: 5FDCBF29 SIZE: 7298 CLIENT: localhost.localdomain[127.0.0.1], MSGID: -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) SMTP: L00000025 Dec 18 15:36:32 proxmox-new postfix/smtpd[29902]: connect from test.localdomain[192.168.22.40] L00000026 Dec 18 15:36:33 proxmox-new postfix/smtpd[29902]: NOQUEUE: client=test.localdomain[192.168.22.40] diff --git a/tests/test_output_before_queue_mixed_accept_block_quarantine b/tests/test_output_before_queue_mixed_accept_block_quarantine index 637b40a..8a0417a 100644 --- a/tests/test_output_before_queue_mixed_accept_block_quarantine +++ b/tests/test_output_before_queue_mixed_accept_block_quarantine @@ -5,13 +5,13 @@ # End Query Options QENTRY: E1C6561393 -CTIME: 5EAAF183 +CTIME: 5EAAD563 SIZE: 1436 CLIENT: localhost[127.0.0.1], MSGID: <20200430134439.GE6794@test@localdomain> -TO:5EAAF179:E1C6561393:R: from to (192.0.2.69[192.0.2.69]:25) -TO:5EAAF178:E1C6561393:B: from to (none) -TO:5EAAF178:E1C6561393:Q: from to (612405EAAD648755DD) +TO:5EAAD559:E1C6561393:R: from to (192.0.2.69[192.0.2.69]:25) +TO:5EAAD558:E1C6561393:B: from to (none) +TO:5EAAD558:E1C6561393:Q: from to (612405EAAD648755DD) SMTP: L00000003 Apr 30 15:40:39 pmg6 postfix/smtpd[21615]: connect from unknown[2001:DB8:1:12::75] L00000004 Apr 30 15:40:39 pmg6 postfix/smtpd[21615]: Anonymous TLS connection established from unknown[2001:DB8:1:12::75]: TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) diff --git a/tests/test_output_before_queue_mixed_downstream b/tests/test_output_before_queue_mixed_downstream index 4536a05..c0e6d90 100644 --- a/tests/test_output_before_queue_mixed_downstream +++ b/tests/test_output_before_queue_mixed_downstream @@ -4,23 +4,23 @@ # End: 2020-12-18 16:10:00 (1608307800) # End Query Options -SMTPD: T5FDCD200L00000001 -CTIME: 5FDCD200 +SMTPD: T5FDCC3F0L00000001 +CTIME: 5FDCC3F0 CLIENT: 192.0.2.0 -TO:5FDCD200:T5FDCD200L00000001:N: from to <> +TO:5FDCC3F0:T5FDCC3F0L00000001:N: from to <> QENTRY: E2487636D9 -CTIME: 5FDCD233 +CTIME: 5FDCC423 SIZE: 3628 MSGID: <20200428171350.E2487636D9@pmg6.rosa.proxmox.com> -TO:5FDCD233:E2487636D9:2: from <> to (test.localdomain[192.0.2.0.70]:25) +TO:5FDCC423:E2487636D9:2: from <> to (test.localdomain[192.0.2.0.70]:25) QENTRY: B8010636D6 -CTIME: 5FDCD233 +CTIME: 5FDCC423 SIZE: 1436 CLIENT: localhost[127.0.0.1], MSGID: <20200428171349.GC5963@test.localdomain> -TO:5FDCD232:B8010636D6:P: from to (192.0.2.0.69[192.0.2.0.69]:25) -TO:5FDCD232:B8010636D6:R: from to (192.0.2.0.69[192.0.2.0.69]:25) -TO:5FDCD232:B8010636D6:D: from to (192.0.2.0.69[192.0.2.0.69]:25) +TO:5FDCC422:B8010636D6:P: from to (192.0.2.0.69[192.0.2.0.69]:25) +TO:5FDCC422:B8010636D6:R: from to (192.0.2.0.69[192.0.2.0.69]:25) +TO:5FDCC422:B8010636D6:D: from to (192.0.2.0.69[192.0.2.0.69]:25) diff --git a/tests/test_output_before_queue_qid b/tests/test_output_before_queue_qid index e2eb137..46728a2 100644 --- a/tests/test_output_before_queue_qid +++ b/tests/test_output_before_queue_qid @@ -6,14 +6,14 @@ # End Query Options QENTRY: 1C6B541C5D -CTIME: 5FDCCD39 +CTIME: 5FDCBF29 SIZE: 7298 CLIENT: localhost.localdomain[127.0.0.1], MSGID: -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) -TO:5FDCCC85:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:5FDCBE75:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) SMTP: L00000025 Dec 18 15:36:32 proxmox-new postfix/smtpd[29902]: connect from test.localdomain[192.168.22.40] L00000026 Dec 18 15:36:33 proxmox-new postfix/smtpd[29902]: NOQUEUE: client=test.localdomain[192.168.22.40] diff --git a/tests/test_output_before_queue_search_string b/tests/test_output_before_queue_search_string index da04042..2f57b8a 100644 --- a/tests/test_output_before_queue_search_string +++ b/tests/test_output_before_queue_search_string @@ -5,10 +5,10 @@ # End: 2020-12-18 15:40:00 (1608306000) # End Query Options -SMTPD: T5FDCC4EFL00000000 -CTIME: 5FDCC4EF +SMTPD: T5FDCB6DFL00000000 +CTIME: 5FDCB6DF CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC4EF:T5FDCC4EFL00000000:B: from to +TO:5FDCB6DF:T5FDCB6DFL00000000:B: from to LOGS: L00000002 Dec 18 15:04:15 pmg postfix/smtpd[21842]: connect from pmg.localhost[192.168.22.40] L00000003 Dec 18 15:04:15 pmg postfix/smtpd[21842]: NOQUEUE: client=pmg.localhost[192.168.22.40] @@ -18,10 +18,10 @@ L00000007 Dec 18 15:04:15 pmg pmg-smtp-filter[1565]: 381C4E5DFA31DF9E90F: proces L00000008 Dec 18 15:04:15 pmg postfix/smtpd[21842]: proxy-reject: END-OF-MESSAGE: 554 5.7.1 Rejected for policy reasons (381C4E5DFA31DF9E90F); from= to= proto=ESMTP helo= L00000009 Dec 18 15:04:15 pmg postfix/smtpd[21842]: disconnect from pmg.localhost[192.168.22.40] ehlo=1 mail=1 rcpt=1 data=0/1 commands=3/4 -SMTPD: T5FDCCD46L00000000 -CTIME: 5FDCCD46 +SMTPD: T5FDCBF36L00000000 +CTIME: 5FDCBF36 CLIENT: 10.0.0.1 -TO:5FDCCD46:T5FDCCD46L00000000:N: from to +TO:5FDCBF36:T5FDCBF36L00000000:N: from to LOGS: L0000003A Dec 18 15:39:50 proxmox-new postfix/postscreen[32700]: NOQUEUE: reject: RCPT from [10.0.0.1]:34453: 550 5.7.1 Service unavailable; client [10.0.0.1] blocked using zen.spamhaus.org; from=, to=, proto=ESMTP, helo= diff --git a/tests/test_output_before_queue_syntax_reject b/tests/test_output_before_queue_syntax_reject index 5be90db..383b5e7 100644 --- a/tests/test_output_before_queue_syntax_reject +++ b/tests/test_output_before_queue_syntax_reject @@ -4,10 +4,10 @@ # End: 2020-08-27 14:05:00 (1598537100) # End Query Options -SMTPD: T5F47BD58L00000000 -CTIME: 5F47BD58 +SMTPD: T5F47A138L00000000 +CTIME: 5F47A138 CLIENT: pmgsender[192.168.22.40] -TO:5F47BD58:T5F47BD58L00000000:N: from to +TO:5F47A138:T5F47A138L00000000:N: from to LOGS: L00000001 Aug 27 14:04:08 pmg6 postfix/smtpd[7567]: connect from pmgsender[192.168.22.40] L00000002 Aug 27 14:04:08 pmg6 postfix/smtpd[7567]: Anonymous TLS connection established from pmgsender[192.168.22.40]: TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 diff --git a/tests/test_output_before_queue_to b/tests/test_output_before_queue_to index 49793dd..5fe39bd 100644 --- a/tests/test_output_before_queue_to +++ b/tests/test_output_before_queue_to @@ -5,10 +5,10 @@ # End: 2020-12-18 15:40:00 (1608306000) # End Query Options -SMTPD: T5FDCC5EAL00000000 -CTIME: 5FDCC5EA +SMTPD: T5FDCB7DAL00000000 +CTIME: 5FDCB7DA CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from to +TO:5FDCB7DA:T5FDCB7DAL00000000:Q: from to LOGS: L00000013 Dec 18 15:08:26 pmg postfix/smtpd[21949]: connect from pmg.localhost[192.168.22.40] L00000014 Dec 18 15:08:26 pmg postfix/smtpd[21949]: NOQUEUE: client=pmg.localhost[192.168.22.40] diff --git a/tests/test_output_before_queue_to_search_string b/tests/test_output_before_queue_to_search_string index 5fe963a..db7d14f 100644 --- a/tests/test_output_before_queue_to_search_string +++ b/tests/test_output_before_queue_to_search_string @@ -6,10 +6,10 @@ # End: 2020-05-18 16:10:00 (1589818200) # End Query Options -SMTPD: T5EC2B077L00000002 -CTIME: 5EC2B077 +SMTPD: T5EC29457L00000002 +CTIME: 5EC29457 CLIENT: pmg-demo.proxmox.com[192.168.30.128] -TO:5EC2B077:T5EC2B077L00000002:B: from to +TO:5EC29457:T5EC29457L00000002:B: from to LOGS: L00000003 May 18 15:57:43 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128] L00000004 May 18 15:57:43 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128] @@ -22,11 +22,11 @@ L0000000B May 18 15:57:43 pmg-demo postfix/smtpd[16982]: proxy-accept: END-OF-ME L0000000C May 18 15:57:43 pmg-demo postfix/smtpd[16982]: disconnect from pmg-demo.proxmox.com[192.168.30.128] ehlo=1 mail=1 rcpt=2 data=1 commands=5 QENTRY: 6B2CD3209E0 -CTIME: 5EC2B1EB +CTIME: 5EC295CB SIZE: 2342 CLIENT: localhost.localdomain[127.0.0.1], MSGID: <20200518140355.6B2CD3209E0@pmg-demo.proxmox.com> -TO:5EC2B1EB:6B2CD3209E0:B: from to (none) +TO:5EC295CB:6B2CD3209E0:B: from to (none) SMTP: L00000024 May 18 16:03:55 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128] L00000025 May 18 16:03:55 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128] @@ -48,11 +48,11 @@ L00000033 May 18 16:03:55 pmg-demo postfix/smtp[17728]: 6B2CD3209E0: to= -TO:5EC2B303:264C33209E0:B: from to (none) +TO:5EC296E3:264C33209E0:B: from to (none) SMTP: L00000037 May 18 16:08:34 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128] L00000038 May 18 16:08:34 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128] @@ -74,11 +74,11 @@ L00000046 May 18 16:08:35 pmg-demo postfix/smtp[17728]: 264C33209E0: to= -TO:5EC2B344:86D0C3209DE:B: from to (none) +TO:5EC29724:86D0C3209DE:B: from to (none) SMTP: L0000004A May 18 16:09:39 pmg-demo postfix/smtpd[16982]: connect from pmg-demo.proxmox.com[192.168.30.128] L0000004B May 18 16:09:39 pmg-demo postfix/smtpd[16982]: NOQUEUE: client=pmg-demo.proxmox.com[192.168.30.128] diff --git a/tests/test_output_time_rfc3339_mixed b/tests/test_output_time_rfc3339_mixed index 3e628b8..5accb12 100644 --- a/tests/test_output_time_rfc3339_mixed +++ b/tests/test_output_time_rfc3339_mixed @@ -5,12 +5,12 @@ # End Query Options QENTRY: 520C9C0192 -CTIME: 6495AB99 +CTIME: 64958F79 SIZE: 1902 CLIENT: pmghost.mydomain.tld[192.168.1.001] MSGID: -TO:6495AB99:520C9C0192:Q: from to (C01C264958F7962FEA) -TO:6495AB99:520C9C0192:Q: from to (C01C264958F7962FEA) +TO:64958F79:520C9C0192:Q: from to (C01C264958F7962FEA) +TO:64958F79:520C9C0192:Q: from to (C01C264958F7962FEA) SMTP: L00000004 2023-06-23T14:26:29.331019+02:00 pmg1 postfix/smtpd[1181]: connect from pmghost.mydomain.tld[192.168.1.001] L00000005 2023-06-23T14:26:29.336189+02:00 pmg1 postfix/smtpd[1181]: 520C9C0192: client=pmghost.mydomain.tld[192.168.1.001] @@ -29,12 +29,12 @@ L00000011 2023-06-23T14:26:33.461645+02:00 pmg1 postfix/lmtp[1186]: 520C9C0192: L00000012 2023-06-23T14:26:33.461834+02:00 pmg1 postfix/qmgr[1136]: 520C9C0192: removed QENTRY: 866B7C0192 -CTIME: 6495C7FD +CTIME: 6495ABDD SIZE: 44585 CLIENT: pmghost.mydomain.tld[192.168.1.001] MSGID: -TO:6495C7FD:866B7C0192:Q: from to (C01C364958FBD55D53) -TO:6495C7FD:866B7C0192:Q: from to (C01C364958FBD55D53) +TO:6495ABDD:866B7C0192:Q: from to (C01C364958FBD55D53) +TO:6495ABDD:866B7C0192:Q: from to (C01C364958FBD55D53) SMTP: L00000019 2023-06-23T14:27:40.550478Z pmg1 postfix/smtpd[1181]: connect from pmghost.mydomain.tld[192.168.1.001] L0000001A 2023-06-23T14:27:40.550799Z pmg1 postfix/smtpd[1181]: 866B7C0192: client=pmghost.mydomain.tld[192.168.1.001] @@ -53,12 +53,12 @@ L00000026 2023-06-23T14:27:41.429627Z pmg1 postfix/lmtp[1186]: 866B7C0192: to= -TO:6495E44A:C4EC9C0192:Q: from to (C01D364958FEA2A254) -TO:6495E44A:C4EC9C0192:Q: from to (C01D364958FEA2A254) +TO:6495C82A:C4EC9C0192:Q: from to (C01D364958FEA2A254) +TO:6495C82A:C4EC9C0192:Q: from to (C01D364958FEA2A254) SMTP: L0000002C 2023-06-23T14:28:23.806586-02:00 pmg1 postfix/smtpd[1181]: connect from pmghost.mydomain.tld[192.168.1.001] L0000002D 2023-06-23T14:28:23.806755-02:00 pmg1 postfix/smtpd[1181]: C4EC9C0192: client=pmghost.mydomain.tld[192.168.1.001] @@ -77,11 +77,11 @@ L00000038 2023-06-23T14:28:26.241632-02:00 pmg1 postfix/lmtp[1186]: C4EC9C0192: L00000039 2023-06-23T14:28:26.242140-02:00 pmg1 postfix/qmgr[1136]: C4EC9C0192: removed QENTRY: 71386C0192 -CTIME: 6495E461 +CTIME: 6495C841 SIZE: 129347 CLIENT: localhost.localdomain[127.0.0.1] MSGID: -TO:6495E461:71386C0192:2: from to (relay.domain3.tld[192.168.1.002]:25) +TO:6495C841:71386C0192:2: from to (relay.domain3.tld[192.168.1.002]:25) SMTP: L0000003C 2023-06-23T14:28:42.463301-02:00 pmg1 postfix/smtpd[1274]: connect from localhost.localdomain[127.0.0.1] L0000003D 2023-06-23T14:28:42.463813-02:00 pmg1 postfix/smtpd[1274]: 71386C0192: client=localhost.localdomain[127.0.0.1] diff --git a/tests/test_output_timechange b/tests/test_output_timechange index 1c19799..2137bf4 100644 --- a/tests/test_output_timechange +++ b/tests/test_output_timechange @@ -5,11 +5,11 @@ # End Query Options QENTRY: 3AA60B752 -CTIME: 5E7EAE04 +CTIME: 5E7E9FF4 SIZE: 5935 CLIENT: bbs.domain.example[192.0.2.245] MSGID: <57213b21fafd7b52a6e07ef664c7e8a4@bbs.domain.example> -TO:5E7EAE01:3AA60B752:A: from to (48070B766) +TO:5E7E9FF1:3AA60B752:A: from to (48070B766) SMTP: L00000006 Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23385]: connect from bbs.domain.example[192.0.2.245] L00000007 Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23385]: 3AA60B752: client=bbs.domain.example[192.0.2.245] @@ -25,11 +25,11 @@ L00000014 Mar 28 01:53:05 proxmox-pmg postfix/lmtp[23389]: 3AA60B752: to= -TO:5E7EAE04:48070B766:2: from to (mta6.msp1.example[192.0.2.72]:25) +TO:5E7E9FF4:48070B766:2: from to (mta6.msp1.example[192.0.2.72]:25) SMTP: L0000000D Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23393]: connect from localhost[127.0.0.1] L0000000E Mar 28 01:53:05 proxmox-pmg postfix/smtpd[23393]: 48070B766: client=localhost[127.0.0.1], orig_client=bbs.domain.example[192.0.2.245] @@ -42,12 +42,12 @@ L00000017 Mar 28 01:53:08 proxmox-pmg postfix/smtp[23394]: 48070B766: to= -TO:5E7EBF84:B76CCB76D:A: from to (CF907B795) -TO:5E7EBF84:B76CCB76D:A: from to (CF907B795) +TO:5E7EB174:B76CCB76D:A: from to (CF907B795) +TO:5E7EB174:B76CCB76D:A: from to (CF907B795) SMTP: L00000025 Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23509]: connect from backoffice.domain2.example[192.0.2.249] L00000026 Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23509]: B76CCB76D: client=backoffice.domain2.example[192.0.2.249] @@ -65,12 +65,12 @@ L00000035 Mar 28 03:07:48 proxmox-pmg postfix/lmtp[23513]: B76CCB76D: to= -TO:5E7EBF8B:CF907B795:2: from to (smtp.external1.example[192.0.2.51]:25) -TO:5E7EBF86:CF907B795:2: from to (smtp.domain2.example[192.0.2.180]:25) +TO:5E7EB17B:CF907B795:2: from to (smtp.external1.example[192.0.2.51]:25) +TO:5E7EB176:CF907B795:2: from to (smtp.domain2.example[192.0.2.180]:25) SMTP: L0000002C Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23517]: connect from localhost[127.0.0.1] L0000002D Mar 28 03:07:48 proxmox-pmg postfix/smtpd[23517]: CF907B795: client=localhost[127.0.0.1], orig_client=backoffice.domain2.example[192.0.2.249] @@ -84,28 +84,28 @@ L00000039 Mar 28 03:07:55 proxmox-pmg postfix/smtp[23519]: Trusted TLS connectio L0000003A Mar 28 03:07:55 proxmox-pmg postfix/smtp[23519]: CF907B795: to=, relay=smtp.external1.example[192.0.2.51]:25, delay=6.6, delays=0.01/0.03/6.3/0.33, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as 61FE04093ED0) L0000003B Mar 28 03:07:55 proxmox-pmg postfix/qmgr[570]: CF907B795: removed -SMTPD: T5F9CC8B2L00000000 -CTIME: 5F9CC8B2 +SMTPD: T5F9CBAA2L00000000 +CTIME: 5F9CBAA2 CLIENT: 192.0.2.213 -TO:5F9CC8B2:T5F9CC8B2L00000000:N: from to +TO:5F9CBAA2:T5F9CBAA2L00000000:N: from to LOGS: L0000005C Oct 31 02:15:14 proxmox-pmg postfix/postscreen[6185]: NOQUEUE: reject: RCPT from [192.0.2.213]:12641: 550 5.7.1 Service unavailable; client [192.0.2.213] blocked using zen.spamhaus.org; from=, to=, proto=ESMTP, helo= -SMTPD: T5F9CCB56L00000001 -CTIME: 5F9CCB57 +SMTPD: T5F9CBD46L00000001 +CTIME: 5F9CBD47 CLIENT: unknown[192.0.2.214] -TO:5F9CCB56:T5F9CCB56L00000001:G: from to +TO:5F9CBD46:T5F9CBD46L00000001:G: from to LOGS: L00000061 Oct 31 02:26:30 proxmox-pmg postfix/smtpd[6264]: connect from unknown[192.0.2.214] L00000064 Oct 31 02:26:30 proxmox-pmg postfix/smtpd[6264]: NOQUEUE: reject: RCPT from unknown[192.0.2.214]: 450 4.7.1 : Recipient address rejected: Service is unavailable (try later); from= to= proto=ESMTP helo= L00000065 Oct 31 02:26:31 proxmox-pmg postfix/smtpd[6264]: disconnect from unknown[192.0.2.214] ehlo=1 mail=1 rcpt=0/1 data=0/1 quit=1 commands=3/5 QENTRY: 7EC601A15F -CTIME: 5F9CD1B3 +CTIME: 5F9CC3A3 SIZE: 11013 CLIENT: bbs.domain.example[192.0.2.245] MSGID: -TO:5F9CD1B2:7EC601A15F:A: from to (8D0041A173) +TO:5F9CC3A2:7EC601A15F:A: from to (8D0041A173) SMTP: L0000006E Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6006]: connect from bbs.domain.example[192.0.2.245] L0000006F Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6006]: 7EC601A15F: client=bbs.domain.example[192.0.2.245] @@ -121,11 +121,11 @@ L0000007C Oct 31 02:53:38 proxmox-pmg postfix/lmtp[6008]: 7EC601A15F: to= -TO:5F9CD1B3:8D0041A173:2: from to (mx-in.msp2.example[2001:db8:1111:1111::1b]:25) +TO:5F9CC3A3:8D0041A173:2: from to (mx-in.msp2.example[2001:db8:1111:1111::1b]:25) SMTP: L00000075 Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6012]: connect from localhost[127.0.0.1] L00000076 Oct 31 02:53:38 proxmox-pmg postfix/smtpd[6012]: 8D0041A173: client=localhost[127.0.0.1], orig_client=bbs.domain.example[192.0.2.245] @@ -138,11 +138,11 @@ L0000007F Oct 31 02:53:39 proxmox-pmg postfix/smtp[6013]: 8D0041A173: to= -TO:5F9CC52C:44A0B1A1BB:A: from to (53EF81A1CD) +TO:5F9CB71C:44A0B1A1BB:A: from to (53EF81A1CD) SMTP: L0000008E Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6520]: connect from www.domain.example[192.0.2.69] L0000008F Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6520]: 44A0B1A1BB: client=www.domain.example[192.0.2.69] @@ -158,11 +158,11 @@ L0000009C Oct 31 02:00:12 proxmox-pmg postfix/lmtp[6523]: 44A0B1A1BB: to= -TO:5F9CC530:53EF81A1CD:2: from to (mail.domain.example[192.0.2.106]:25) +TO:5F9CB720:53EF81A1CD:2: from to (mail.domain.example[192.0.2.106]:25) SMTP: L00000095 Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6527]: connect from localhost[127.0.0.1] L00000096 Oct 31 02:00:12 proxmox-pmg postfix/smtpd[6527]: 53EF81A1CD: client=localhost[127.0.0.1], orig_client=www.domain.example[192.0.2.69] @@ -174,21 +174,21 @@ L0000009E Oct 31 02:00:12 proxmox-pmg postfix/smtp[6512]: Trusted TLS connection L0000009F Oct 31 02:00:16 proxmox-pmg postfix/smtp[6512]: 53EF81A1CD: to=, relay=mail.domain.example[192.0.2.106]:25, delay=4.2, delays=0/0/0.34/3.9, dsn=2.5.0, status=sent (250 2.5.0 OK (448AE617DEA9CB1BE8)) L000000A0 Oct 31 02:00:16 proxmox-pmg postfix/qmgr[567]: 53EF81A1CD: removed -SMTPD: T5F9CC5D0L00000000 -CTIME: 5F9CC5D1 +SMTPD: T5F9CB7C0L00000000 +CTIME: 5F9CB7C1 CLIENT: unknown[192.0.2.215] -TO:5F9CC5D1:T5F9CC5D0L00000000:G: from to +TO:5F9CB7C1:T5F9CB7C0L00000000:G: from to LOGS: L000000A9 Oct 31 02:02:56 proxmox-pmg postfix/smtpd[6548]: connect from unknown[192.0.2.215] L000000AB Oct 31 02:02:57 proxmox-pmg postfix/smtpd[6548]: NOQUEUE: reject: RCPT from unknown[192.0.2.215]: 450 4.7.1 : Recipient address rejected: Service is unavailable (try later); from= to= proto=ESMTP helo= L000000AC Oct 31 02:02:57 proxmox-pmg postfix/smtpd[6548]: disconnect from unknown[192.0.2.215] ehlo=1 mail=1 rcpt=0/1 data=0/1 quit=1 commands=3/5 QENTRY: BBA631A1D1 -CTIME: 5F9CC653 +CTIME: 5F9CB843 SIZE: 10843 CLIENT: bbs.domain.example[192.0.2.245] MSGID: -TO:5F9CC652:BBA631A1D1:A: from to (C9D5E1A1E6) +TO:5F9CB842:BBA631A1D1:A: from to (C9D5E1A1E6) SMTP: L000000B1 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6570]: connect from bbs.domain.example[192.0.2.245] L000000B2 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6570]: BBA631A1D1: client=bbs.domain.example[192.0.2.245] @@ -204,11 +204,11 @@ L000000BF Oct 31 02:05:06 proxmox-pmg postfix/lmtp[6573]: BBA631A1D1: to= -TO:5F9CC653:C9D5E1A1E6:2: from to (mx-in.msp2.example[2001:db8:1111:1111::1a]:25) +TO:5F9CB843:C9D5E1A1E6:2: from to (mx-in.msp2.example[2001:db8:1111:1111::1a]:25) SMTP: L000000B8 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6577]: connect from localhost[127.0.0.1] L000000B9 Oct 31 02:05:06 proxmox-pmg postfix/smtpd[6577]: C9D5E1A1E6: client=localhost[127.0.0.1], orig_client=bbs.domain.example[192.0.2.245] @@ -221,22 +221,22 @@ L000000C2 Oct 31 02:05:07 proxmox-pmg postfix/smtp[6578]: C9D5E1A1E6: to= -TO:5FEE65FF:42EA826EA2:A: from to (51BD826EBE) -TO:5FEE65FF:42EA826EA2:A: from to (51BD826EBE) -TO:5FEE65FF:42EA826EA2:A: from to (51BD826EBE) -TO:5FEE65FF:42EA826EA2:A: from to (51BD826EBE) -TO:5FEE65FF:42EA826EA2:A: from to (51BD826EBE) -TO:5FEE65FF:42EA826EA2:A: from to (51BD826EBE) +TO:5FEE57EF:42EA826EA2:A: from to (51BD826EBE) +TO:5FEE57EF:42EA826EA2:A: from to (51BD826EBE) +TO:5FEE57EF:42EA826EA2:A: from to (51BD826EBE) +TO:5FEE57EF:42EA826EA2:A: from to (51BD826EBE) +TO:5FEE57EF:42EA826EA2:A: from to (51BD826EBE) +TO:5FEE57EF:42EA826EA2:A: from to (51BD826EBE) SMTP: L000000C5 Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26384]: connect from backoffice.domain.example[192.0.2.249] L000000C6 Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26384]: 42EA826EA2: client=backoffice.domain.example[192.0.2.249] @@ -262,15 +262,15 @@ L000000DF Dec 31 23:59:59 proxmox-pmg postfix/lmtp[26389]: 42EA826EA2: to= -TO:5FEE65FF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) -TO:5FEE65FF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) -TO:5FEE65FF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) -TO:5FEE65FF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) -TO:5FEE65FF:51BD826EBE:2: from to (mail.domain.example[192.0.2.106]:25) +TO:5FEE57EF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) +TO:5FEE57EF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) +TO:5FEE57EF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) +TO:5FEE57EF:51BD826EBE:2: from to (smtp.domain2.example[192.0.2.180]:25) +TO:5FEE57EF:51BD826EBE:2: from to (mail.domain.example[192.0.2.106]:25) SMTP: L000000CE Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26398]: connect from localhost[127.0.0.1] L000000CF Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26398]: 51BD826EBE: client=localhost[127.0.0.1], orig_client=backoffice.domain.example[192.0.2.249] @@ -287,8 +287,8 @@ L000000E7 Dec 31 23:59:59 proxmox-pmg postfix/smtp[26403]: 51BD826EBE: to=, relay=smtp.domain2.example[192.0.2.180]:25, delay=1.2, delays=0.05/0/0.22/0.89, dsn=2.5.0, status=sent (250 2.5.0 OK (46BE861CF83FDA43DE)) L000000E9 Dec 31 23:59:59 proxmox-pmg postfix/qmgr[567]: 51BD826EBE: removed -SMTPD: T5FEE65FFL00000001 -CTIME: 5FEE65FF +SMTPD: T5FEE57EFL00000001 +CTIME: 5FEE57EF CLIENT: localhost[127.0.0.1] LOGS: L000000CC Dec 31 23:59:59 proxmox-pmg postfix/smtpd[26400]: connect from localhost[127.0.0.1] -- 2.39.2