From 27662d806b99c9369e564f6f33769836c27085df Mon Sep 17 00:00:00 2001 From: Jasen Betts Date: Mon, 18 Feb 2019 13:52:16 +0000 Subject: [PATCH] Fix expansions for RFC 822 addresses having comments in local-part and/or domain. Bug 2375 (cherry picked from commit e2ff8e24f41caca3623228b1ec66a3f3961ecad6) (cherry picked from commit f634b80846cc7ffcab65c9855bcb35312f0232e8) (cherry picked from commit cebd5bd2ab84c7815a9b99c0f0f16e829af7b4bc) --- doc/doc-txt/ChangeLog | 3 +++ src/src/expand.c | 19 +++++++------------ test/scripts/0000-Basic/0002 | 7 +++++++ test/stdout/0002 | 7 +++++++ 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 7adc1d6e0..13c2cb64b 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -29,6 +29,9 @@ JH/07 GnuTLS: Our use of late (post-handshake) certificate verification, under TLS connection attempt, so that the normal retry-in-clear can work (if suitably configured). +JB/01 BZg 2375: fix expansions of 822 addresses having comments in local-part + and/or domain. Found and fixed by Jason Betts. + Exim version 4.92 ----------------- diff --git a/src/src/expand.c b/src/src/expand.c index c2eba072a..fbb2dfb14 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -7151,16 +7151,11 @@ while (*s != 0) uschar * t = parse_extract_address(sub, &error, &start, &end, &domain, FALSE); if (t) - if (c != EOP_DOMAIN) - { - if (c == EOP_LOCAL_PART && domain != 0) end = start + domain - 1; - yield = string_catn(yield, sub+start, end-start); - } - else if (domain != 0) - { - domain += start; - yield = string_catn(yield, sub+domain, end-domain); - } + yield = c == EOP_DOMAIN + ? string_cat(yield, t + domain) + : c == EOP_LOCAL_PART && domain > 0 + ? string_catn(yield, t, domain - 1 ) + : string_cat(yield, t); continue; } @@ -7184,7 +7179,7 @@ while (*s != 0) for (;;) { - uschar *p = parse_find_address_end(sub, FALSE); + uschar * p = parse_find_address_end(sub, FALSE); uschar saveend = *p; *p = '\0'; address = parse_extract_address(sub, &error, &start, &end, &domain, @@ -7197,7 +7192,7 @@ while (*s != 0) list, add in a space if the new address begins with the separator character, or is an empty string. */ - if (address != NULL) + if (address) { if (yield->ptr != save_ptr && address[0] == *outsep) yield = string_catn(yield, US" ", 1); diff --git a/test/scripts/0000-Basic/0002 b/test/scripts/0000-Basic/0002 index 7a9b38dba..1f520f671 100644 --- a/test/scripts/0000-Basic/0002 +++ b/test/scripts/0000-Basic/0002 @@ -123,8 +123,14 @@ acl: ${reduce {1:2:3:4} {} {$value ${acl {a_ret}{$item}}}} addrss: ${address:local-part@dom.ain} addrss: ${address:Exim Person (that's me)} +addrss: ${address:Exim Person (that's me)} +addrss: ${address:Exim Person (that's me)} +addrss: ${address:Exim Person (that's me)} +addrss: ${address:Exim Person (that's me)} +addrss: ${address:Exim Person <(comment)local-part@dom.ain(comment2)> (that's me)} domain: ${domain:local-part@dom.ain} domain: ${domain:Exim Person (that's me)} +domain: ${domain:Exim Person (that's me)} addresses: ${addresses:>' 'abc@xyz, 'pqr@xyz} addresses: ${addresses:Exim Person (that's me)} @@ -244,6 +250,7 @@ lc/uc: ${lc:The Quick} ${uc: Brown Fox} length: ${length_10:The quick brown fox} ${l_10:abc} lclpt: ${local_part:local-part@dom.ain} lclpt: ${local_part:Exim Person (that's me)} +lclpt: ${local_part:Exim Person (that's me)} quote: ${quote:aZ09_.-Q} ${quote:ab*cd} ${quote:ab\cd"ef} quote: ${quote:nl(\n)} quote: ${quote:cr(\r)} diff --git a/test/stdout/0002 b/test/stdout/0002 index c2f5f2f3c..25535fc9f 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -115,6 +115,12 @@ > > addrss: local-part@dom.ain > addrss: local-part@dom.ain +> addrss: local-part@dom.ain +> addrss: local-part@dom.ain +> addrss: local-part@dom.ain +> addrss: local-part.dot-atom@dom.ain +> addrss: local-part@dom.ain +> domain: dom.ain > domain: dom.ain > domain: dom.ain > @@ -226,6 +232,7 @@ newline tab\134backslash ~tilde\177DEL\200\201. > length: The quick abc > lclpt: local-part > lclpt: local-part +> lclpt: local.part > quote: aZ09_.-Q "ab*cd" "abcd\"ef" > quote: "nl(\n)" > quote: "cr(\r)" -- 2.30.2