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 449C069BB4 for ; Tue, 23 Mar 2021 15:28:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 38B5B2FFA3 for ; Tue, 23 Mar 2021 15:28:27 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 94C1F2FF91 for ; Tue, 23 Mar 2021 15:28:25 +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 67B664642A for ; Tue, 23 Mar 2021 15:28:25 +0100 (CET) From: Mira Limbeck To: pmg-devel@lists.proxmox.com Date: Tue, 23 Mar 2021 15:28:23 +0100 Message-Id: <20210323142823.27616-2-m.limbeck@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210323142823.27616-1-m.limbeck@proxmox.com> References: <20210323142823.27616-1-m.limbeck@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.238 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 Subject: [pmg-devel] [PATCH v2 log-tracker 2/2] add test case for relay removed before lmtp 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, 23 Mar 2021 14:28:57 -0000 Signed-off-by: Mira Limbeck --- v2: - rebased on faketime and outgoing TLS patches - changed test to use faketime .../test_input_after_queue_relay_before_lmtp | 19 ++++++++ .../test_output_after_queue_relay_before_lmtp | 44 +++++++++++++++++++ tests/tests_after_queue.rs | 23 ++++++++++ 3 files changed, 86 insertions(+) create mode 100644 tests/test_input_after_queue_relay_before_lmtp create mode 100644 tests/test_output_after_queue_relay_before_lmtp diff --git a/tests/test_input_after_queue_relay_before_lmtp b/tests/test_input_after_queue_relay_before_lmtp new file mode 100644 index 0000000..3cb6e8b --- /dev/null +++ b/tests/test_input_after_queue_relay_before_lmtp @@ -0,0 +1,19 @@ +Jan 21 07:33:20 pmghost postfix/smtpd[29361]: connect from pmghost.mydomain.tld[192.168.1.001] +Jan 21 07:33:20 pmghost postfix/smtpd[29361]: DEF2520A69: client=pmghost.mydomain.tld[192.168.1.001] +Jan 21 07:33:20 pmghost postfix/cleanup[29364]: DEF2520A69: message-id= +Jan 21 07:33:20 pmghost postfix/qmgr[529]: DEF2520A69: from=, size=161138, nrcpt=1 (queue active) +Jan 21 07:33:21 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: new mail message-id=#012 +Jan 21 07:33:21 pmghost postfix/smtpd[29361]: 1855220A70: client=pmghost.mydomain.tld[192.168.1.001] +Jan 21 07:33:21 pmghost postfix/smtpd[29361]: disconnect from pmghost.mydomain.tld[192.168.1.001] ehlo=1 mail=2 rcpt=2 data=2 quit=1 commands=8 +Jan 21 07:33:24 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: SA score=1/5 time=3.500 bayes=undefined autolearn=no autolearn_force=no hits=AWL(0.270),DKIM_SIGNED(0.1),DKIM_VALID(-0.1),DKIM_VALID_AU(-0.1),HTML_EMBEDS(0.001),HTML_FONT_LOW_CONTRAST(0.001),HTML_IMAGE_RATIO_02(0.001),HTML_MESSAGE(0.001),KAM_LOTSOFHASH(0.25),MPART_ALT_DIFF_COUNT(1.483),SPF_HELO_NONE(0.001),SPF_PASS(-0.001) +Jan 21 07:33:24 pmghost postfix/smtpd[29375]: connect from localhost[127.0.0.1] +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] +Jan 21 07:33:24 pmghost postfix/cleanup[29364]: A673520AB5: message-id= +Jan 21 07:33:24 pmghost postfix/smtpd[29375]: disconnect from localhost[127.0.0.1] ehlo=1 xforward=1 mail=1 rcpt=1 data=1 commands=5 +Jan 21 07:33:24 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: accept mail to (A673520AB5) (rule: default-accept) +Jan 21 07:33:24 pmghost postfix/qmgr[529]: A673520AB5: from=, size=162287, nrcpt=1 (queue active) +Jan 21 07:33:24 pmghost postfix/smtp[29376]: A673520AB5: to=, relay=192.168.1.002[192.168.1.002]:25, delay=0.07, delays=0.06/0/0/0.01, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as B6B682E547) +Jan 21 07:33:24 pmghost postfix/qmgr[529]: A673520AB5: removed +Jan 21 07:33:24 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: processing time: 3.748 seconds (3.5, 0.137, 0) +Jan 21 07:33:24 pmghost postfix/lmtp[29365]: DEF2520A69: to=, relay=127.0.0.1[127.0.0.1]:10024, delay=3.9, delays=0.05/0.04/0.01/3.8, dsn=2.5.0, status=sent (250 2.5.0 OK (20A9560092030F3374)) +Jan 21 07:33:24 pmghost postfix/qmgr[529]: DEF2520A69: removed diff --git a/tests/test_output_after_queue_relay_before_lmtp b/tests/test_output_after_queue_relay_before_lmtp new file mode 100644 index 0000000..c4d0fdf --- /dev/null +++ b/tests/test_output_after_queue_relay_before_lmtp @@ -0,0 +1,44 @@ +# LogReader: 4815 +# Query options +# Start: 2020-01-21 00:00:00 (1579564800) +# End: 2021-02-19 11:07:50 (1613732870) +# End Query Options + +QENTRY: A673520AB5 +CTIME: 5E26A944 +SIZE: 162287 +CLIENT: localhost[127.0.0.1], +MSGID: +TO:5E26A944: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] +L0000000C Jan 21 07:33:24 pmghost postfix/smtpd[29375]: disconnect from localhost[127.0.0.1] ehlo=1 xforward=1 mail=1 rcpt=1 data=1 commands=5 +QMGR: +L0000000B Jan 21 07:33:24 pmghost postfix/cleanup[29364]: A673520AB5: message-id= +L0000000E Jan 21 07:33:24 pmghost postfix/qmgr[529]: A673520AB5: from=, size=162287, nrcpt=1 (queue active) +L0000000F Jan 21 07:33:24 pmghost postfix/smtp[29376]: A673520AB5: to=, relay=192.168.1.002[192.168.1.002]:25, delay=0.07, delays=0.06/0/0/0.01, dsn=2.0.0, status=sent (250 2.0.0 Ok: queued as B6B682E547) +L00000010 Jan 21 07:33:24 pmghost postfix/qmgr[529]: A673520AB5: removed + +QENTRY: DEF2520A69 +CTIME: 5E26A944 +SIZE: 161138 +CLIENT: pmghost.mydomain.tld[192.168.1.001] +MSGID: +TO:5E26A944: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] +L00000006 Jan 21 07:33:21 pmghost postfix/smtpd[29361]: 1855220A70: client=pmghost.mydomain.tld[192.168.1.001] +L00000007 Jan 21 07:33:21 pmghost postfix/smtpd[29361]: disconnect from pmghost.mydomain.tld[192.168.1.001] ehlo=1 mail=2 rcpt=2 data=2 quit=1 commands=8 +FILTER: 20A9560092030F3374 +L00000005 Jan 21 07:33:21 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: new mail message-id=#012 +L00000008 Jan 21 07:33:24 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: SA score=1/5 time=3.500 bayes=undefined autolearn=no autolearn_force=no hits=AWL(0.270),DKIM_SIGNED(0.1),DKIM_VALID(-0.1),DKIM_VALID_AU(-0.1),HTML_EMBEDS(0.001),HTML_FONT_LOW_CONTRAST(0.001),HTML_IMAGE_RATIO_02(0.001),HTML_MESSAGE(0.001),KAM_LOTSOFHASH(0.25),MPART_ALT_DIFF_COUNT(1.483),SPF_HELO_NONE(0.001),SPF_PASS(-0.001) +L0000000D Jan 21 07:33:24 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: accept mail to (A673520AB5) (rule: default-accept) +L00000011 Jan 21 07:33:24 pmghost pmg-smtp-filter[28437]: 20A9560092030F3374: processing time: 3.748 seconds (3.5, 0.137, 0) +QMGR: +L00000003 Jan 21 07:33:20 pmghost postfix/cleanup[29364]: DEF2520A69: message-id= +L00000004 Jan 21 07:33:20 pmghost postfix/qmgr[529]: DEF2520A69: from=, size=161138, nrcpt=1 (queue active) +L00000012 Jan 21 07:33:24 pmghost postfix/lmtp[29365]: DEF2520A69: to=, relay=127.0.0.1[127.0.0.1]:10024, delay=3.9, delays=0.05/0.04/0.01/3.8, dsn=2.5.0, status=sent (250 2.5.0 OK (20A9560092030F3374)) +L00000013 Jan 21 07:33:24 pmghost postfix/qmgr[529]: DEF2520A69: removed + diff --git a/tests/tests_after_queue.rs b/tests/tests_after_queue.rs index 6918de7..2a8e637 100644 --- a/tests/tests_after_queue.rs +++ b/tests/tests_after_queue.rs @@ -149,3 +149,26 @@ fn after_queue_search_string_case_insensitive() { let output_reader = BufReader::new(&output.stdout[..]); utils::compare_output(output_reader, expected_output); } + +#[test] +fn after_queue_relay_before_lmtp() { + let output = Command::new("faketime") + .arg("2020-12-31 23:59:59") + .arg(utils::log_tracker_path()) + .arg("-vv") + .arg("-s") + .arg("2020-01-21 07:30:00") + .arg("-e") + .arg("2020-01-21 07:35:00") + .arg("-i") + .arg("tests/test_input_after_queue_relay_before_lmtp") + .output() + .expect("failed to execute pmg-log-tracker"); + + let expected_file = File::open("tests/test_output_after_queue_relay_before_lmtp") + .expect("failed to open test_output"); + + let expected_output = BufReader::new(&expected_file); + let output_reader = BufReader::new(&output.stdout[..]); + utils::compare_output(output_reader, expected_output); +} -- 2.20.1