X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0b4dfe7aa1f12214abdfa1037497d6c49a471612..600dc06981df5a906125f8442c36056a117412d4:/test/confs/2610?ds=inline

diff --git a/test/confs/2610 b/test/confs/2610
index 5a964276e..94be1b91f 100644
--- a/test/confs/2610
+++ b/test/confs/2610
@@ -10,10 +10,11 @@ domainlist local_domains = @
 hostlist   relay_hosts = net-mysql;select * from them where id='$sender_host_address'
 
 acl_smtp_rcpt = check_recipient
+acl_not_smtp = check_notsmtp
 
 PARTIAL = 127.0.0.1::PORT_N
-SSPEC = PARTIAL/test/root/
-mysql_servers = SSPEC
+SSPEC = PARTIAL/test/root/pass
+hide mysql_servers = SSPEC
 
 
 # ----- ACL -----
@@ -23,31 +24,42 @@ begin acl
 check_recipient:
 	  # Tainted-data checks
   warn
-	  # taint only in lookup string
-	  set acl_m0 =	ok:   ${lookup mysql                    {select name from them where id = '$local_part'}}
+	  # taint only in lookup string, properly quoted
+	  set acl_m0 =	ok:    ${lookup mysql                    {select name from them where id = '${quote_mysql:$local_part}'}}
+	  # taint only in lookup string, but not quoted
+	  set acl_m0 =	FAIL1: ${lookup mysql,no_rd              {select name from them where id = '$local_part'}}
+  warn
 	  # option on lookup type unaffected
-	  set acl_m0 =	ok:   ${lookup mysql,servers=SSPEC      {select name from them where id = '$local_part'}}
+	  set acl_m0 =	ok:    ${lookup mysql,servers=SSPEC      {select name from them where id = '${quote_mysql:$local_part}'}}
 	  # partial server-spec, indexing main-option, works
-	  set acl_m0 =	ok:   ${lookup mysql,servers=PARTIAL    {select name from them where id = '$local_part'}}
+	  set acl_m0 =	ok:    ${lookup mysql,servers=PARTIAL    {select name from them where id = '${quote_mysql:$local_part}'}}
 	  # oldstyle server spec, prepended to lookup string, fails with taint
-	  set acl_m0 =	FAIL: ${lookup mysql     {servers=SSPEC; select name from them where id = '$local_part'}}
+	  set acl_m0 =	FAIL2: ${lookup mysql     {servers=SSPEC; select name from them where id = '${quote_mysql:$local_part}'}}
+	  # oldstyle partial server spec, prepended to lookup string, indexing main-option, but not quoted
+  warn	  set acl_m0 =	FAIL3: ${lookup mysql     {servers=PARTIAL; select name from them where id = '$local_part'}}
 
-	  # In list-stle lookup, tainted lookup string is ok if server spec comes from main-option
-  warn	  set acl_m0 =	ok:   hostlist
-	  hosts =	net-mysql;select * from them where id='$local_part'
+	  # In list-style lookup, tainted lookup string is ok if server spec comes from main-option
+  warn	  set acl_m0 =	ok:    hostlist
+	  hosts =	net-mysql;select * from them where id='${quote_mysql:$local_part}'
 	  # ... but setting a per-query servers spec fails due to the taint
-  warn	  set acl_m0 =	FAIL: hostlist
-	  hosts =	<& net-mysql;servers=SSPEC; select * from them where id='$local_part'
+  warn	  set acl_m0 =	FAIL4: hostlist
+	  hosts =	<& net-mysql;servers=SSPEC; select * from them where id='${quote_mysql:$local_part}'
 
 	  # The newer server-list-as-option-to-lookup-type is not a solution to tainted data in the lookup, because
 	  # string-expansion is done before list-expansion so the taint contaminates the entire list.
-  warn	  set acl_m0 =	FAIL: hostlist
-	  hosts =	<& net-mysql,servers=SSPEC; select * from them where id='$local_part'
+  warn	  set acl_m0 =	FAIL5: hostlist
+	  hosts =	<& net-mysql,servers=SSPEC; select * from them where id='${quote_mysql:$local_part}'
 
   accept  domains = +local_domains
+	  # the quoted status of this var should survive being passed via spoolfile
+	  set acl_m_qtest = ${quote_mysql:$local_part}
   accept  hosts = +relay_hosts
   deny    message = relay not permitted
 
+check_notsmtp:
+  accept
+	  # the quoted status of this var should survive being passed via spoolfile
+	  set acl_m_qtest = ${quote_mysql:$recipients}
 
 # ----- Routers -----
 
@@ -55,7 +67,11 @@ begin routers
 
 r1:
   driver = accept
-  address_data = ${lookup mysql{select name from them where id='ph10'}}
+  # this tests that quoting survived being passed via spoolfile
+  debug_print =	acl_m_qtest: <$acl_m_qtest> lkup: <${lookup mysql{select name from them where id='$acl_m_qtest'}}>
+
+  # this tests the unquoted case, but will need enhancement when we enforce (vs. just logging), else no transport call
+  address_data = ${lookup mysql{select name from them where id='$local_part' limit 1}}
   transport = t1
 
 
@@ -66,7 +82,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/\
-    ${lookup mysql{select id from them where id='ph10'}{$value}fail}
+    ${lookup mysql{select id from them where id='$local_part'}{$value}fail}
   user = CALLER