From 8f1283799014bd970817d6d0c21fb8fb860f5264 Mon Sep 17 00:00:00 2001 From: Philip Hazel Date: Wed, 22 Aug 2007 10:10:23 +0000 Subject: Add the NOTQUIT ACL. --- test/confs/0562 | 28 ++++++++++++++ test/log/0562 | 16 ++++++++ test/rejectlog/0562 | 14 +++++++ test/scripts/0000-Basic/0562 | 66 +++++++++++++++++++++++++++++++++ test/stderr/0562 | 2 + test/stdout/0562 | 88 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 214 insertions(+) create mode 100644 test/confs/0562 create mode 100644 test/log/0562 create mode 100644 test/rejectlog/0562 create mode 100644 test/scripts/0000-Basic/0562 create mode 100644 test/stderr/0562 create mode 100644 test/stdout/0562 (limited to 'test') diff --git a/test/confs/0562 b/test/confs/0562 new file mode 100644 index 000000000..51343f61a --- /dev/null +++ b/test/confs/0562 @@ -0,0 +1,28 @@ +# Exim test configuration 0562 + +exim_path = EXIM_PATH +host_lookup_order = bydns +primary_hostname = myhost.test.ex +rfc1413_query_timeout = 0s +spool_directory = DIR/spool +log_file_path = DIR/spool/log/%slog +gecos_pattern = "" +gecos_name = CALLER_NAME + +# ----- Main settings ----- + +acl_smtp_rcpt = accept +acl_smtp_data = drop +acl_smtp_notquit = notquit + +smtp_accept_max_nonmail = 4 +smtp_receive_timeout = 1s + +# ----- ACLs ----- + +begin acl + +notquit: + accept logwrite = NOTQUIT reason: '$smtp_notquit_reason' + +# End diff --git a/test/log/0562 b/test/log/0562 new file mode 100644 index 000000000..43b67db11 --- /dev/null +++ b/test/log/0562 @@ -0,0 +1,16 @@ +1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 +1999-03-02 09:44:33 SMTP data timeout (message abandoned) on connection from (abcd) [127.0.0.1] F= +1999-03-02 09:44:33 NOTQUIT reason: 'data-timeout' +1999-03-02 09:44:33 SMTP command timeout on connection from [127.0.0.1] +1999-03-02 09:44:33 NOTQUIT reason: 'command-timeout' +1999-03-02 09:44:33 NOTQUIT reason: 'connection-lost' +1999-03-02 09:44:33 NOTQUIT reason: 'bad-commands' +1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown") +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy") +1999-03-02 09:44:33 NOTQUIT reason: 'bad-commands' +1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F= rejected after DATA +1999-03-02 09:44:33 10HmaX-0005vi-00 NOTQUIT reason: 'acl-drop' diff --git a/test/rejectlog/0562 b/test/rejectlog/0562 new file mode 100644 index 000000000..d10c450f6 --- /dev/null +++ b/test/rejectlog/0562 @@ -0,0 +1,14 @@ +1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many unrecognized commands (last was "unknown") +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 H=[127.0.0.1] rejected VRFY +1999-03-02 09:44:33 SMTP call from [127.0.0.1] dropped: too many nonmail commands (last was "vrfy") +1999-03-02 09:44:33 10HmaX-0005vi-00 H=(abcd) [127.0.0.1] F= rejected after DATA +Envelope-from: +Envelope-to: +P Received: from [127.0.0.1] (helo=abcd) + by myhost.test.ex with esmtp (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/scripts/0000-Basic/0562 b/test/scripts/0000-Basic/0562 new file mode 100644 index 000000000..c6a72abbc --- /dev/null +++ b/test/scripts/0000-Basic/0562 @@ -0,0 +1,66 @@ +# NOTQUIT ACL +need_ipv4 +# +exim -DSERVER=server -bd -oX PORT_D +**** +client 127.0.0.1 PORT_D +??? 220 +ehlo abcd +??? 250- +??? 250- +??? 250- +??? 250 +mail from:\r\nrcpt to:\r\ndata +??? 250 +??? 250 +??? 354 +This is a test message. ++++ 2 +**** +client 127.0.0.1 PORT_D +??? 220 ++++ 2 +**** +client 127.0.0.1 PORT_D +??? 220 +**** +client 127.0.0.1 PORT_D +??? 220 +unknown +??? 500 +unknown +??? 500 +unknown +??? 500 +unknown +??? 500 +**** +client 127.0.0.1 PORT_D +??? 220 +vrfy +??? 252 +vrfy +??? 252 +vrfy +??? 252 +vrfy +??? 252 +vrfy +??? 554 +**** +client 127.0.0.1 PORT_D +??? 220 +ehlo abcd +??? 250- +??? 250- +??? 250- +??? 250 +mail from:\r\nrcpt to:\r\ndata +??? 250 +??? 250 +??? 354 +This is a test message. +. +**** +sleep 1 +killdaemon diff --git a/test/stderr/0562 b/test/stderr/0562 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/0562 @@ -0,0 +1,2 @@ + +******** SERVER ******** diff --git a/test/stdout/0562 b/test/stdout/0562 new file mode 100644 index 000000000..a35f8351e --- /dev/null +++ b/test/stdout/0562 @@ -0,0 +1,88 @@ +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo abcd +??? 250- +<<< 250-myhost.test.ex Hello abcd [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-PIPELINING +??? 250 +<<< 250 HELP +>>> mail from:\r\nrcpt to:\r\ndata +??? 250 +<<< 250 OK +??? 250 +<<< 250 Accepted +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> This is a test message. ++++ 2 +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 ++++ 2 +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> unknown +??? 500 +<<< 500 unrecognized command +>>> unknown +??? 500 +<<< 500 unrecognized command +>>> unknown +??? 500 +<<< 500 unrecognized command +>>> unknown +??? 500 +<<< 500 Too many unrecognized commands +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> vrfy +??? 252 +<<< 252 Administrative prohibition +>>> vrfy +??? 252 +<<< 252 Administrative prohibition +>>> vrfy +??? 252 +<<< 252 Administrative prohibition +>>> vrfy +??? 252 +<<< 252 Administrative prohibition +>>> vrfy +??? 554 +<<< 554 Too many nonmail commands +End of script +Connecting to 127.0.0.1 port 1225 ... connected +??? 220 +<<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +>>> ehlo abcd +??? 250- +<<< 250-myhost.test.ex Hello abcd [127.0.0.1] +??? 250- +<<< 250-SIZE 52428800 +??? 250- +<<< 250-PIPELINING +??? 250 +<<< 250 HELP +>>> mail from:\r\nrcpt to:\r\ndata +??? 250 +<<< 250 OK +??? 250 +<<< 250 Accepted +??? 354 +<<< 354 Enter message, ending with "." on a line by itself +>>> This is a test message. +>>> . +End of script -- cgit v1.2.3