X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..f0ce0ecaa054ad9773a2078bc8f011a59518120a:/test/stderr/0002?ds=sidebyside diff --git a/test/stderr/0002 b/test/stderr/0002 index 23719fc5b..087b58f60 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -7,11 +7,14 @@ dropping to exim gid; retaining priv uid ╭considering: primary_hostname: $primary_hostname ├───────text: primary_hostname: ├considering: $primary_hostname + ├──────value: myhost.test.ex ├──expanding: primary_hostname: $primary_hostname ╰─────result: primary_hostname: myhost.test.ex ╭considering: sender_address: $sender_address ├───────text: sender_address: ├considering: $sender_address + ├──────value: sndr@dom + ╰──(tainted) ├──expanding: sender_address: $sender_address ╰─────result: sender_address: sndr@dom ╰──(tainted) @@ -34,7 +37,9 @@ dropping to exim gid; retaining priv uid ├──condition: match{abcd}{\N^([ab]+)(\w+)$\N} ├─────result: true ╭considering: $2$1}fail} + ├──────value: cd ├considering: $1}fail} + ├──────value: ab ├considering: }fail} ├──expanding: $2$1 ╰─────result: cdab @@ -144,6 +149,7 @@ dropping to exim gid; retaining priv uid /considering: primary_hostname: $primary_hostname |-------text: primary_hostname: |considering: $primary_hostname + |------value: myhost.test.ex |--expanding: primary_hostname: $primary_hostname \_____result: primary_hostname: myhost.test.ex /considering: match: ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail} @@ -165,7 +171,9 @@ dropping to exim gid; retaining priv uid |--condition: match{abcd}{\N^([ab]+)(\w+)$\N} |-----result: true /considering: $2$1}fail} + |------value: cd |considering: $1}fail} + |------value: ab |considering: }fail} |--expanding: $2$1 \_____result: cdab @@ -275,52 +283,68 @@ dropping to exim gid; retaining priv uid ╭considering: -oMa sender_host_address = $sender_host_address ├───────text: -oMa sender_host_address = ├considering: $sender_host_address + ├──────value: V4NET.0.0.1 + ╰──(tainted) ├──expanding: -oMa sender_host_address = $sender_host_address ╰─────result: -oMa sender_host_address = V4NET.0.0.1 ╰──(tainted) ╭considering: sender_host_port = $sender_host_port ├───────text: sender_host_port = ├considering: $sender_host_port + ├──────value: 1234 ├──expanding: sender_host_port = $sender_host_port ╰─────result: sender_host_port = 1234 ╭considering: -oMaa sender_host_authenticated = $sender_host_authenticated ├───────text: -oMaa sender_host_authenticated = ├considering: $sender_host_authenticated + ├──────value: AAA + ╰──(tainted) ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated ╰─────result: -oMaa sender_host_authenticated = AAA ╰──(tainted) ╭considering: -oMai authenticated_id = $authenticated_id ├───────text: -oMai authenticated_id = ├considering: $authenticated_id + ├──────value: philip + ╰──(tainted) ├──expanding: -oMai authenticated_id = $authenticated_id ╰─────result: -oMai authenticated_id = philip ╰──(tainted) ╭considering: -oMas authenticated_sender = $authenticated_sender ├───────text: -oMas authenticated_sender = ├considering: $authenticated_sender + ├──────value: xx@yy.zz + ╰──(tainted) ├──expanding: -oMas authenticated_sender = $authenticated_sender ╰─────result: -oMas authenticated_sender = xx@yy.zz ╰──(tainted) ╭considering: -oMi interface_address = $interface_address ├───────text: -oMi interface_address = ├considering: $interface_address + ├──────value: 1.1.1.1 + ╰──(tainted) ├──expanding: -oMi interface_address = $interface_address ╰─────result: -oMi interface_address = 1.1.1.1 ╰──(tainted) ╭considering: interface_port = $interface_port ├───────text: interface_port = ├considering: $interface_port + ├──────value: 99 ├──expanding: interface_port = $interface_port ╰─────result: interface_port = 99 ╭considering: -oMr received_protocol = $received_protocol ├───────text: -oMr received_protocol = ├considering: $received_protocol + ├──────value: special + ╰──(tainted) ├──expanding: -oMr received_protocol = $received_protocol ╰─────result: -oMr received_protocol = special ╰──(tainted) ╭considering: -oMt sender_ident = $sender_ident ├───────text: -oMt sender_ident = ├considering: $sender_ident + ├──────value: me + ╰──(tainted) ├──expanding: -oMt sender_ident = $sender_ident ╰─────result: -oMt sender_ident = me ╰──(tainted) @@ -335,46 +359,60 @@ dropping to exim gid; retaining priv uid ╭considering: -oMa sender_host_address = $sender_host_address ├───────text: -oMa sender_host_address = ├considering: $sender_host_address + ├──────value: V4NET.0.0.1 + ╰──(tainted) ├──expanding: -oMa sender_host_address = $sender_host_address ╰─────result: -oMa sender_host_address = V4NET.0.0.1 ╰──(tainted) ╭considering: sender_host_port = $sender_host_port ├───────text: sender_host_port = ├considering: $sender_host_port + ├──────value: 1234 ├──expanding: sender_host_port = $sender_host_port ╰─────result: sender_host_port = 1234 ╭considering: -oMaa sender_host_authenticated = $sender_host_authenticated ├───────text: -oMaa sender_host_authenticated = ├considering: $sender_host_authenticated + ├──────value: AAA + ╰──(tainted) ├──expanding: -oMaa sender_host_authenticated = $sender_host_authenticated ╰─────result: -oMaa sender_host_authenticated = AAA ╰──(tainted) ╭considering: -oMai authenticated_id = $authenticated_id ├───────text: -oMai authenticated_id = ├considering: $authenticated_id + ├──────value: philip + ╰──(tainted) ├──expanding: -oMai authenticated_id = $authenticated_id ╰─────result: -oMai authenticated_id = philip ╰──(tainted) ╭considering: -oMas authenticated_sender = $authenticated_sender ├───────text: -oMas authenticated_sender = ├considering: $authenticated_sender + ├──────value: xx@yy.zz + ╰──(tainted) ├──expanding: -oMas authenticated_sender = $authenticated_sender ╰─────result: -oMas authenticated_sender = xx@yy.zz ╰──(tainted) ╭considering: -oMi interface_address = $interface_address ├───────text: -oMi interface_address = ├considering: $interface_address + ├──────value: 1.1.1.1 + ╰──(tainted) ├──expanding: -oMi interface_address = $interface_address ╰─────result: -oMi interface_address = 1.1.1.1 ╰──(tainted) ╭considering: interface_port = $interface_port ├───────text: interface_port = ├considering: $interface_port + ├──────value: 99 ├──expanding: interface_port = $interface_port ╰─────result: interface_port = 99 ╭considering: -oMr received_protocol = $received_protocol ├───────text: -oMr received_protocol = ├considering: $received_protocol + ├──────value: special + ╰──(tainted) ├──expanding: -oMr received_protocol = $received_protocol ╰─────result: -oMr received_protocol = special ╰──(tainted) @@ -394,6 +432,7 @@ dropping to exim gid; retaining priv uid ├──condition: eq{black}{white} ├─────result: false ╭───scanning: $sender_host_name}{No}} + ├──────value: ├───scanning: }{No}} ├──expanding: $sender_host_name ├─────result: @@ -416,12 +455,16 @@ checking addresses for ten-1.test.ex V4NET.0.0.1 OK sender_fullhost = ten-1.test.ex [V4NET.0.0.1] sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me) + ├──────value: ten-1.test.ex + ╰──(tainted) ├──expanding: -oMs sender_host_name = $sender_host_name ╰─────result: -oMs sender_host_name = ten-1.test.ex ╰──(tainted) ╭considering: -oMt sender_ident = $sender_ident ├───────text: -oMt sender_ident = ├considering: $sender_ident + ├──────value: me + ╰──(tainted) ├──expanding: -oMt sender_ident = $sender_ident ╰─────result: -oMt sender_ident = me ╰──(tainted) @@ -549,8 +592,6 @@ search_tidyup called >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -562,13 +603,13 @@ search_tidyup called >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmaX-0005vi-00 Subject is: "" +LOG: 10HmaX-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmaX-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -577,13 +618,13 @@ LOG: 10HmaX-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmaY-0005vi-00 Subject is: "" +LOG: 10HmaY-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address= +LOG: 10HmaY-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address= >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -592,13 +633,13 @@ LOG: 10HmaY-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmaZ-0005vi-00 Subject is: "" +LOG: 10HmaZ-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address= +LOG: 10HmaZ-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address= >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -607,13 +648,13 @@ LOG: 10HmaZ-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmbA-0005vi-00 Subject is: "" +LOG: 10HmbA-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> processing "accept" (TESTSUITE/test-config 70) >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT @@ -622,13 +663,13 @@ LOG: 10HmbA-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "" -LOG: 10HmbB-0005vi-00 Subject is: "" +LOG: 10HmbB-000000005vi-0000 Subject is: "" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address= +LOG: 10HmbB-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address= >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -641,8 +682,6 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -655,13 +694,13 @@ LOG: 10HmbB-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?=" -LOG: 10HmbC-0005vi-00 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?=" +LOG: 10HmbC-000000005vi-0000 Subject is: "=?iso-8859-8?Q?_here_we_go=3A_a_string_that_is_going_to_be_encoded=3A_it_will_go_over_the_75-char_limit_by_a_long_way=3B_in_fact_this_one_will_go_over_the_150_character_limit?=" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbC-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -674,8 +713,6 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "accept" (TESTSUITE/test-config 42) >>> accept: condition test succeeded in ACL "connect0" >>> end of ACL "connect0": ACCEPT ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -688,13 +725,13 @@ LOG: 10HmbC-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_add >>> processing "warn" (TESTSUITE/test-config 51) >>> check logwrite = Subject is: "$h_subject:" >>> = Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit" -LOG: 10HmbD-0005vi-00 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit" +LOG: 10HmbD-000000005vi-0000 Subject is: " here we go: a string that is going to be encoded: it will go over the 75-char limit by a long way; in fact this one will go over the 150 character limit" >>> warn: condition test succeeded in ACL "check_data" >>> processing "deny" (TESTSUITE/test-config 52) >>> message: reply_address=<$reply_address> >>> deny: condition test succeeded in ACL "check_data" >>> end of ACL "check_data": DENY -LOG: 10HmbD-0005vi-00 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> +LOG: 10HmbD-000000005vi-0000 H=(test) [V4NET.0.0.0] F=<> rejected after DATA: reply_address=<> Exim version x.yz .... changed uid/gid: -C, -D, -be or -bf forces real uid uid=CALLER_UID gid=CALLER_GID pid=p1240 @@ -705,9 +742,12 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex 1.2.3.4 in "1.2.3"? list element: 1.2.3 - 1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask) + 1.2.3.4 in "1.2.3"? no (malformed IPv4 address or address mask: 1.2.3) 1.2.3.4 in "1.2.3.4/abc"? list element: 1.2.3.4/abc - 1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask) - search_tidyup called + 1.2.3.4 in "1.2.3.4/abc"? no (malformed IPv4 address or address mask: 1.2.3.4) + ::1 in "<; aaaa:bbbb"? + ╎list element: aaaa:bbbb + ╎::1 in "<; aaaa:bbbb"? no (malformed IPv6 address or address mask: aaaa:bbbb) + search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1240 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>