From 4f6ae5c314e5c3e462313f3b53c917f36b131bf4 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 16 Jan 2016 22:17:33 +0000 Subject: VRFY: Permit an ACL to override the default 252 response, to support verify-by-ACL instead of the more usual verify-by-routers. Bug 1769 --- test/confs/0041 | 5 +++++ test/scripts/0000-Basic/0041 | 1 + test/stderr/0041 | 15 ++++++++++++++- test/stdout/0041 | 1 + 4 files changed, 21 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/confs/0041 b/test/confs/0041 index 51cba04ac..ec1067584 100644 --- a/test/confs/0041 +++ b/test/confs/0041 @@ -12,6 +12,7 @@ tls_advertise_hosts = domainlist local_domains = test.ex +acl_smtp_vrfy = check_vrfy acl_smtp_expn = check_expn qualify_domain = test.ex no_write_rejectlog @@ -21,6 +22,10 @@ no_write_rejectlog begin acl +check_vrfy: + deny local_parts = hardfail + message = 599 custom reject + check_expn: accept hosts = 2.2.2.2 diff --git a/test/scripts/0000-Basic/0041 b/test/scripts/0000-Basic/0041 index 5601d6506..3495375cb 100644 --- a/test/scripts/0000-Basic/0041 +++ b/test/scripts/0000-Basic/0041 @@ -1,6 +1,7 @@ # VRFY & EXPN blocking exim -bh 1.1.1.1 vrfy userx@test.ex +vrfy hardfail@test.ex expn postmaster quit **** diff --git a/test/stderr/0041 b/test/stderr/0041 index 4aacae883..b00305212 100644 --- a/test/stderr/0041 +++ b/test/stderr/0041 @@ -7,8 +7,21 @@ >>> host in helo_try_verify_hosts? no (option unset) >>> host in helo_accept_junk_hosts? no (option unset) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") ->>> ACL is NULL: implicit DENY +>>> using ACL "check_vrfy" +>>> processing "deny" +>>> check local_parts = hardfail +>>> userx in "hardfail"? no (end of list) +>>> deny: condition test failed in ACL "check_vrfy" +>>> end of ACL "check_vrfy": implicit DENY LOG: H=[1.1.1.1] rejected VRFY userx@test.ex +>>> using ACL "check_vrfy" +>>> processing "deny" +>>> check local_parts = hardfail +>>> hardfail in "hardfail"? yes (matched "hardfail") +>>> message: 599 custom reject +>>> deny: condition test succeeded in ACL "check_vrfy" +>>> end of ACL "check_vrfy": DENY +LOG: H=[1.1.1.1] rejected VRFY hardfail@test.ex: 599 custom reject >>> using ACL "check_expn" >>> processing "accept" >>> check hosts = 2.2.2.2 diff --git a/test/stdout/0041 b/test/stdout/0041 index d43b4501a..b88c93ac7 100644 --- a/test/stdout/0041 +++ b/test/stdout/0041 @@ -5,6 +5,7 @@ 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 252 Administrative prohibition +599 custom reject 550 Administrative prohibition 221 the.local.host.name closing connection -- cgit v1.2.3