Improve queryprogram behaviour when not running as root.

6 files changed, 86 insertions, 19 deletions

diff --git a/test/confs/5204 b/test/confs/5204
index a134270a6..5846f5b11 100644
--- a/test/confs/5204
+++ b/test/confs/5204
@@ -1,5 +1,7 @@
 # Exim test configuration 5204
 
+COMMAND_USER=EXIMUSER
+
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
@@ -11,6 +13,7 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
+acl_smtp_rcpt = accept verify = recipient
 domainlist local_domains = test.ex
 
 # ----- Routers -----
@@ -27,7 +30,7 @@ q:
   caseful_local_part
   command = /bin/echo \
     "${if match{$local_part}{^\"([^\"]*)\"(.*)\\$}{$1$2}{$local_part}}"
-  command_user = EXIMUSER
+  command_user = COMMAND_USER
   domains = ! +local_domains
   no_more
   transport = smtp
diff --git a/test/log/0433 b/test/log/0433
index fbe0f37e6..9a80732d5 100644
--- a/test/log/0433
+++ b/test/log/0433
@@ -1,6 +1,6 @@
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 (IPv4)
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1225 (IPv4) port 1226 (IPv4)
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 (IPv4) [127.0.0.1]:1228
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228
 1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on [127.0.0.1]:1228 port 1227 (IPv4)
-1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 (IPv4)
+1999-03-02 09:44:33 exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226
diff --git a/test/scripts/5200-queryprogram/5204 b/test/scripts/5200-queryprogram/5204
index 593ce82eb..2509091f9 100644
--- a/test/scripts/5200-queryprogram/5204
+++ b/test/scripts/5200-queryprogram/5204
@@ -1,4 +1,4 @@
-# queryprogram
+# queryprogram general tests
 1
 exim -bt '"ACCEPT hosts=localhost lookup=byname"@some.host'
 ****
@@ -26,3 +26,9 @@ exim -d-all+route -bt '"REDIRECT postmaster@test.ex"@some.host'
 exim -odi '"FAIL cannot route this one (FAIL)"@some.host'
 Test message
 ****
+exim -DCOMMAND_USER=CALLER -d-all+route -bh V4NET.2.3.4
+ehlo some.name
+mail from:<x@y>
+rcpt to:<"FAIL cannot route this one (FAIL)"@some.host>
+quit
+****
diff --git a/test/stderr/0433 b/test/stderr/0433
index 12d4d80f1..bb822dd35 100644
--- a/test/stderr/0433
+++ b/test/stderr/0433
@@ -27,8 +27,8 @@ pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 LOG: MAIN
-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 (IPv4)
-set_process_info: pppp daemon: no queue runs, listening for SMTP on port 1225 port 1226 (IPv4)
+  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226
+set_process_info: pppp daemon: no queue runs, listening for SMTP on port 1225 port 1226
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Exim version x.yz ....
@@ -61,8 +61,8 @@ pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 LOG: MAIN
-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 (IPv4) [127.0.0.1]:1228
-set_process_info: pppp daemon: no queue runs, listening for SMTP on port 1225 port 1226 (IPv4) [127.0.0.1]:1228
+  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228
+set_process_info: pppp daemon: no queue runs, listening for SMTP on port 1225 port 1226 [127.0.0.1]:1228
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
 Exim version x.yz ....
@@ -97,7 +97,7 @@ pid written to TESTSUITE/spool/exim-daemon.pid
 changed uid/gid: running as a daemon
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 LOG: MAIN
-  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226 (IPv4)
-set_process_info: pppp daemon: no queue runs, listening for SMTP on port 1225 port 1226 (IPv4)
+  exim x.yz daemon started: pid=pppp, no queue runs, listening for SMTP on port 1225 port 1226
+set_process_info: pppp daemon: no queue runs, listening for SMTP on port 1225 port 1226
 daemon running with uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 Listening...
diff --git a/test/stderr/5204 b/test/stderr/5204
index f8ef7c9df..c8aa99a4d 100644
--- a/test/stderr/5204
+++ b/test/stderr/5204
@@ -14,7 +14,7 @@ local_part=DECLINE cannot route this one (DECLINE) domain=some.host
 checking domains
 calling q router
 q router called for "DECLINE cannot route this one (DECLINE)"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: DECLINE cannot route this one (DECLINE)
 q router declined for "DECLINE cannot route this one (DECLINE)"@some.host
 "more" is false: skipping remaining routers
