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 BE4606942D for ; Mon, 22 Mar 2021 14:07:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BBE6C23E60 for ; Mon, 22 Mar 2021 14:07:30 +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 2DD1923E51 for ; Mon, 22 Mar 2021 14:07:29 +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 EB11B46255 for ; Mon, 22 Mar 2021 14:07:28 +0100 (CET) To: pmg-devel@lists.proxmox.com References: <20210219103147.28013-1-m.limbeck@proxmox.com> <20210219103147.28013-3-m.limbeck@proxmox.com> From: Mira Limbeck Message-ID: <2a1727d4-ff0e-7f37-a524-366963c6adfb@proxmox.com> Date: Mon, 22 Mar 2021 14:07:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210219103147.28013-3-m.limbeck@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-SPAM-LEVEL: Spam detection results: 0 AWL 0.456 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pmg-devel] [PATCH log-tracker 3/3] 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: Mon, 22 Mar 2021 13:07:30 -0000 I'll send this updated to the faketime tests tomorrow, together with the outgoing TLS tests. On 2/19/21 11:31 AM, Mira Limbeck wrote: > Signed-off-by: Mira Limbeck > --- > .../test_input_after_queue_relay_before_lmtp | 19 ++++++++ > .../test_output_after_queue_relay_before_lmtp | 44 +++++++++++++++++++ > tests/tests_after_queue.rs | 21 +++++++++ > 3 files changed, 84 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..a1dbc40 > --- /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: 60092E44 > +SIZE: 162287 > +CLIENT: localhost[127.0.0.1], > +MSGID: > +TO:60092E44: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: 60092E44 > +SIZE: 161138 > +CLIENT: pmghost.mydomain.tld[192.168.1.001] > +MSGID: > +TO:60092E44: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 8a66887..a1b3fac 100644 > --- a/tests/tests_after_queue.rs > +++ b/tests/tests_after_queue.rs > @@ -137,3 +137,24 @@ 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(utils::log_tracker_path()) > + .arg("-vv") > + .arg("-s") > + .arg("2021-01-21 07:30:00") > + .arg("-e") > + .arg("2021-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); > +}