From 6dbf85ed0c969432afa9e821a81122193544bfdc Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 9 Jan 2022 20:53:57 +0000 Subject: Testsuite: fix pgsql testcase --- test/confs/2620 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'test/confs') diff --git a/test/confs/2620 b/test/confs/2620 index e63fca286..85d25035f 100644 --- a/test/confs/2620 +++ b/test/confs/2620 @@ -28,23 +28,23 @@ check_recipient: # taint only in lookup string set acl_m0 = ok: ${lookup pgsql {select name from them where id = '$local_part'}} # option on lookup type unaffected - set acl_m0 = ok: ${lookup pgsql,servers=SSPEC {select name from them where id = '$local_part'}} + set acl_m0 = ok: ${lookup pgsql,servers=SERVERS {select name from them where id = '$local_part'}} # partial server-spec, indexing main-option, works set acl_m0 = ok: ${lookup pgsql,servers=PARTIAL {select name from them where id = '$local_part'}} # oldstyle server spec, prepended to lookup string, fails with taint - set acl_m0 = FAIL: ${lookup pgsql {servers=SSPEC; select name from them where id = '$local_part'}} + set acl_m0 = FAIL: ${lookup pgsql {servers=SERVERS; 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-pgsql;select * from them where id='$local_part' # ... but setting a per-query servers spec fails due to the taint warn set acl_m0 = FAIL: hostlist - hosts = <& net-pgsql;servers=SSPEC; select * from them where id='$local_part' + hosts = <& net-pgsql;servers=SERVERS; select * from them where id='$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-pgsql,servers=SSPEC; select * from them where id='$local_part' + hosts = <& net-pgsql,servers=SERVERS; select * from them where id='$local_part' accept domains = +local_domains accept hosts = +relay_hosts -- cgit v1.2.3