Add server_condition to all authenticators, to allow for additional

conditions (and thereby implement authorization).

5 files changed, 81 insertions, 7 deletions

diff --git a/test/confs/3500 b/test/confs/3500
index b83b1c33f..343a0b3e1 100644
--- a/test/confs/3500
+++ b/test/confs/3500
@@ -13,7 +13,7 @@ gecos_name = CALLER_NAME
 
 domainlist local_domains = test.ex : *.test.ex
 
-hostlist auth_hosts = 10.0.0.1
+hostlist auth_hosts = 10.0.0.1 : 10.0.0.5
 hostlist relay_hosts = 10.0.0.4
 hostlist auth_relay_hosts = 10.0.0.3 : 10.0.0.4
 
@@ -80,6 +80,7 @@ cram_md5:
   server_secret = "${if eq{$auth1}{tim}{tanstaaftanstaaf}\
     {${if eq{$auth1}{userx}{secret}fail}}}"
   server_set_id = $auth1
+  server_condition = ${if !eq {$sender_host_address}{10.0.0.5}}
 
 
 
diff --git a/test/scripts/3500-CRAM-MD5/3500 b/test/scripts/3500-CRAM-MD5/3500
index b3d2c05aa..637852f64 100644
--- a/test/scripts/3500-CRAM-MD5/3500
+++ b/test/scripts/3500-CRAM-MD5/3500
@@ -32,4 +32,15 @@ Testing authenticated CRAM-MD5.
 .
 quit
 ****
+exim -bh 10.0.0.5
+ehlo test.host
+AUTH CRAM-MD5
+dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw
+mail from:<userx@some.domain>
+rcpt to:<userx@test.ex>
+data
+Testing authenticated CRAM-MD5.
+.
+quit
+****
 no_msglog_check
diff --git a/test/stderr/3500 b/test/stderr/3500
index b0432c58c..87179790d 100644
--- a/test/stderr/3500
+++ b/test/stderr/3500
@@ -8,7 +8,7 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> 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)
+>>> host in "10.0.0.1 : 10.0.0.5"? no (end of list)
 >>> host in "10.0.0.4"? yes (matched "10.0.0.4")
 >>> host in auth_advertise_hosts? no (matched "!+relay_hosts")
 >>> host in hosts_connection_nolog? no (option unset)
@@ -21,13 +21,18 @@
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> 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")
+>>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1")
 >>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
 >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
 >>> CRAM-MD5: user name = tim
 >>>           challenge = <1896.697170952@postoffice.reston.mci.net>
 >>>           received  = b913a602c7eda7a495b4e6e7334d3890
 >>>           digest    = b913a602c7eda7a495b4e6e7334d3890
+>>> cram_md5 authenticator:
+>>>   $auth1 = tim
+>>>   $1 = tim
+>>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
+>>> expanded string: true
 >>> using ACL "check_recipient"
 >>> processing "warn"
 >>> check hosts = 10.0.0.5
@@ -54,3 +59,37 @@
 >>> accept: condition test succeeded
 >>> host in ignore_fromline_hosts? no (option unset)
 LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=cram_md5:tim S=sss
+>>> host in hosts_connection_nolog? no (option unset)
+>>> host in host_lookup? no (option unset)
+>>> host in host_reject_connection? no (option unset)
+>>> host in sender_unqualified_hosts? no (option unset)
+>>> 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)
+>>> test.host in helo_lookup_domains? no (end of list)
+>>> host in pipelining_advertise_hosts? yes (matched "*")
+>>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5")
+>>> host in auth_advertise_hosts? yes (matched "+auth_hosts")
+>>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
+>>> CRAM-MD5: user name = tim
+>>>           challenge = <1896.697170952@postoffice.reston.mci.net>
+>>>           received  = b913a602c7eda7a495b4e6e7334d3890
+>>>           digest    = b913a602c7eda7a495b4e6e7334d3890
+>>> cram_md5 authenticator:
+>>>   $auth1 = tim
+>>>   $1 = tim
+>>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3=""
+>>> expanded string: 
+LOG: cram_md5 authenticator failed for (test.host) [10.0.0.5]: 535 Incorrect authentication data (set_id=tim)
+>>> using ACL "check_recipient"
+>>> processing "warn"
+>>> check hosts = 10.0.0.5
+>>> host in "10.0.0.5"? yes (matched "10.0.0.5")
+>>> warn: condition test succeeded
+>>> processing "accept"
+>>> check hosts = 10.0.0.5
+>>> host in "10.0.0.5"? yes (matched "10.0.0.5")
+>>> accept: condition test succeeded
+>>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaZ-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.5] P=esmtp S=sss
diff --git a/test/stdout/3407 b/test/stdout/3407
index d08999e28..274c68c1a 100644
--- a/test/stdout/3407
+++ b/test/stdout/3407
@@ -3,46 +3,46 @@ a1 authenticator:
 driver = plaintext
 public_name = PLAIN
 server_advertise_condition = 
+server_condition = xxx
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
 no_client_ignore_invalid_base64
 client_send = 
-server_condition = xxx
 server_prompts = 
 
 a2 authenticator:
 driver = plaintext
 public_name = PLAIN
 server_advertise_condition = 
+server_condition = 
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
 no_client_ignore_invalid_base64
 client_send = 
-server_condition = 
 server_prompts = 
 
 a3 authenticator:
 driver = plaintext
 public_name = LOGIN
 server_advertise_condition = 
+server_condition = 
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
 no_client_ignore_invalid_base64
 client_send = 
-server_condition = 
 server_prompts = 
 
 a4 authenticator:
 driver = plaintext
 public_name = LOGIN
 server_advertise_condition = 
+server_condition = 
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
 no_client_ignore_invalid_base64
 client_send = 
-server_condition = 
 server_prompts = 
diff --git a/test/stdout/3500 b/test/stdout/3500
index deaae921b..87377d644 100644
--- a/test/stdout/3500
+++ b/test/stdout/3500
@@ -60,3 +60,26 @@
 **** SMTP testing: that is not a real message id!
 
 221 myhost.test.ex closing connection

+
+**** SMTP testing session as if from host 10.0.0.5
+**** but without any ident (RFC 1413) callback.
+**** This is not for real!
+
+220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000

+250-myhost.test.ex Hello test.host [10.0.0.5]

+250-SIZE 52428800

+250-ETRN

+250-EXPN

+250-PIPELINING

+250-AUTH CRAM-MD5

+250 HELP

+334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+

+535 Incorrect authentication data

+250 OK

+250 Accepted

+354 Enter message, ending with "." on a line by itself

+250 OK id=10HmaZ-0005vi-00

+
+**** SMTP testing: that is not a real message id!
+
+221 myhost.test.ex closing connection