Make server prompts available in $auth<n> when plaintext is running as a

client.

7 files changed, 116 insertions, 0 deletions

diff --git a/test/confs/3401 b/test/confs/3401
index d2cf9c972..6406e3178 100644
--- a/test/confs/3401
+++ b/test/confs/3401
@@ -28,6 +28,11 @@ plain:
   public_name = PLAIN
   client_send = ^userx^secret
 
+xlogin:
+  driver = plaintext
+  public_name = XLOGIN
+  client_send = : $auth1 : $auth1+$auth2
+
 
 # ----- Routers -----
 
diff --git a/test/confs/3404 b/test/confs/3404
index afff4bf73..dc556e961 100644
--- a/test/confs/3404
+++ b/test/confs/3404
@@ -27,6 +27,7 @@ login:
   driver = plaintext
   public_name = LOGIN
   client_send = :userx:secret
+  client_ignore_invalid_base64
 
 
 # ----- Routers -----
diff --git a/test/log/3401 b/test/log/3401
index dad29127a..30e4b45bc 100644
--- a/test/log/3401
+++ b/test/log/3401
@@ -29,3 +29,13 @@
 1999-03-02 09:44:33 10HmbF-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbF-0005vi-00 => forcesender@domain.com R=try T=smtp_try H=127.0.0.1 [127.0.0.1]
 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbG-0005vi-00 login authenticator cancelled authentication H=127.0.0.1 [127.0.0.1] Invalid base64 string in server response "334 User?"
+1999-03-02 09:44:33 10HmbG-0005vi-00 ** userx@domain.com R=try T=smtp_try: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 Not now
+1999-03-02 09:44:33 10HmbH-0005vi-00 <= <> R=10HmbG-0005vi-00 U=EXIMUSER P=local S=sss
+1999-03-02 09:44:33 10HmbH-0005vi-00 ** CALLER@myhost.test.ex: Unrouteable address
+1999-03-02 09:44:33 10HmbH-0005vi-00 Frozen (delivery error message)
+1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
+1999-03-02 09:44:33 10HmbI-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmbI-0005vi-00 => userx@domain.com R=try T=smtp_try H=127.0.0.1 [127.0.0.1]
+1999-03-02 09:44:33 10HmbI-0005vi-00 Completed
diff --git a/test/scripts/3400-plaintext/3401 b/test/scripts/3400-plaintext/3401
index b3e7c6a0a..590ae4333 100644
--- a/test/scripts/3400-plaintext/3401
+++ b/test/scripts/3400-plaintext/3401
@@ -138,4 +138,50 @@ QUIT
 exim -odi forcesender@domain.com
 .
 ****
+# Bad basd64 from server; client aborts
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250-HELP
+250 AUTH LOGIN
+AUTH LOGIN
+334 User?
+*
+501 Authentication cancelled
+MAIL FROM:
+550 Not now
+QUIT
+250 OK
+****
+exim -odi userx@domain.com
+.
+****
+# Test the server challenges in $auth<n>
+server PORT_S
+220 ESMTP
+EHLO
+250-OK
+250-HELP
+250 AUTH XLOGIN
+AUTH XLOGIN
+334 Y2hhbGxlbmdlLTE=
+Y2hhbGxlbmdlLTE=
+334 YW5vdGhlcm9uZQ==
+Y2hhbGxlbmdlLTErYW5vdGhlcm9uZQ==
+235 Authentication successful
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+DATA
+354 Send data
+.
+250 OK
+QUIT
+250 OK
+****
+exim -odi userx@domain.com
+.
+****
 no_msglog_check
diff --git a/test/scripts/3400-plaintext/3404 b/test/scripts/3400-plaintext/3404
index 98f737eac..6f67b8512 100644
--- a/test/scripts/3400-plaintext/3404
+++ b/test/scripts/3400-plaintext/3404
@@ -45,6 +45,8 @@ QUIT
 exim -v -oMas xxx@yyy -oMai zzz -odi userx@domain.com
 .
 ****
+# The server prompts sent here are not b64 encoded; hence they test
+# client_ignore_invalid_base64.
 server PORT_S
 220 ESMTP
 EHLO
diff --git a/test/stdout/3401 b/test/stdout/3401
index fdaf26cd6..fda6814c5 100644
--- a/test/stdout/3401
+++ b/test/stdout/3401
@@ -150,3 +150,51 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 QUIT
 250 OK
 End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH LOGIN
+AUTH LOGIN
+334 User?
+*
+501 Authentication cancelled
+MAIL FROM:<CALLER@myhost.test.ex>
+550 Not now
+QUIT
+250 OK
+End of script
+Listening on port 1224 ... 
+Connection request from [127.0.0.1]
+220 ESMTP
+EHLO myhost.test.ex
+250-OK
+250-HELP
+250 AUTH XLOGIN
+AUTH XLOGIN
+334 Y2hhbGxlbmdlLTE=
+Y2hhbGxlbmdlLTE=
+334 YW5vdGhlcm9uZQ==
+Y2hhbGxlbmdlLTErYW5vdGhlcm9uZQ==
+235 Authentication successful
+MAIL FROM:<CALLER@myhost.test.ex> AUTH=CALLER@myhost.test.ex
+250 Sender OK
+RCPT TO:<userx@domain.com>
+250 Recipient OK
+DATA
+354 Send data
+Received: from CALLER by myhost.test.ex with local (Exim x.yz)
+	(envelope-from <CALLER@myhost.test.ex>)
+	id 10HmbI-0005vi-00
+	for userx@domain.com; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+From: CALLER_NAME <CALLER@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+
+.
+250 OK
+QUIT
+250 OK
+End of script
diff --git a/test/stdout/3407 b/test/stdout/3407
index 3888ec9ed..d08999e28 100644
--- a/test/stdout/3407
+++ b/test/stdout/3407
@@ -6,6 +6,7 @@ server_advertise_condition =
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
+no_client_ignore_invalid_base64
 client_send = 
 server_condition = xxx
 server_prompts = 
@@ -17,6 +18,7 @@ server_advertise_condition =
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
+no_client_ignore_invalid_base64
 client_send = 
 server_condition = 
 server_prompts = 
@@ -28,6 +30,7 @@ server_advertise_condition =
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
+no_client_ignore_invalid_base64
 client_send = 
 server_condition = 
 server_prompts = 
@@ -39,6 +42,7 @@ server_advertise_condition =
 server_debug_print = 
 server_mail_auth_condition = 
 server_set_id = 
+no_client_ignore_invalid_base64
 client_send = 
 server_condition = 
 server_prompts =