diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/confs/3400 | 6 | ||||
| -rw-r--r-- | test/scripts/3400-plaintext/3400 | 18 | ||||
| -rw-r--r-- | test/stderr/3400 | 35 | ||||
| -rw-r--r-- | test/stdout/3400 | 15 |
4 files changed, 73 insertions, 1 deletions
diff --git a/test/confs/3400 b/test/confs/3400 index b84ee56c4..e56756543 100644 --- a/test/confs/3400 +++ b/test/confs/3400 @@ -17,6 +17,7 @@ hostlist auth_hosts = 10.0.0.1 hostlist relay_hosts = 10.0.0.4 hostlist auth_relay_hosts = 10.0.0.3 : 10.0.0.4 +acl_smtp_connect = check_connect acl_smtp_etrn = check_etrn acl_smtp_expn = check_expn acl_smtp_rcpt = check_recipient @@ -32,6 +33,11 @@ trusted_users = CALLER begin acl +check_connect: + warn hosts = 10.0.0.6 + control = allow_auth_unadvertised + accept + check_recipient: warn hosts = 10.0.0.5 message = authentication-failed: $authentication_failed diff --git a/test/scripts/3400-plaintext/3400 b/test/scripts/3400-plaintext/3400 index b547a21b9..164ace593 100644 --- a/test/scripts/3400-plaintext/3400 +++ b/test/scripts/3400-plaintext/3400 @@ -150,9 +150,11 @@ auth expandfail AHVzZXJ4AHNlY3JldA== quit **** +# 10.0.0.2 is not allowed to use AUTH when it is not advertised +# exim -bs -oMa 10.0.0.2 ehlo test.host -auth expandfail +auth explain AHVzZXJ4AHNlY3JldA== quit **** @@ -215,4 +217,18 @@ ehlo testing.testing auth mylogin dXNlcnggc2VjcmV0 quit **** +# 10.0.0.6 is allowed to use AUTH when it is not advertised +# +exim -bs -oMa 10.0.0.6 +ehlo test.host +auth explain +AHVzZXJ4AHNlY3JldA== +quit +**** +exim -bs -oMa 10.0.0.6 +helo test.host +auth explain +AHVzZXJ4AHNlY3JldA== +quit +**** no_msglog_check diff --git a/test/stderr/3400 b/test/stderr/3400 index fb3b9895b..573d3afee 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -6,6 +6,13 @@ >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> using ACL "check_connect" +>>> processing "warn" +>>> check hosts = 10.0.0.6 +>>> host in "10.0.0.6"? no (end of list) +>>> warn: condition test failed +>>> processing "accept" +>>> accept: condition test succeeded >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" >>> processing "deny" @@ -62,6 +69,13 @@ LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> using ACL "check_connect" +>>> processing "warn" +>>> check hosts = 10.0.0.6 +>>> host in "10.0.0.6"? no (end of list) +>>> warn: condition test failed +>>> processing "accept" +>>> accept: condition test succeeded >>> test.host in helo_lookup_domains? no (end of list) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1"? yes (matched "10.0.0.1") @@ -234,6 +248,13 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> using ACL "check_connect" +>>> processing "warn" +>>> check hosts = 10.0.0.6 +>>> host in "10.0.0.6"? no (end of list) +>>> warn: condition test failed +>>> processing "accept" +>>> accept: condition test succeeded >>> test.host in helo_lookup_domains? no (end of list) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1"? no (end of list) @@ -318,6 +339,13 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu >>> host in helo_verify_hosts? no (option unset) >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) +>>> using ACL "check_connect" +>>> processing "warn" +>>> check hosts = 10.0.0.6 +>>> host in "10.0.0.6"? no (end of list) +>>> warn: condition test failed +>>> processing "accept" +>>> accept: condition test succeeded >>> test.host in helo_lookup_domains? no (end of list) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1"? no (end of list) @@ -348,6 +376,13 @@ host in recipient_unqualified_hosts? no (option unset) host in helo_verify_hosts? no (option unset) host in helo_try_verify_hosts? no (option unset) host in helo_accept_junk_hosts? no (option unset) +using ACL "check_connect" +processing "warn" +check hosts = 10.0.0.6 +host in "10.0.0.6"? no (end of list) +warn: condition test failed +processing "accept" +accept: condition test succeeded SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
smtp_setup_msg entered SMTP<< ehlo testing.testing diff --git a/test/stdout/3400 b/test/stdout/3400 index 7d8e3689a..002166e90 100644 --- a/test/stdout/3400 +++ b/test/stdout/3400 @@ -326,3 +326,18 @@ 250 HELP
235 Authentication succeeded
221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250-myhost.test.ex Hello CALLER at test.host [10.0.0.6]
+250-SIZE 52428800
+250-ETRN
+250-EXPN
+250-PIPELINING
+250 HELP
+334
+235 Authentication succeeded
+221 myhost.test.ex closing connection
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+250 myhost.test.ex Hello CALLER at test.host [10.0.0.6]
+334
+235 Authentication succeeded
+221 myhost.test.ex closing connection
|