Fix continued-transport with LIMITS

[exim.git] / test / confs / 2610

diff --git a/test/confs/2610 b/test/confs/2610
index 9b139d2b6aea75a0337352243f62a1e48d496020..94be1b91fab418347499c2efcd556226db206b6c 100644 (file)
--- a/test/confs/2610
+++ b/test/confs/2610
@@ -14,7 +14,7 @@ acl_not_smtp = check_notsmtp
 
 PARTIAL = 127.0.0.1::PORT_N
 SSPEC = PARTIAL/test/root/pass
 
 PARTIAL = 127.0.0.1::PORT_N
 SSPEC = PARTIAL/test/root/pass

-mysql_servers = SSPEC
+hide mysql_servers = SSPEC

 
 
 # ----- ACL -----
 
 
 # ----- ACL -----


@@ -25,27 +25,29 @@ check_recipient:
          # Tainted-data checks
   warn
          # taint only in lookup string, properly quoted
          # Tainted-data checks
   warn
          # taint only in lookup string, properly quoted

-         set acl_m0 =  ok:   ${lookup mysql                    {select name from them where id = '${quote_mysql:$local_part}'}}
+         set acl_m0 =  ok:    ${lookup mysql                    {select name from them where id = '${quote_mysql:$local_part}'}}

          # taint only in lookup string, but not quoted
          # taint only in lookup string, but not quoted

-         set acl_m0 =  FAIL: ${lookup mysql,no_rd              {select name from them where id = '$local_part'}}
+         set acl_m0 =  FAIL1: ${lookup mysql,no_rd              {select name from them where id = '$local_part'}}

   warn
          # option on lookup type unaffected
   warn
          # option on lookup type unaffected

-         set acl_m0 =  ok:   ${lookup mysql,servers=SSPEC      {select name from them where id = '${quote_mysql:$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
          # partial server-spec, indexing main-option, works

-         set acl_m0 =  ok:   ${lookup mysql,servers=PARTIAL    {select name from them where id = '${quote_mysql:$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
          # oldstyle server spec, prepended to lookup string, fails with taint

-         set acl_m0 =  FAIL: ${lookup mysql     {servers=SSPEC; select name from them where id = '${quote_mysql:$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-style lookup, tainted lookup string is ok if server spec comes from main-option
 
          # In list-style lookup, tainted lookup string is ok if server spec comes from main-option

-  warn   set acl_m0 =  ok:   hostlist
+  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
          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
+  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.
          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
+  warn   set acl_m0 =  FAIL5: hostlist

          hosts =       <& net-mysql,servers=SSPEC; select * from them where id='${quote_mysql:$local_part}'
 
   accept  domains = +local_domains
          hosts =       <& net-mysql,servers=SSPEC; select * from them where id='${quote_mysql:$local_part}'
 
   accept  domains = +local_domains


@@ -65,10 +67,11 @@ begin routers
 
 r1:
   driver = accept
 
 r1:
   driver = accept

+  # 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
   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'}}
+  address_data = ${lookup mysql{select name from them where id='$local_part' limit 1}}

   transport = t1
 
 
   transport = t1