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 8CCFA6BA00 for ; Fri, 19 Feb 2021 11:32:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7935F17A93 for ; Fri, 19 Feb 2021 11:31:58 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id E4A1517A2B for ; Fri, 19 Feb 2021 11:31:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A8A904626E for ; Fri, 19 Feb 2021 11:31:53 +0100 (CET) From: Mira Limbeck To: pmg-devel@lists.proxmox.com Date: Fri, 19 Feb 2021 11:31:45 +0100 Message-Id: <20210219103147.28013-1-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.234 Adjusted score from AWL reputation of From: address 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 NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pmg-devel] [PATCH log-tracker 1/3] update tests 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: Fri, 19 Feb 2021 10:32:28 -0000 As we only have month, day and time available but not the year, we have to update the tests every year. Signed-off-by: Mira Limbeck --- tests/test_output_after_queue | 34 ++++++------ tests/test_output_after_queue_host | 18 +++---- tests/test_output_after_queue_qid | 4 +- tests/test_output_after_queue_search_string | 6 +-- 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 | 12 ++--- 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/tests_after_queue.rs | 24 ++++----- tests/tests_before_queue.rs | 52 +++++++++---------- 16 files changed, 145 insertions(+), 145 deletions(-) diff --git a/tests/test_output_after_queue b/tests/test_output_after_queue index ec2fc65..ae7c5d2 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: 61BE0238 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCCEB8:21BCE3807B6:Q: from to (381C6F5DFA39502F470) +TO:61BE0238: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:61BE034E:CFC5F42740:A: from to (88F2E42667) +TO:61BE034E:CFC5F42740:A: from to (88F2E42667) +TO:61BE034E:CFC5F42740:A: from to (88F2E42667) +TO:61BE034E: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:61BE034E:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE034E:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE034E:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE034E: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] @@ -76,19 +76,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: T61BE035AL00000000 +CTIME: 61BE035A CLIENT: 10.0.0.1 -TO:5FDCCFDA:T5FDCCFDAL00000000:N: from to +TO:61BE035A:T61BE035AL00000000: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: 61BE0480 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCD100:0022C3801B5:B: from to (none) +TO:61BE0480: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_host b/tests/test_output_after_queue_host index ead669c..dfbcfb1 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: 61BE0238 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCCEB8:21BCE3807B6:Q: from to (381C6F5DFA39502F470) +TO:61BE0238: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:61BE034E:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE034E:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE034E:88F2E42667:2: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE034E: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] @@ -48,11 +48,11 @@ L00000027 Dec 18 15:50:38 proxmox-new postfix/smtp[13180]: 88F2E42667: to= -TO:5FDCD100:0022C3801B5:B: from to (none) +TO:61BE0480: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..012712f 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: 61BE0480 SIZE: 2053 CLIENT: pmg.localhost[192.168.22.40] MSGID: -TO:5FDCD100:0022C3801B5:B: from to (none) +TO:61BE0480: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_search_string b/tests/test_output_after_queue_search_string index dbd985b..53bc03f 100644 --- a/tests/test_output_after_queue_search_string +++ b/tests/test_output_after_queue_search_string @@ -5,10 +5,10 @@ # END: 2020-12-18 16:00:00 (1608307200) # End Query Options -SMTPD: T5FDCCFDAL00000000 -CTIME: 5FDCCFDA +SMTPD: T61BE035AL00000000 +CTIME: 61BE035A CLIENT: 10.0.0.1 -TO:5FDCCFDA:T5FDCCFDAL00000000:N: from to +TO:61BE035A:T61BE035AL00000000: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= diff --git a/tests/test_output_before_queue b/tests/test_output_before_queue index aca61b9..394f539 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: T61BDF86FL00000000 +CTIME: 61BDF86F CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC4EF:T5FDCC4EFL00000000:B: from to +TO:61BDF86F:T61BDF86FL00000000: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: T61BDF8F2L00000000 +CTIME: 61BDF8F2 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC572:T5FDCC572L00000000:Q: from to +TO:61BDF8F2:T61BDF8F2L00000000: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: T61BDF96AL00000000 +CTIME: 61BDF96A CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from to +TO:61BDF96A:T61BDF96AL00000000: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: T61BDF9E2L00000000 +CTIME: 61BDF9E2 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC662:T5FDCC662L00000000:Q: from to +TO:61BDF9E2:T61BDF9E2L00000000: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: 61BE00B9 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:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005: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: T61BE00C6L00000000 +CTIME: 61BE00C6 CLIENT: 10.0.0.1 -TO:5FDCCD46:T5FDCCD46L00000000:N: from to +TO:61BE00C6:T61BE00C6L00000000: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..a273edb 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: T61BDF9E2L00000000 +CTIME: 61BDF9E2 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC662:T5FDCC662L00000000:Q: from to +TO:61BDF9E2:T61BDF9E2L00000000: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..e668f7f 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: T61BDF86FL00000000 +CTIME: 61BDF86F CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC4EF:T5FDCC4EFL00000000:B: from to +TO:61BDF86F:T61BDF86FL00000000: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: T61BDF8F2L00000000 +CTIME: 61BDF8F2 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC572:T5FDCC572L00000000:Q: from to +TO:61BDF8F2:T61BDF8F2L00000000: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: T61BDF96AL00000000 +CTIME: 61BDF96A CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from to +TO:61BDF96A:T61BDF96AL00000000: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: T61BDF9E2L00000000 +CTIME: 61BDF9E2 CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC662:T5FDCC662L00000000:Q: from to +TO:61BDF9E2:T61BDF9E2L00000000: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: 61BE00B9 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:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005: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 7495a78..2c4ad66 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: 608C2503 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:608C24F9:E1C6561393:R: from to (192.0.2.69[192.0.2.69]:25) +TO:608C24F8:E1C6561393:B: from to (none) +TO:608C24F8: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 450f509..41e4581 100644 --- a/tests/test_output_before_queue_mixed_downstream +++ b/tests/test_output_before_queue_mixed_downstream @@ -5,17 +5,17 @@ # End Query Options QENTRY: E2487636D9 -CTIME: 5FDCD233 +CTIME: 61BE05B3 SIZE: 3628 MSGID: <20200428171350.E2487636D9@pmg6.rosa.proxmox.com> -TO:5FDCD233:E2487636D9:2: from <> to (test.localdomain[192.0.2.0.70]:25) +TO:61BE05B3:E2487636D9:2: from <> to (test.localdomain[192.0.2.0.70]:25) QENTRY: B8010636D6 -CTIME: 5FDCD233 +CTIME: 61BE05B3 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:61BE05B2:B8010636D6:P: from to (192.0.2.0.69[192.0.2.0.69]:25) +TO:61BE05B2:B8010636D6:R: from to (192.0.2.0.69[192.0.2.0.69]:25) +TO:61BE05B2: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..0fcbca7 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: 61BE00B9 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:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005:1C6B541C5D:P: from to (192.168.22.40[192.168.22.40]:25) +TO:61BE0005: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..f20c33e 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: T61BDF86FL00000000 +CTIME: 61BDF86F CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC4EF:T5FDCC4EFL00000000:B: from to +TO:61BDF86F:T61BDF86FL00000000: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: T61BE00C6L00000000 +CTIME: 61BE00C6 CLIENT: 10.0.0.1 -TO:5FDCCD46:T5FDCCD46L00000000:N: from to +TO:61BE00C6:T61BE00C6L00000000: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..8a0b802 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: T6128F0D8L00000000 +CTIME: 6128F0D8 CLIENT: pmgsender[192.168.22.40] -TO:5F47BD58:T5F47BD58L00000000:N: from to +TO:6128F0D8:T6128F0D8L00000000: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..9a944f1 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: T61BDF96AL00000000 +CTIME: 61BDF96A CLIENT: pmg.localhost[192.168.22.40] -TO:5FDCC5EA:T5FDCC5EAL00000000:Q: from to +TO:61BDF96A:T61BDF96AL00000000: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..fc022f2 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: T60A3E3F7L00000002 +CTIME: 60A3E3F7 CLIENT: pmg-demo.proxmox.com[192.168.30.128] -TO:5EC2B077:T5EC2B077L00000002:B: from to +TO:60A3E3F7:T60A3E3F7L00000002: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: 60A3E56B SIZE: 2342 CLIENT: localhost.localdomain[127.0.0.1], MSGID: <20200518140355.6B2CD3209E0@pmg-demo.proxmox.com> -TO:5EC2B1EB:6B2CD3209E0:B: from to (none) +TO:60A3E56B: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:60A3E683: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:60A3E6C4: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/tests_after_queue.rs b/tests/tests_after_queue.rs index f479325..8a66887 100644 --- a/tests/tests_after_queue.rs +++ b/tests/tests_after_queue.rs @@ -9,9 +9,9 @@ fn after_queue_start_end_time_string() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("2020-12-18 15:40:00") + .arg("2021-12-18 15:40:00") .arg("-e") - .arg("2020-12-18 16:00:00") + .arg("2021-12-18 16:00:00") .arg("-i") .arg("tests/test_input_mixed") .output() @@ -30,9 +30,9 @@ fn after_queue_start_end_timestamp() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608302400") + .arg("1639838400") .arg("-e") - .arg("1608303600") + .arg("1639839600") .arg("-i") .arg("tests/test_input_mixed") .output() @@ -51,9 +51,9 @@ fn after_queue_qid() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608302400") + .arg("1639838400") .arg("-e") - .arg("1608303600") + .arg("1639839600") .arg("-i") .arg("tests/test_input_mixed") .arg("-q") @@ -74,9 +74,9 @@ fn after_queue_host() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608302400") + .arg("1639838400") .arg("-e") - .arg("1608303600") + .arg("1639839600") .arg("-i") .arg("tests/test_input_mixed") .arg("-h") @@ -97,9 +97,9 @@ fn after_queue_search_string() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608302400") + .arg("1639838400") .arg("-e") - .arg("1608303600") + .arg("1639839600") .arg("-i") .arg("tests/test_input_mixed") .arg("-x") @@ -120,9 +120,9 @@ fn after_queue_search_string_case_insensitive() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608302400") + .arg("1639838400") .arg("-e") - .arg("1608303600") + .arg("1639839600") .arg("-i") .arg("tests/test_input_mixed") .arg("-x") diff --git a/tests/tests_before_queue.rs b/tests/tests_before_queue.rs index 5f36ec2..77b6ab5 100644 --- a/tests/tests_before_queue.rs +++ b/tests/tests_before_queue.rs @@ -8,9 +8,9 @@ fn before_queue_start_end_time_string() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("2020-12-18 15:00:00") + .arg("2021-12-18 15:00:00") .arg("-e") - .arg("2020-12-18 15:40:00") + .arg("2021-12-18 15:40:00") .arg("-i") .arg("tests/test_input_mixed") .output() @@ -29,9 +29,9 @@ fn before_queue_start_end_timestamp() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .output() @@ -50,9 +50,9 @@ fn before_queue_qid() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-q") @@ -73,9 +73,9 @@ fn before_queue_host() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-h") @@ -96,9 +96,9 @@ fn before_queue_search_string() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-x") @@ -119,9 +119,9 @@ fn before_queue_search_string_case_insensitive() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-x") @@ -142,9 +142,9 @@ fn before_queue_exclude_greylist_ndr() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-g") @@ -165,9 +165,9 @@ fn before_queue_to() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-t") @@ -188,9 +188,9 @@ fn before_queue_mixed_downstream() { let output = Command::new(utils::log_tracker_path()) .arg("-v") .arg("-s") - .arg("1608303600") + .arg("1639839600") .arg("-e") - .arg("1608304200") + .arg("1639840200") .arg("-i") .arg("tests/test_input_mixed") .output() @@ -209,9 +209,9 @@ fn before_queue_from_to() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1608300000") + .arg("1639836000") .arg("-e") - .arg("1608302400") + .arg("1639838400") .arg("-i") .arg("tests/test_input_mixed") .arg("-f") @@ -234,9 +234,9 @@ fn before_queue_mixed_accept_block_quarantine() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1588254000") + .arg("1619790000") .arg("-e") - .arg("1588255200") + .arg("1619791200") .arg("-i") .arg("tests/test_input_mixed_accept_block_quarantine") .arg("-n") @@ -256,9 +256,9 @@ fn before_queue_to_search_string() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("1589810100") + .arg("1621346100") .arg("-e") - .arg("1589812000") + .arg("1621348000") .arg("-i") .arg("tests/test_input_before_queue_to_search_string") .arg("-t") @@ -281,9 +281,9 @@ fn before_queue_syntax_reject() { let output = Command::new(utils::log_tracker_path()) .arg("-vv") .arg("-s") - .arg("2020-08-27 14:00:00") + .arg("2021-08-27 14:00:00") .arg("-e") - .arg("2020-08-27 14:05:00") + .arg("2021-08-27 14:05:00") .arg("-i") .arg("tests/test_input_before_queue_syntax_reject") .output() -- 2.20.1