@@ -34,7 +34,7 @@ local_part=FAIL cannot route this one (FAIL) domain=some.host
 checking domains
 calling q router
 q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: FAIL cannot route this one (FAIL)
 q router forced address failure
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
@@ -52,7 +52,7 @@ local_part=ERROR cannot route this one (ERROR) domain=some.host
 checking domains
 calling q router
 q router called for "ERROR cannot route this one (ERROR)"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: ERROR cannot route this one (ERROR)
 LOG: PANIC
   q router: bad command yield: ERROR cannot route this one (ERROR)
@@ -73,7 +73,7 @@ local_part=DEFER cannot route this one (DEFER) domain=some.host
 checking domains
 calling q router
 q router called for "DEFER cannot route this one (DEFER)"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: DEFER cannot route this one (DEFER)
 q router: defer for "DEFER cannot route this one (DEFER)"@some.host
   message: cannot route this one (DEFER)
@@ -92,7 +92,7 @@ local_part=ACCEPT transport = other_smtp hosts=ten-1.test.ex domain=some.host
 checking domains
 calling q router
 q router called for "ACCEPT transport = other_smtp hosts=ten-1.test.ex"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: ACCEPT transport = other_smtp hosts=ten-1.test.ex
 finding IP address for ten-1.test.ex
 doing DNS lookup
@@ -119,7 +119,7 @@ local_part=PASS domain=some.host
 checking domains
 calling q router
 q router called for PASS@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: PASS
 q router passed for PASS@some.host
 --------> s router <--------
@@ -158,7 +158,7 @@ local_part=FREEZE cannot route this one (FREEZE) domain=some.host
 checking domains
 calling q router
 q router called for "FREEZE cannot route this one (FREEZE)"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: FREEZE cannot route this one (FREEZE)
 q router: defer for "FREEZE cannot route this one (FREEZE)"@some.host
   message: cannot route this one (FREEZE)
@@ -177,7 +177,7 @@ local_part=REDIRECT postmaster@test.ex domain=some.host
 checking domains
 calling q router
 q router called for "REDIRECT postmaster@test.ex"@some.host: domain = some.host
-uid=EXIM_UID gid=EXIM_GID current_directory=/
+requires uid=EXIM_UID gid=EXIM_GID current_directory=/
 command wrote: REDIRECT postmaster@test.ex
 rda_interpret (string): postmaster@test.ex
 expanded: postmaster@test.ex
@@ -217,3 +217,48 @@ routed by pm router
   envelope to: postmaster@test.ex
   transport: null
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+Exim version x.yz ....
+configuration file is TESTSUITE/test-config
+admin user
+host in hosts_connection_nolog? no (option unset)
+LOG: smtp_connection MAIN
+  SMTP connection from [V4NET.2.3.4]
+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)
+some.name in helo_lookup_domains? no (end of list)
+host in pipelining_advertise_hosts? yes (matched "*")
+processing "accept"
+check verify = recipient
+>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
+routing "FAIL cannot route this one (FAIL)"@some.host
+--------> b router <--------
+local_part=fail cannot route this one (fail) domain=some.host
+checking senders
+y in ""? no (end of list)
+x@y in ":"? no (end of list)
+b router skipped: senders mismatch
+--------> q router <--------
+local_part=FAIL cannot route this one (FAIL) domain=some.host
+checking domains
+some.host in "test.ex"? no (end of list)
+some.host in "! +local_domains"? yes (end of list)
+calling q router
+q router called for "FAIL cannot route this one (FAIL)"@some.host: domain = some.host
+requires uid=CALLER_UID gid=CALLER_GID current_directory=/
+not running as root: cannot change uid/gid
+subprocess will run with uid=EXIM_UID gid=EXIM_GID
+command wrote: FAIL cannot route this one (FAIL)
+q router forced address failure
+----------- end verify ------------
+accept: condition test failed
+end of inline ACL: implicit DENY
+LOG: MAIN REJECT
+  H=(some.name) [V4NET.2.3.4] F=<x@y> rejected RCPT <"FAIL cannot route this one (FAIL)"@some.host>: cannot route this one (FAIL)
+LOG: smtp_connection MAIN
+  SMTP connection from (some.name) [V4NET.2.3.4] closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stdout/5204 b/test/stdout/5204
index df0810ede..52f9242b9 100644
--- a/test/stdout/5204
+++ b/test/stdout/5204
@@ -19,3 +19,16 @@ PASS@some.host
 postmaster@test.ex
     <-- "REDIRECT postmaster@test.ex"@some.host
   router = pm, transport = null
+
+**** SMTP testing session as if from host V4NET.2.3.4
+**** 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 some.name [V4NET.2.3.4]

+250-SIZE 52428800

+250-PIPELINING

+250 HELP

+250 OK

+550 cannot route this one (FAIL)

+221 myhost.test.ex closing connection