X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e8a0da772adc2892e661dec2bad4f36196c9128f..dafd09ae6c826dffaa63a54e903659a12ca5be05:/test/stderr/5410 diff --git a/test/stderr/5410 b/test/stderr/5410 index 7002a7efb..4ee810ac3 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -43,16 +44,17 @@ try option acl_smtp_expn try option acl_smtp_mail try option acl_smtp_rcpt ╭considering: ${if░eq░{SERVER}{server}{queue}{cutthrough}} - ╭considering: SERVER}{server}{queue}{cutthrough}} - ├───────text: SERVER - ├considering: }{server}{queue}{cutthrough}} - ├───expanded: SERVER - ╰─────result: SERVER - ╭considering: server}{queue}{cutthrough}} - ├───────text: server - ├considering: }{queue}{cutthrough}} - ├───expanded: server - ╰─────result: server + cond: eq + ╭considering: SERVER}{server}{queue}{cutthrough}} + ├───────text: SERVER + ├considering: }{server}{queue}{cutthrough}} + ├───expanded: SERVER + ╰─────result: SERVER + ╭considering: server}{queue}{cutthrough}} + ├───────text: server + ├considering: }{queue}{cutthrough}} + ├───expanded: server + ╰─────result: server ├──condition: eq░{SERVER}{server} ├─────result: false ╭───scanning: queue}{cutthrough}} @@ -72,15 +74,15 @@ using ACL "cutthrough" processing "accept" (TESTSUITE/test-config 22) check control = cutthrough_delivery check verify = recipient -domain.com in "! +local_domains"? - list element: ! +local_domains +domain.com in domains? + list element: !░+local_domains start sublist local_domains domain.com in "test.ex : *.test.ex"? ╎list element: test.ex ╎list element: *.test.ex domain.com in "test.ex : *.test.ex"? no (end of list) end sublist local_domains -domain.com in "! +local_domains"? yes (end of list) +domain.com in domains? yes (end of list) try option router_home_directory try option set processing address_data @@ -95,20 +97,19 @@ domain.com in "*"? domain.com in "*"? yes (matched "*") try option transport try option unseen -try option unseen ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ -domain.com in "! +local_domains"? - list element: ! +local_domains +domain.com in domains? + list element: !░+local_domains start sublist local_domains domain.com in "test.ex : *.test.ex"? ╎list element: test.ex ╎list element: *.test.ex domain.com in "test.ex : *.test.ex"? no (end of list) end sublist local_domains -domain.com in "! +local_domains"? yes (end of list) +domain.com in domains? yes (end of list) try option router_home_directory try option set processing address_data @@ -123,12 +124,12 @@ domain.com in "*"? domain.com in "*"? yes (matched "*") try option transport try option unseen -try option unseen try option interface -Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp -127.0.0.1 in hosts_try_fastopen? - list element: - connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... +try option dscp + 127.0.0.1 in hosts_try_fastopen? + list element: +connected try option helo_data ╭considering: $primary_hostname ├──────value: myhost.test.ex @@ -147,30 +148,33 @@ cmd buf flush ddd bytes 250 HELP try option host_name_extract ╭considering: ${if░and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ╭considering: $host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├──────value: 127.0.0.1 - ├considering: }{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: $host - ╰─────result: 127.0.0.1 - ╭considering: .outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───────text: .outlook.com - ├considering: \$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├backslashed: '\$' - ├considering: }}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: .outlook.com\$ - ╰─────result: .outlook.com$ - ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├──────value: - ├───scanning: }{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: $item - ├─────result: ◀skipped▶ - ╰───skipping: result is not used - ╭───scanning: \N^250-([\w.]+)\s\N}}}░{$1}} - ├──protected: ^250-([\w.]+)\s - ├───scanning: }}}░{$1}} - ├───expanded: \N^250-([\w.]+)\s\N - ├─────result: ◀skipped▶ - ╰───skipping: result is not used + cond: and + cond: match + ╎╭considering: $host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──────value: 127.0.0.1 + ╎├considering: }{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: $host + ╎╰─────result: 127.0.0.1 + ╎╭considering: .outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───────text: .outlook.com + ╎├considering: \$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├backslashed: '\$' + ╎├considering: }}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: .outlook.com\$ + ╎╰─────result: .outlook.com$ + cond: match + ╎╭───scanning: $item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──────value: + ╎├───scanning: }{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: $item + ╎├─────result: ◀skipped▶ + ╎╰───skipping: result is not used + ╎╭───scanning: \N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──protected: ^250-([\w.]+)\s + ╎├───scanning: }}}░{$1}} + ╎├───expanded: \N^250-([\w.]+)\s\N + ╎├─────result: ◀skipped▶ + ╎╰───skipping: result is not used ├──condition: and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}} ├─────result: false ╭───scanning: $1}} @@ -181,18 +185,19 @@ try option host_name_extract ├───expanded: ${if░and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} ╰─────result: ╭considering: ${if░eq░{$address_data}{usery}{*}{:}} - ╭considering: $address_data}{usery}{*}{:}} - ├──────value: userx - ╰──(tainted) - ├considering: }{usery}{*}{:}} - ├───expanded: $address_data - ╰─────result: userx - ╰──(tainted) - ╭considering: usery}{*}{:}} - ├───────text: usery - ├considering: }{*}{:}} - ├───expanded: usery - ╰─────result: usery + cond: eq + ╭considering: $address_data}{usery}{*}{:}} + ├──────value: userx + ╰──(tainted) + ├considering: }{usery}{*}{:}} + ├───expanded: $address_data + ╰─────result: userx + ╰──(tainted) + ╭considering: usery}{*}{:}} + ├───────text: usery + ├considering: }{*}{:}} + ├───expanded: usery + ╰─────result: usery ├──condition: eq░{$address_data}{usery} ├─────result: false ╭───scanning: *}{:}} @@ -212,18 +217,19 @@ try option host_name_extract list element: 127.0.0.1 in hosts_avoid_tls? no (end of list) ╭considering: ${if░eq░{$address_data}{userz}{*}{:}} - ╭considering: $address_data}{userz}{*}{:}} - ├──────value: userx - ╰──(tainted) - ├considering: }{userz}{*}{:}} - ├───expanded: $address_data - ╰─────result: userx - ╰──(tainted) - ╭considering: userz}{*}{:}} - ├───────text: userz - ├considering: }{*}{:}} - ├───expanded: userz - ╰─────result: userz + cond: eq + ╭considering: $address_data}{userz}{*}{:}} + ├──────value: userx + ╰──(tainted) + ├considering: }{userz}{*}{:}} + ├───expanded: $address_data + ╰─────result: userx + ╰──(tainted) + ╭considering: userz}{*}{:}} + ├───────text: userz + ├considering: }{*}{:}} + ├───expanded: userz + ╰─────result: userz ├──condition: eq░{$address_data}{userz} ├─────result: false ╭───scanning: *}{:}} @@ -302,6 +308,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_rcvhost ├─────result: false ╭───scanning: from░$sender_rcvhost↩ @@ -345,6 +352,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_ident ├─────result: true ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩ @@ -398,6 +406,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_helo_name ├─────result: true ╭considering: (helo=$sender_helo_name)↩ @@ -472,6 +481,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_protocol ├─────result: true ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩ @@ -506,6 +516,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} @@ -519,6 +530,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:tls_in_cipher_std ├─────result: false ╭───scanning: ░tls░$tls_in_cipher_std↩ @@ -569,6 +581,7 @@ try option received_header_text ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from░<$sender_address>)↩ @@ -601,6 +614,7 @@ try option received_header_text ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_for ├─────result: true ╭considering: ↩ @@ -634,8 +648,6 @@ try option received_header_text ╰──(tainted) ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -try option acl_smtp_dkim -try option acl_smtp_mime try option acl_smtp_data ╭considering: ${tod_full} ├───expanded: ${tod_full} @@ -658,6 +670,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -702,16 +715,17 @@ try option acl_smtp_expn try option acl_smtp_mail try option acl_smtp_rcpt ╭considering: ${if░eq░{SERVER}{server}{queue}{cutthrough}} - ╭considering: SERVER}{server}{queue}{cutthrough}} - ├───────text: SERVER - ├considering: }{server}{queue}{cutthrough}} - ├───expanded: SERVER - ╰─────result: SERVER - ╭considering: server}{queue}{cutthrough}} - ├───────text: server - ├considering: }{queue}{cutthrough}} - ├───expanded: server - ╰─────result: server + cond: eq + ╭considering: SERVER}{server}{queue}{cutthrough}} + ├───────text: SERVER + ├considering: }{server}{queue}{cutthrough}} + ├───expanded: SERVER + ╰─────result: SERVER + ╭considering: server}{queue}{cutthrough}} + ├───────text: server + ├considering: }{queue}{cutthrough}} + ├───expanded: server + ╰─────result: server ├──condition: eq░{SERVER}{server} ├─────result: false ╭───scanning: queue}{cutthrough}} @@ -731,15 +745,15 @@ using ACL "cutthrough" processing "accept" (TESTSUITE/test-config 22) check control = cutthrough_delivery check verify = recipient -domain.com in "! +local_domains"? - list element: ! +local_domains +domain.com in domains? + list element: !░+local_domains start sublist local_domains domain.com in "test.ex : *.test.ex"? ╎list element: test.ex ╎list element: *.test.ex domain.com in "test.ex : *.test.ex"? no (end of list) end sublist local_domains -domain.com in "! +local_domains"? yes (end of list) +domain.com in domains? yes (end of list) try option router_home_directory try option set processing address_data @@ -754,20 +768,19 @@ domain.com in "*"? domain.com in "*"? yes (matched "*") try option transport try option unseen -try option unseen ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ -domain.com in "! +local_domains"? - list element: ! +local_domains +domain.com in domains? + list element: !░+local_domains start sublist local_domains domain.com in "test.ex : *.test.ex"? ╎list element: test.ex ╎list element: *.test.ex domain.com in "test.ex : *.test.ex"? no (end of list) end sublist local_domains -domain.com in "! +local_domains"? yes (end of list) +domain.com in domains? yes (end of list) try option router_home_directory try option set processing address_data @@ -782,12 +795,12 @@ domain.com in "*"? domain.com in "*"? yes (matched "*") try option transport try option unseen -try option unseen try option interface -Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp -127.0.0.1 in hosts_try_fastopen? - list element: - connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... +try option dscp + 127.0.0.1 in hosts_try_fastopen? + list element: +connected try option helo_data ╭considering: $primary_hostname ├──────value: myhost.test.ex @@ -806,30 +819,33 @@ cmd buf flush ddd bytes 250 HELP try option host_name_extract ╭considering: ${if░and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ╭considering: $host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├──────value: 127.0.0.1 - ├considering: }{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: $host - ╰─────result: 127.0.0.1 - ╭considering: .outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───────text: .outlook.com - ├considering: \$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├backslashed: '\$' - ├considering: }}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: .outlook.com\$ - ╰─────result: .outlook.com$ - ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├──────value: - ├───scanning: }{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: $item - ├─────result: ◀skipped▶ - ╰───skipping: result is not used - ╭───scanning: \N^250-([\w.]+)\s\N}}}░{$1}} - ├──protected: ^250-([\w.]+)\s - ├───scanning: }}}░{$1}} - ├───expanded: \N^250-([\w.]+)\s\N - ├─────result: ◀skipped▶ - ╰───skipping: result is not used + cond: and + cond: match + ╎╭considering: $host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──────value: 127.0.0.1 + ╎├considering: }{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: $host + ╎╰─────result: 127.0.0.1 + ╎╭considering: .outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───────text: .outlook.com + ╎├considering: \$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├backslashed: '\$' + ╎├considering: }}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: .outlook.com\$ + ╎╰─────result: .outlook.com$ + cond: match + ╎╭───scanning: $item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──────value: + ╎├───scanning: }{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: $item + ╎├─────result: ◀skipped▶ + ╎╰───skipping: result is not used + ╎╭───scanning: \N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──protected: ^250-([\w.]+)\s + ╎├───scanning: }}}░{$1}} + ╎├───expanded: \N^250-([\w.]+)\s\N + ╎├─────result: ◀skipped▶ + ╎╰───skipping: result is not used ├──condition: and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}} ├─────result: false ╭───scanning: $1}} @@ -840,18 +856,19 @@ try option host_name_extract ├───expanded: ${if░and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} ╰─────result: ╭considering: ${if░eq░{$address_data}{usery}{*}{:}} - ╭considering: $address_data}{usery}{*}{:}} - ├──────value: usery - ╰──(tainted) - ├considering: }{usery}{*}{:}} - ├───expanded: $address_data - ╰─────result: usery - ╰──(tainted) - ╭considering: usery}{*}{:}} - ├───────text: usery - ├considering: }{*}{:}} - ├───expanded: usery - ╰─────result: usery + cond: eq + ╭considering: $address_data}{usery}{*}{:}} + ├──────value: usery + ╰──(tainted) + ├considering: }{usery}{*}{:}} + ├───expanded: $address_data + ╰─────result: usery + ╰──(tainted) + ╭considering: usery}{*}{:}} + ├───────text: usery + ├considering: }{*}{:}} + ├───expanded: usery + ╰─────result: usery ├──condition: eq░{$address_data}{usery} ├─────result: true ╭considering: *}{:}} @@ -911,6 +928,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_rcvhost ├─────result: false ╭───scanning: from░$sender_rcvhost↩ @@ -954,6 +972,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_ident ├─────result: true ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩ @@ -1007,6 +1026,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_helo_name ├─────result: true ╭considering: (helo=$sender_helo_name)↩ @@ -1081,6 +1101,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_protocol ├─────result: true ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩ @@ -1115,6 +1136,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} @@ -1128,6 +1150,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:tls_in_cipher_std ├─────result: false ╭───scanning: ░tls░$tls_in_cipher_std↩ @@ -1178,6 +1201,7 @@ try option received_header_text ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from░<$sender_address>)↩ @@ -1210,6 +1234,7 @@ try option received_header_text ├──────value: 10HmaZ-000000005vi-0000 ├considering: ${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_for ├─────result: true ╭considering: ↩ @@ -1243,8 +1268,6 @@ try option received_header_text ╰──(tainted) ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -try option acl_smtp_dkim -try option acl_smtp_mime try option acl_smtp_data ╭considering: ${tod_full} ├───expanded: ${tod_full} @@ -1267,6 +1290,7 @@ LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -1311,16 +1335,17 @@ try option acl_smtp_expn try option acl_smtp_mail try option acl_smtp_rcpt ╭considering: ${if░eq░{SERVER}{server}{queue}{cutthrough}} - ╭considering: SERVER}{server}{queue}{cutthrough}} - ├───────text: SERVER - ├considering: }{server}{queue}{cutthrough}} - ├───expanded: SERVER - ╰─────result: SERVER - ╭considering: server}{queue}{cutthrough}} - ├───────text: server - ├considering: }{queue}{cutthrough}} - ├───expanded: server - ╰─────result: server + cond: eq + ╭considering: SERVER}{server}{queue}{cutthrough}} + ├───────text: SERVER + ├considering: }{server}{queue}{cutthrough}} + ├───expanded: SERVER + ╰─────result: SERVER + ╭considering: server}{queue}{cutthrough}} + ├───────text: server + ├considering: }{queue}{cutthrough}} + ├───expanded: server + ╰─────result: server ├──condition: eq░{SERVER}{server} ├─────result: false ╭───scanning: queue}{cutthrough}} @@ -1340,15 +1365,15 @@ using ACL "cutthrough" processing "accept" (TESTSUITE/test-config 22) check control = cutthrough_delivery check verify = recipient -domain.com in "! +local_domains"? - list element: ! +local_domains +domain.com in domains? + list element: !░+local_domains start sublist local_domains domain.com in "test.ex : *.test.ex"? ╎list element: test.ex ╎list element: *.test.ex domain.com in "test.ex : *.test.ex"? no (end of list) end sublist local_domains -domain.com in "! +local_domains"? yes (end of list) +domain.com in domains? yes (end of list) try option router_home_directory try option set processing address_data @@ -1363,20 +1388,19 @@ domain.com in "*"? domain.com in "*"? yes (matched "*") try option transport try option unseen -try option unseen ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ -domain.com in "! +local_domains"? - list element: ! +local_domains +domain.com in domains? + list element: !░+local_domains start sublist local_domains domain.com in "test.ex : *.test.ex"? ╎list element: test.ex ╎list element: *.test.ex domain.com in "test.ex : *.test.ex"? no (end of list) end sublist local_domains -domain.com in "! +local_domains"? yes (end of list) +domain.com in domains? yes (end of list) try option router_home_directory try option set processing address_data @@ -1391,12 +1415,12 @@ domain.com in "*"? domain.com in "*"? yes (matched "*") try option transport try option unseen -try option unseen try option interface -Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp -127.0.0.1 in hosts_try_fastopen? - list element: - connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... +try option dscp + 127.0.0.1 in hosts_try_fastopen? + list element: +connected try option helo_data ╭considering: $primary_hostname ├──────value: myhost.test.ex @@ -1415,30 +1439,33 @@ cmd buf flush ddd bytes 250 HELP try option host_name_extract ╭considering: ${if░and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ╭considering: $host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├──────value: 127.0.0.1 - ├considering: }{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: $host - ╰─────result: 127.0.0.1 - ╭considering: .outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───────text: .outlook.com - ├considering: \$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├backslashed: '\$' - ├considering: }}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: .outlook.com\$ - ╰─────result: .outlook.com$ - ╭───scanning: $item}{\N^250-([\w.]+)\s\N}}}░{$1}} - ├──────value: - ├───scanning: }{\N^250-([\w.]+)\s\N}}}░{$1}} - ├───expanded: $item - ├─────result: ◀skipped▶ - ╰───skipping: result is not used - ╭───scanning: \N^250-([\w.]+)\s\N}}}░{$1}} - ├──protected: ^250-([\w.]+)\s - ├───scanning: }}}░{$1}} - ├───expanded: \N^250-([\w.]+)\s\N - ├─────result: ◀skipped▶ - ╰───skipping: result is not used + cond: and + cond: match + ╎╭considering: $host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──────value: 127.0.0.1 + ╎├considering: }{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: $host + ╎╰─────result: 127.0.0.1 + ╎╭considering: .outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───────text: .outlook.com + ╎├considering: \$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├backslashed: '\$' + ╎├considering: }}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: .outlook.com\$ + ╎╰─────result: .outlook.com$ + cond: match + ╎╭───scanning: $item}{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──────value: + ╎├───scanning: }{\N^250-([\w.]+)\s\N}}}░{$1}} + ╎├───expanded: $item + ╎├─────result: ◀skipped▶ + ╎╰───skipping: result is not used + ╎╭───scanning: \N^250-([\w.]+)\s\N}}}░{$1}} + ╎├──protected: ^250-([\w.]+)\s + ╎├───scanning: }}}░{$1}} + ╎├───expanded: \N^250-([\w.]+)\s\N + ╎├─────result: ◀skipped▶ + ╎╰───skipping: result is not used ├──condition: and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}} ├─────result: false ╭───scanning: $1}} @@ -1449,18 +1476,19 @@ try option host_name_extract ├───expanded: ${if░and░{{match{$host}{.outlook.com\$}}░{match{$item}{\N^250-([\w.]+)\s\N}}}░{$1}} ╰─────result: ╭considering: ${if░eq░{$address_data}{usery}{*}{:}} - ╭considering: $address_data}{usery}{*}{:}} - ├──────value: usery - ╰──(tainted) - ├considering: }{usery}{*}{:}} - ├───expanded: $address_data - ╰─────result: usery - ╰──(tainted) - ╭considering: usery}{*}{:}} - ├───────text: usery - ├considering: }{*}{:}} - ├───expanded: usery - ╰─────result: usery + cond: eq + ╭considering: $address_data}{usery}{*}{:}} + ├──────value: usery + ╰──(tainted) + ├considering: }{usery}{*}{:}} + ├───expanded: $address_data + ╰─────result: usery + ╰──(tainted) + ╭considering: usery}{*}{:}} + ├───────text: usery + ├considering: }{*}{:}} + ├───expanded: usery + ╰─────result: usery ├──condition: eq░{$address_data}{usery} ├─────result: true ╭considering: *}{:}} @@ -1520,6 +1548,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_rcvhost ├─────result: false ╭───scanning: from░$sender_rcvhost↩ @@ -1563,6 +1592,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_ident ├─────result: true ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩ @@ -1616,6 +1646,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_helo_name ├─────result: true ╭considering: (helo=$sender_helo_name)↩ @@ -1690,6 +1721,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_protocol ├─────result: true ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩ @@ -1724,6 +1756,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} @@ -1737,6 +1770,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:tls_in_cipher_std ├─────result: false ╭───scanning: ░tls░$tls_in_cipher_std↩ @@ -1787,6 +1821,7 @@ try option received_header_text ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from░<$sender_address>)↩ @@ -1819,6 +1854,7 @@ try option received_header_text ├──────value: 10HmbB-000000005vi-0000 ├considering: ${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_for ├─────result: true ╭considering: ↩ @@ -1852,8 +1888,6 @@ try option received_header_text ╰──(tainted) ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -try option acl_smtp_dkim -try option acl_smtp_mime try option acl_smtp_data ╭considering: ${tod_full} ├───expanded: ${tod_full}