X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/71c8c2ef07fabc64c4b56b6eee1eeffb88a8f5e0..8f6f8772553ebcc66418ac379d956d9af1abdc32:/src/src/expand.c diff --git a/src/src/expand.c b/src/src/expand.c index 8be7bf97b..6478920f8 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -3,7 +3,7 @@ *************************************************/ /* Copyright (c) University of Cambridge 1995 - 2018 */ -/* Copyright (c) The Exim Maintainers 2020 */ +/* Copyright (c) The Exim Maintainers 2020 - 2021 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -177,7 +177,7 @@ in alphabetical order. There are two tables, because underscore is used in some cases to introduce arguments, whereas for other it is part of the name. This is an historical mis-design. */ -static uschar *op_table_underscore[] = { +static uschar * op_table_underscore[] = { US"from_utf8", US"local_part", US"quote_local_part", @@ -216,7 +216,6 @@ static uschar *op_table_main[] = { US"base62d", US"base64", US"base64d", - US"bless", US"domain", US"escape", US"escape8bit", @@ -264,7 +263,6 @@ enum { EOP_BASE62D, EOP_BASE64, EOP_BASE64D, - EOP_BLESS, EOP_DOMAIN, EOP_ESCAPE, EOP_ESCAPE8BIT, @@ -1595,7 +1593,7 @@ Returns: NULL if the header does not exist, else a pointer to a new */ static uschar * -find_header(uschar *name, int *newsize, unsigned flags, uschar *charset) +find_header(uschar *name, int *newsize, unsigned flags, const uschar *charset) { BOOL found = !name; int len = name ? Ustrlen(name) : 0; @@ -1762,8 +1760,6 @@ const uschar * where; #ifndef EXIM_HAVE_ABSTRACT_UNIX_SOCKETS uschar * sname; #endif -fd_set fds; -struct timeval tv; if ((fd = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) { @@ -1807,9 +1803,7 @@ if (connect(fd, (const struct sockaddr *)&sa_un, len) < 0) buf[0] = NOTIFY_QUEUE_SIZE_REQ; if (send(fd, buf, 1, 0) < 0) { where = US"send"; goto bad; } -FD_ZERO(&fds); FD_SET(fd, &fds); -tv.tv_sec = 2; tv.tv_usec = 0; -if (select(fd + 1, (SELECT_ARG2_TYPE *)&fds, NULL, NULL, &tv) != 1) +if (poll_one_fd(fd, POLLIN, 2 * 1000) != 1) { DEBUG(D_expand) debug_printf("no daemon response; using local evaluation\n"); len = snprintf(CS buf, sizeof(buf), "%u", queue_count_cached()); @@ -1856,7 +1850,7 @@ Returns: NULL if the variable does not exist, or something non-NULL if exists_only is TRUE */ -static uschar * +static const uschar * find_variable(uschar *name, BOOL exists_only, BOOL skipping, int *newsize) { var_entry * vp; @@ -1894,15 +1888,15 @@ if (Ustrncmp(name, "auth", 4) == 0) { uschar *endptr; int n = Ustrtoul(name + 4, &endptr, 10); - if (*endptr == 0 && n != 0 && n <= AUTH_VARS) - return !auth_vars[n-1] ? US"" : auth_vars[n-1]; + if (!*endptr && n != 0 && n <= AUTH_VARS) + return auth_vars[n-1] ? auth_vars[n-1] : US""; } else if (Ustrncmp(name, "regex", 5) == 0) { uschar *endptr; int n = Ustrtoul(name + 5, &endptr, 10); - if (*endptr == 0 && n != 0 && n <= REGEX_VARS) - return !regex_vars[n-1] ? US"" : regex_vars[n-1]; + if (!*endptr && n != 0 && n <= REGEX_VARS) + return regex_vars[n-1] ? regex_vars[n-1] : US""; } /* For all other variables, search the table */ @@ -2545,16 +2539,13 @@ BOOL tempcond, combined_cond; BOOL *subcondptr; BOOL sub2_honour_dollar = TRUE; BOOL is_forany, is_json, is_jsons; -int rc, cond_type, roffset; +int rc, cond_type; int_eximarith_t num[2]; struct stat statbuf; uschar * opname; uschar name[256]; const uschar *sub[10]; -const pcre *re; -const uschar *rerror; - for (;;) if (Uskip_whitespace(&s) == '!') { testfor = !testfor; s++; } else break; @@ -2565,7 +2556,7 @@ switch(cond_type = identify_operator(&s, &opname)) case ECOND_DEF: { - uschar * t; + const uschar * t; if (*s != ':') { @@ -2976,15 +2967,24 @@ switch(cond_type = identify_operator(&s, &opname)) break; case ECOND_MATCH: /* Regular expression match */ - if (!(re = pcre_compile(CS sub[1], PCRE_COPT, CCSS &rerror, - &roffset, NULL))) { - expand_string_message = string_sprintf("regular expression error in " - "\"%s\": %s at offset %d", sub[1], rerror, roffset); - return NULL; + const pcre2_code * re; + PCRE2_SIZE offset; + int err; + + if (!(re = pcre2_compile((PCRE2_SPTR)sub[1], PCRE2_ZERO_TERMINATED, + PCRE_COPT, &err, &offset, pcre_cmp_ctx))) + { + uschar errbuf[128]; + pcre2_get_error_message(err, errbuf, sizeof(errbuf)); + expand_string_message = string_sprintf("regular expression error in " + "\"%s\": %s at offset %ld", sub[1], errbuf, (long)offset); + return NULL; + } + + tempcond = regex_match_and_setup(re, sub[0], 0, -1); + break; } - tempcond = regex_match_and_setup(re, sub[0], 0, -1); - break; case ECOND_MATCH_ADDRESS: /* Match in an address list */ rc = match_address_list(sub[0], TRUE, FALSE, &(sub[1]), NULL, -1, 0, NULL); @@ -3450,9 +3450,10 @@ switch(cond_type = identify_operator(&s, &opname)) /* ${if inbound_srs {local_part}{secret} {yes}{no}} */ { uschar * sub[2]; - const pcre * re; - int ovec[3*(4+1)]; - int n, quoting = 0; + const pcre2_code * re; + pcre2_match_data * md; + PCRE2_SIZE * ovec; + int quoting = 0; uschar cksum[4]; BOOL boolvalue = FALSE; @@ -3468,12 +3469,14 @@ switch(cond_type = identify_operator(&s, &opname)) re = regex_must_compile(US"^(?i)SRS0=([^=]+)=([A-Z2-7]+)=([^=]*)=(.*)$", TRUE, FALSE); - if (pcre_exec(re, NULL, CS sub[0], Ustrlen(sub[0]), 0, PCRE_EOPT, - ovec, nelem(ovec)) < 0) + md = pcre2_match_data_create(4+1, pcre_gen_ctx); + if (pcre2_match(re, sub[0], PCRE2_ZERO_TERMINATED, 0, PCRE_EOPT, + md, pcre_mtc_ctx) < 0) { DEBUG(D_expand) debug_printf("no match for SRS'd local-part pattern\n"); goto srs_result; } + ovec = pcre2_get_ovector_pointer(md); if (sub[0][0] == '"') quoting = 1; @@ -3487,9 +3490,9 @@ switch(cond_type = identify_operator(&s, &opname)) srs_recipient = string_sprintf("%.*s%.*S%.*s@%.*S", /* lowercased */ quoting, "\"", - ovec[9]-ovec[8], sub[0] + ovec[8], /* substring 4 */ + (int) (ovec[9]-ovec[8]), sub[0] + ovec[8], /* substr 4 */ quoting, "\"", - ovec[7]-ovec[6], sub[0] + ovec[6]); /* substring 3 */ + (int) (ovec[7]-ovec[6]), sub[0] + ovec[6]); /* substr 3 */ /* If a zero-length secret was given, we're done. Otherwise carry on and validate the given SRS local_part againt our secret. */ @@ -3505,6 +3508,7 @@ switch(cond_type = identify_operator(&s, &opname)) struct timeval now; uschar * ss = sub[0] + ovec[4]; /* substring 2, the timestamp */ long d; + int n; gettimeofday(&now, NULL); now.tv_sec /= 86400; /* days since epoch */ @@ -3598,7 +3602,7 @@ Returns: the value of expand max to save */ static int -save_expand_strings(uschar **save_expand_nstring, int *save_expand_nlength) +save_expand_strings(const uschar **save_expand_nstring, int *save_expand_nlength) { for (int i = 0; i <= expand_nmax; i++) { @@ -3625,7 +3629,7 @@ Returns: nothing */ static void -restore_expand_strings(int save_expand_nmax, uschar **save_expand_nstring, +restore_expand_strings(int save_expand_nmax, const uschar **save_expand_nstring, int *save_expand_nlength) { expand_nmax = save_expand_nmax; @@ -4311,7 +4315,6 @@ tree_node *t = NULL; const uschar * list; int sep = 0; uschar * item; -uschar * suffix = US""; BOOL needsep = FALSE; #define LISTNAMED_BUF_SIZE 256 uschar b[LISTNAMED_BUF_SIZE]; @@ -4327,10 +4330,10 @@ if (!listtype) /* no-argument version */ } else switch(*listtype) /* specific list-type version */ { - case 'a': t = tree_search(addresslist_anchor, name); suffix = US"_a"; break; - case 'd': t = tree_search(domainlist_anchor, name); suffix = US"_d"; break; - case 'h': t = tree_search(hostlist_anchor, name); suffix = US"_h"; break; - case 'l': t = tree_search(localpartlist_anchor, name); suffix = US"_l"; break; + case 'a': t = tree_search(addresslist_anchor, name); break; + case 'd': t = tree_search(domainlist_anchor, name); break; + case 'h': t = tree_search(hostlist_anchor, name); break; + case 'l': t = tree_search(localpartlist_anchor, name); break; default: expand_string_message = US"bad suffix on \"list\" operator"; return yield; @@ -4395,6 +4398,36 @@ return yield; +/************************************************/ +static void +debug_expansion_interim(const uschar * what, const uschar * value, int nchar, + BOOL skipping) +{ +DEBUG(D_noutf8) + debug_printf_indent("|"); +else + debug_printf_indent(UTF8_VERT_RIGHT); + +for (int fill = 11 - Ustrlen(what); fill > 0; fill--) + DEBUG(D_noutf8) + debug_printf("-"); + else + debug_printf(UTF8_HORIZ); + +debug_printf("%s: %.*s\n", what, nchar, value); +if (is_tainted(value)) + { + DEBUG(D_noutf8) + debug_printf_indent("%s \\__", skipping ? "| " : " "); + else + debug_printf_indent("%s", + skipping + ? UTF8_VERT " " : " " UTF8_UP_RIGHT UTF8_HORIZ UTF8_HORIZ); + debug_printf("(tainted)\n"); + } +} + + /************************************************* * Expand string * *************************************************/ @@ -4465,39 +4498,43 @@ expand_string_internal(const uschar *string, BOOL ket_ends, const uschar **left, rmark reset_point = store_mark(); gstring * yield = string_get(Ustrlen(string) + 64); int item_type; -const uschar *s = string; -uschar *save_expand_nstring[EXPAND_MAXN+1]; +const uschar * s = string; +const uschar * save_expand_nstring[EXPAND_MAXN+1]; int save_expand_nlength[EXPAND_MAXN+1]; -BOOL resetok = TRUE; +BOOL resetok = TRUE, first = TRUE; expand_level++; -DEBUG(D_expand) - DEBUG(D_noutf8) - debug_printf_indent("/%s: %s\n", - skipping ? "---scanning" : "considering", string); - else - debug_printf_indent(UTF8_DOWN_RIGHT "%s: %s\n", - skipping - ? UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ "scanning" - : "considering", - string); - f.expand_string_forcedfail = FALSE; expand_string_message = US""; -if (is_tainted(string)) +{ uschar *m; +if ((m = is_tainted2(string, LOG_MAIN|LOG_PANIC, "Tainted string '%s' in expansion", s))) { - expand_string_message = - string_sprintf("attempt to expand tainted string '%s'", s); - log_write(0, LOG_MAIN|LOG_PANIC, "%s", expand_string_message); + expand_string_message = m; goto EXPAND_FAILED; } +} while (*s) { - uschar *value; uschar name[256]; + DEBUG(D_expand) + { + DEBUG(D_noutf8) + debug_printf_indent("%c%s: %s\n", + first ? '/' : '|', + skipping ? "---scanning" : "considering", s); + else + debug_printf_indent("%s%s: %s\n", + first ? UTF8_DOWN_RIGHT : UTF8_VERT_RIGHT, + skipping + ? UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ "scanning" + : "considering", + s); + first = FALSE; + } + /* \ escapes the next character, which must exist, or else the expansion fails. There's a special escape, \N, which causes copying of the subject verbatim up to the next \N. Otherwise, @@ -4514,32 +4551,44 @@ while (*s) if (s[1] == 'N') { const uschar * t = s + 2; - for (s = t; *s != 0; s++) if (*s == '\\' && s[1] == 'N') break; + for (s = t; *s ; s++) if (*s == '\\' && s[1] == 'N') break; + + DEBUG(D_expand) + debug_expansion_interim(US"protected", t, (int)(s - t), skipping); yield = string_catn(yield, t, s - t); - if (*s != 0) s += 2; + if (*s) s += 2; } - else { uschar ch[1]; + DEBUG(D_expand) + DEBUG(D_noutf8) + debug_printf_indent("|backslashed: '\\%c'\n", s[1]); + else + debug_printf_indent(UTF8_VERT_RIGHT "backslashed: '\\%c'\n", s[1]); ch[0] = string_interpret_escape(&s); s++; yield = string_catn(yield, ch, 1); } - continue; } - /*{*/ + /*{{*/ /* Anything other than $ is just copied verbatim, unless we are looking for a terminating } character. */ - /*{*/ if (ket_ends && *s == '}') break; if (*s != '$' || !honour_dollar) { - yield = string_catn(yield, s++, 1); + int i = 1; /*{*/ + for (const uschar * t = s+1; + *t && *t != '$' && *t != '}' && *t != '\\'; t++) i++; + + DEBUG(D_expand) debug_expansion_interim(US"text", s, i, skipping); + + yield = string_catn(yield, s, i); + s += i; continue; } @@ -4551,10 +4600,10 @@ while (*s) "$header_". A non-existent header yields a NULL value; nothing is inserted. */ /*}*/ - if (isalpha((*(++s)))) + if (isalpha(*++s)) { - int len; - int newsize = 0; + const uschar * value; + int newsize = 0, len; gstring * g = NULL; uschar * t; @@ -4584,7 +4633,7 @@ while (*s) unsigned flags = *name == 'r' ? FH_WANT_RAW : *name == 'l' ? FH_WANT_RAW|FH_WANT_LIST : 0; - uschar * charset = *name == 'b' ? NULL : headers_charset; + const uschar * charset = *name == 'b' ? NULL : headers_charset; s = read_header_name(name, sizeof(name), s); value = find_header(name, &newsize, flags, charset); @@ -4595,7 +4644,7 @@ while (*s) But there is no error here - nothing gets inserted. */ if (!value) - { + { /*{*/ if (Ustrchr(name, '}')) malformed_header = TRUE; continue; } @@ -4625,7 +4674,7 @@ while (*s) yield = g; yield->size = newsize; yield->ptr = len; - yield->s = value; + yield->s = US value; /* known to be in new store i.e. a copy, so deconst safe */ } else yield = string_catn(yield, value, len); @@ -4651,14 +4700,14 @@ while (*s) } /* After { there can be various things, but they all start with - an initial word, except for a number for a string match variable. */ + an initial word, except for a number for a string match variable. */ /*}*/ - if (isdigit((*(++s)))) + if (isdigit(*++s)) { int n; - s = read_cnumber(&n, s); /*{*/ + s = read_cnumber(&n, s); /*{{*/ if (*s++ != '}') - { /*{*/ + { expand_string_message = US"} expected after number"; goto EXPAND_FAILED; } @@ -4675,11 +4724,16 @@ while (*s) /* Allow "-" in names to cater for substrings with negative arguments. Since we are checking for known names after { this is - OK. */ + OK. */ /*}*/ s = read_name(name, sizeof(name), s, US"_-"); item_type = chop_match(name, item_table, nelem(item_table)); + /* Switch on item type. All nondefault choices should "continue* when + skipping, but "break" otherwise so we get debug output for the item + expansion. */ + { + int start = gstring_length(yield); switch(item_type) { /* Call an ACL from an expansion. We feed data in via $acl_arg1 - $acl_arg9. @@ -4694,8 +4748,8 @@ while (*s) case EITEM_ACL: /* ${acl {name} {arg1}{arg2}...} */ { - uschar *sub[10]; /* name + arg1-arg9 (which must match number of acl_arg[]) */ - uschar *user_msg; + uschar * sub[10]; /* name + arg1-arg9 (which must match number of acl_arg[]) */ + uschar * user_msg; int rc; switch(read_subs(sub, nelem(sub), 1, &s, skipping, TRUE, name, @@ -4716,7 +4770,7 @@ while (*s) debug_printf_indent("acl expansion yield: %s\n", user_msg); if (user_msg) yield = string_cat(yield, user_msg); - continue; + break; case DEFER: f.expand_string_forcedfail = TRUE; @@ -4726,12 +4780,13 @@ while (*s) rc_names[rc], sub[0]); goto EXPAND_FAILED; } + break; } case EITEM_AUTHRESULTS: /* ${authresults {mysystemname}} */ { - uschar *sub_arg[1]; + uschar * sub_arg[1]; switch(read_subs(sub_arg, nelem(sub_arg), 1, &s, skipping, TRUE, name, &resetok)) @@ -4760,7 +4815,7 @@ while (*s) #ifdef EXPERIMENTAL_ARC yield = authres_arc(yield); #endif - continue; + break; } /* Handle conditionals - preserve the values of the numerical expansion @@ -4780,21 +4835,11 @@ while (*s) goto EXPAND_FAILED; /* message already set */ DEBUG(D_expand) - DEBUG(D_noutf8) - { - debug_printf_indent("|--condition: %.*s\n", (int)(next_s - s), s); - debug_printf_indent("|-----result: %s\n", cond ? "true" : "false"); - } - else - { - debug_printf_indent(UTF8_VERT_RIGHT UTF8_HORIZ UTF8_HORIZ - "condition: %.*s\n", - (int)(next_s - s), s); - debug_printf_indent(UTF8_VERT_RIGHT UTF8_HORIZ UTF8_HORIZ - UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ - "result: %s\n", - cond ? "true" : "false"); - } + { + debug_expansion_interim(US"condition", s, (int)(next_s - s), skipping); + debug_expansion_interim(US"result", + cond ? US"true" : US"false", cond ? 4 : 5, skipping); + } s = next_s; @@ -4819,12 +4864,12 @@ while (*s) restore_expand_strings(save_expand_nmax, save_expand_nstring, save_expand_nlength); - continue; + break; } #ifdef SUPPORT_I18N case EITEM_IMAPFOLDER: - { /* ${imapfolder {name}{sep]{specials}} */ + { /* ${imapfolder {name}{sep}{specials}} */ uschar *sub_arg[3]; uschar *encoded; @@ -4850,14 +4895,13 @@ while (*s) goto EXPAND_FAILED; } - if (!skipping) - { - if (!(encoded = imap_utf7_encode(sub_arg[0], headers_charset, - sub_arg[1][0], sub_arg[2], &expand_string_message))) - goto EXPAND_FAILED; - yield = string_cat(yield, encoded); - } - continue; + if (skipping) continue; + + if (!(encoded = imap_utf7_encode(sub_arg[0], headers_charset, + sub_arg[1][0], sub_arg[2], &expand_string_message))) + goto EXPAND_FAILED; + yield = string_cat(yield, encoded); + break; } #endif @@ -4873,9 +4917,9 @@ while (*s) int stype, partial, affixlen, starflags; int expand_setup = 0; int nameptr = 0; - uschar *key, *filename; + uschar * key, * filename; const uschar * affix, * opts; - uschar *save_lookup_value = lookup_value; + uschar * save_lookup_value = lookup_value; int save_expand_nmax = save_expand_strings(save_expand_nstring, save_expand_nlength); @@ -4943,15 +4987,12 @@ while (*s) goto EXPAND_FAILED; } } - else - { - if (key) - { - expand_string_message = string_sprintf("a single key was given for " - "lookup type \"%s\", which is not a single-key lookup type", name); - goto EXPAND_FAILED; - } - } + else if (key) + { + expand_string_message = string_sprintf("a single key was given for " + "lookup type \"%s\", which is not a single-key lookup type", name); + goto EXPAND_FAILED; + } /* Get the next string in brackets and expand it. It is the file name for single-key+file lookups, and the whole query otherwise. In the case of @@ -4961,10 +5002,11 @@ while (*s) if (*s != '{') { expand_string_message = US"missing '{' for lookup file-or-query arg"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}}*/ } if (!(filename = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok))) goto EXPAND_FAILED; + /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing lookup file-or-query arg"; @@ -4997,7 +5039,7 @@ while (*s) lookup_value = NULL; else { - void *handle = search_open(filename, stype, 0, NULL, NULL); + void * handle = search_open(filename, stype, 0, NULL, NULL); if (!handle) { expand_string_message = search_error_message; @@ -5036,7 +5078,9 @@ while (*s) restore_expand_strings(save_expand_nmax, save_expand_nstring, save_expand_nlength); - continue; + + if (skipping) continue; + break; } /* If Perl support is configured, handle calling embedded perl subroutines, @@ -5044,20 +5088,20 @@ while (*s) or ${perl{sub}{arg1}{arg2}} or up to a maximum of EXIM_PERL_MAX_ARGS arguments (defined below). */ - #define EXIM_PERL_MAX_ARGS 8 +#define EXIM_PERL_MAX_ARGS 8 case EITEM_PERL: - #ifndef EXIM_PERL - expand_string_message = US"\"${perl\" encountered, but this facility " /*}*/ - "is not included in this binary"; - goto EXPAND_FAILED; +#ifndef EXIM_PERL + expand_string_message = US"\"${perl\" encountered, but this facility " /*}*/ + "is not included in this binary"; + goto EXPAND_FAILED; - #else /* EXIM_PERL */ +#else /* EXIM_PERL */ { - uschar *sub_arg[EXIM_PERL_MAX_ARGS + 2]; - gstring *new_yield; + uschar * sub_arg[EXIM_PERL_MAX_ARGS + 2]; + gstring * new_yield; - if ((expand_forbid & RDO_PERL) != 0) + if (expand_forbid & RDO_PERL) { expand_string_message = US"Perl calls are not permitted"; goto EXPAND_FAILED; @@ -5079,7 +5123,7 @@ while (*s) if (!opt_perl_started) { - uschar *initerror; + uschar * initerror; if (!opt_perl_startup) { expand_string_message = US"A setting of perl_startup is needed when " @@ -5123,17 +5167,16 @@ while (*s) f.expand_string_forcedfail = FALSE; yield = new_yield; - continue; + break; } - #endif /* EXIM_PERL */ +#endif /* EXIM_PERL */ /* Transform email address to "prvs" scheme to use as BATV-signed return path */ case EITEM_PRVS: { - uschar *sub_arg[3]; - uschar *p,*domain; + uschar * sub_arg[3], * p, * domain; switch(read_subs(sub_arg, 3, 2, &s, skipping, TRUE, name, &resetok)) { @@ -5182,17 +5225,16 @@ while (*s) yield = string_catn(yield, US"@", 1); yield = string_cat (yield, domain); - continue; + break; } /* Check a prvs-encoded address for validity */ case EITEM_PRVSCHECK: { - uschar *sub_arg[3]; + uschar * sub_arg[3], * p; gstring * g; - const pcre *re; - uschar *p; + const pcre2_code * re; /* TF: Ugliness: We want to expand parameter 1 first, then set up expansion variables that are used in the expansion of @@ -5202,7 +5244,7 @@ while (*s) PH: Actually, that isn't necessary. The read_subs() function is designed to work this way for the ${if and ${lookup expansions. I've tidied the code. - */ + */ /*}}*/ /* Reset expansion variables */ prvscheck_result = NULL; @@ -5221,11 +5263,11 @@ while (*s) if (regex_match_and_setup(re,sub_arg[0],0,-1)) { - uschar *local_part = string_copyn(expand_nstring[4],expand_nlength[4]); - uschar *key_num = string_copyn(expand_nstring[1],expand_nlength[1]); - uschar *daystamp = string_copyn(expand_nstring[2],expand_nlength[2]); - uschar *hash = string_copyn(expand_nstring[3],expand_nlength[3]); - uschar *domain = string_copyn(expand_nstring[5],expand_nlength[5]); + uschar * local_part = string_copyn(expand_nstring[4],expand_nlength[4]); + uschar * key_num = string_copyn(expand_nstring[1],expand_nlength[1]); + uschar * daystamp = string_copyn(expand_nstring[2],expand_nlength[2]); + uschar * hash = string_copyn(expand_nstring[3],expand_nlength[3]); + uschar * domain = string_copyn(expand_nstring[5],expand_nlength[5]); DEBUG(D_expand) debug_printf_indent("prvscheck localpart: %s\n", local_part); DEBUG(D_expand) debug_printf_indent("prvscheck key number: %s\n", key_num); @@ -5323,15 +5365,16 @@ while (*s) case 3: goto EXPAND_FAILED; } - continue; + if (skipping) continue; + break; } /* Handle "readfile" to insert an entire file */ case EITEM_READFILE: { - FILE *f; - uschar *sub_arg[2]; + FILE * f; + uschar * sub_arg[2]; if ((expand_forbid & RDO_READFILE) != 0) { @@ -5360,7 +5403,7 @@ while (*s) yield = cat_file(f, yield, sub_arg[1]); (void)fclose(f); - continue; + break; } /* Handle "readsocket" to insert data from a socket, either @@ -5466,38 +5509,39 @@ while (*s) /* The whole thing has worked (or we were skipping). If there is a failure string following, we need to skip it. */ - if (*s == '{') + if (*s == '{') /*}*/ { if (!expand_string_internal(s+1, TRUE, &s, TRUE, TRUE, &resetok)) - goto EXPAND_FAILED; + goto EXPAND_FAILED; /*{*/ if (*s++ != '}') - { + { /*{*/ expand_string_message = US"missing '}' closing failstring for readsocket"; goto EXPAND_FAILED_CURLY; } Uskip_whitespace(&s); } - READSOCK_DONE: + READSOCK_DONE: /*{*/ if (*s++ != '}') - { + { /*{*/ expand_string_message = US"missing '}' closing readsocket"; goto EXPAND_FAILED_CURLY; } - continue; + if (skipping) continue; + break; /* Come here on failure to create socket, connect socket, write to the socket, or timeout on reading. If another substring follows, expand and use it. Otherwise, those conditions give expand errors. */ SOCK_FAIL: - if (*s != '{') goto EXPAND_FAILED; + if (*s != '{') goto EXPAND_FAILED; /*}*/ DEBUG(D_any) debug_printf("%s\n", expand_string_message); if (!(arg = expand_string_internal(s+1, TRUE, &s, FALSE, TRUE, &resetok))) goto EXPAND_FAILED; - yield = string_cat(yield, arg); + yield = string_cat(yield, arg); /*{*/ if (*s++ != '}') - { + { /*{*/ expand_string_message = US"missing '}' closing failstring for readsocket"; goto EXPAND_FAILED_CURLY; } @@ -5509,9 +5553,9 @@ while (*s) case EITEM_RUN: { - FILE *f; - uschar *arg; - const uschar **argv; + FILE * f; + uschar * arg; + const uschar ** argv; pid_t pid; int fd_in, fd_out; @@ -5618,7 +5662,8 @@ while (*s) case 2: goto EXPAND_FAILED_CURLY; /* returned value is 0 */ } - continue; + if (skipping) continue; + break; } /* Handle character translation for "tr" */ @@ -5627,7 +5672,7 @@ while (*s) { int oldptr = gstring_length(yield); int o2m; - uschar *sub[3]; + uschar * sub[3]; switch(read_subs(sub, 3, 3, &s, skipping, TRUE, name, &resetok)) { @@ -5649,7 +5694,8 @@ while (*s) } } - continue; + if (skipping) continue; + break; } /* Handle "hash", "length", "nhash", and "substr" when they are given with @@ -5663,7 +5709,7 @@ while (*s) int len; uschar *ret; int val[2] = { 0, -1 }; - uschar *sub[3]; + uschar * sub[3]; /* "length" takes only 2 arguments whereas the others take 2 or 3. Ensure that sub[2] is set in the ${length } case. */ @@ -5712,7 +5758,8 @@ while (*s) if (!ret) goto EXPAND_FAILED; yield = string_catn(yield, ret, len); - continue; + if (skipping) continue; + break; } /* Handle HMAC computation: ${hmac{}{}{}} @@ -5727,14 +5774,14 @@ while (*s) case EITEM_HMAC: { - uschar *sub[3]; + uschar * sub[3]; md5 md5_base; hctx sha1_ctx; - void *use_base; + void * use_base; int type; int hashlen; /* Number of octets for the hash algorithm's output */ int hashblocklen; /* Number of octets the hash algorithm processes */ - uschar *keyptr, *p; + uschar * keyptr, * p; unsigned int keylen; uschar keyhash[MAX_HASHLEN]; @@ -5751,79 +5798,78 @@ while (*s) case 3: goto EXPAND_FAILED; } - if (!skipping) + if (skipping) continue; + + if (Ustrcmp(sub[0], "md5") == 0) { - if (Ustrcmp(sub[0], "md5") == 0) - { - type = HMAC_MD5; - use_base = &md5_base; - hashlen = 16; - hashblocklen = 64; - } - else if (Ustrcmp(sub[0], "sha1") == 0) - { - type = HMAC_SHA1; - use_base = &sha1_ctx; - hashlen = 20; - hashblocklen = 64; - } - else - { - expand_string_message = - string_sprintf("hmac algorithm \"%s\" is not recognised", sub[0]); - goto EXPAND_FAILED; - } + type = HMAC_MD5; + use_base = &md5_base; + hashlen = 16; + hashblocklen = 64; + } + else if (Ustrcmp(sub[0], "sha1") == 0) + { + type = HMAC_SHA1; + use_base = &sha1_ctx; + hashlen = 20; + hashblocklen = 64; + } + else + { + expand_string_message = + string_sprintf("hmac algorithm \"%s\" is not recognised", sub[0]); + goto EXPAND_FAILED; + } - keyptr = sub[1]; - keylen = Ustrlen(keyptr); + keyptr = sub[1]; + keylen = Ustrlen(keyptr); - /* If the key is longer than the hash block length, then hash the key - first */ + /* If the key is longer than the hash block length, then hash the key + first */ - if (keylen > hashblocklen) - { - chash_start(type, use_base); - chash_end(type, use_base, keyptr, keylen, keyhash); - keyptr = keyhash; - keylen = hashlen; - } + if (keylen > hashblocklen) + { + chash_start(type, use_base); + chash_end(type, use_base, keyptr, keylen, keyhash); + keyptr = keyhash; + keylen = hashlen; + } - /* Now make the inner and outer key values */ + /* Now make the inner and outer key values */ - memset(innerkey, 0x36, hashblocklen); - memset(outerkey, 0x5c, hashblocklen); + memset(innerkey, 0x36, hashblocklen); + memset(outerkey, 0x5c, hashblocklen); - for (int i = 0; i < keylen; i++) - { - innerkey[i] ^= keyptr[i]; - outerkey[i] ^= keyptr[i]; - } + for (int i = 0; i < keylen; i++) + { + innerkey[i] ^= keyptr[i]; + outerkey[i] ^= keyptr[i]; + } - /* Now do the hashes */ + /* Now do the hashes */ - chash_start(type, use_base); - chash_mid(type, use_base, innerkey); - chash_end(type, use_base, sub[2], Ustrlen(sub[2]), innerhash); + chash_start(type, use_base); + chash_mid(type, use_base, innerkey); + chash_end(type, use_base, sub[2], Ustrlen(sub[2]), innerhash); - chash_start(type, use_base); - chash_mid(type, use_base, outerkey); - chash_end(type, use_base, innerhash, hashlen, finalhash); + chash_start(type, use_base); + chash_mid(type, use_base, outerkey); + chash_end(type, use_base, innerhash, hashlen, finalhash); - /* Encode the final hash as a hex string */ + /* Encode the final hash as a hex string */ - p = finalhash_hex; - for (int i = 0; i < hashlen; i++) - { - *p++ = hex_digits[(finalhash[i] & 0xf0) >> 4]; - *p++ = hex_digits[finalhash[i] & 0x0f]; - } + p = finalhash_hex; + for (int i = 0; i < hashlen; i++) + { + *p++ = hex_digits[(finalhash[i] & 0xf0) >> 4]; + *p++ = hex_digits[finalhash[i] & 0x0f]; + } - DEBUG(D_any) debug_printf("HMAC[%s](%.*s,%s)=%.*s\n", - sub[0], (int)keylen, keyptr, sub[2], hashlen*2, finalhash_hex); + DEBUG(D_any) debug_printf("HMAC[%s](%.*s,%s)=%.*s\n", + sub[0], (int)keylen, keyptr, sub[2], hashlen*2, finalhash_hex); - yield = string_catn(yield, finalhash_hex, hashlen*2); - } - continue; + yield = string_catn(yield, finalhash_hex, hashlen*2); + break; } /* Handle global substitution for "sg" - like Perl's s/xxx/yyy/g operator. @@ -5831,13 +5877,12 @@ while (*s) case EITEM_SG: { - const pcre *re; + const pcre2_code * re; int moffset, moffsetextra, slen; - int roffset; - int emptyopt; - const uschar *rerror; - uschar *subject; - uschar *sub[3]; + PCRE2_SIZE roffset; + pcre2_match_data * md; + int err, emptyopt; + uschar * subject, * sub[3]; int save_expand_nmax = save_expand_strings(save_expand_nstring, save_expand_nlength); @@ -5848,15 +5893,19 @@ while (*s) case 3: goto EXPAND_FAILED; } + /*XXX no handling of skipping? */ /* Compile the regular expression */ - if (!(re = pcre_compile(CS sub[1], PCRE_COPT, CCSS &rerror, - &roffset, NULL))) + if (!(re = pcre2_compile((PCRE2_SPTR)sub[1], PCRE2_ZERO_TERMINATED, + PCRE_COPT, &err, &roffset, pcre_cmp_ctx))) { + uschar errbuf[128]; + pcre2_get_error_message(err, errbuf, sizeof(errbuf)); expand_string_message = string_sprintf("regular expression error in " - "\"%s\": %s at offset %d", sub[1], rerror, roffset); + "\"%s\": %s at offset %ld", sub[1], errbuf, (long)roffset); goto EXPAND_FAILED; } + md = pcre2_match_data_create(EXPAND_MAXN + 1, pcre_gen_ctx); /* Now run a loop to do the substitutions as often as necessary. It ends when there are no more matches. Take care over matches of the null string; @@ -5869,10 +5918,10 @@ while (*s) for (;;) { - int ovector[3*(EXPAND_MAXN+1)]; - int n = pcre_exec(re, NULL, CS subject, slen, moffset + moffsetextra, - PCRE_EOPT | emptyopt, ovector, nelem(ovector)); - uschar *insert; + PCRE2_SIZE * ovec = pcre2_get_ovector_pointer(md); + int n = pcre2_match(re, (PCRE2_SPTR)subject, slen, moffset + moffsetextra, + PCRE_EOPT | emptyopt, md, pcre_mtc_ctx); + uschar * insert; /* No match - if we previously set PCRE_NOTEMPTY after a null match, this is not necessarily the end. We want to repeat the match from one @@ -5894,24 +5943,26 @@ while (*s) } /* Match - set up for expanding the replacement. */ + DEBUG(D_expand) debug_printf_indent("%s: match\n", name); if (n == 0) n = EXPAND_MAXN + 1; expand_nmax = 0; for (int nn = 0; nn < n*2; nn += 2) { - expand_nstring[expand_nmax] = subject + ovector[nn]; - expand_nlength[expand_nmax++] = ovector[nn+1] - ovector[nn]; + expand_nstring[expand_nmax] = subject + ovec[nn]; + expand_nlength[expand_nmax++] = ovec[nn+1] - ovec[nn]; } expand_nmax--; /* Copy the characters before the match, plus the expanded insertion. */ - yield = string_catn(yield, subject + moffset, ovector[0] - moffset); + yield = string_catn(yield, subject + moffset, ovec[0] - moffset); + if (!(insert = expand_string(sub[2]))) goto EXPAND_FAILED; yield = string_cat(yield, insert); - moffset = ovector[1]; + moffset = ovec[1]; moffsetextra = 0; emptyopt = 0; @@ -5922,10 +5973,10 @@ while (*s) string at the same point. If this fails (picked up above) we advance to the next character. */ - if (ovector[0] == ovector[1]) + if (ovec[0] == ovec[1]) { - if (ovector[0] == slen) break; - emptyopt = PCRE_NOTEMPTY | PCRE_ANCHORED; + if (ovec[0] == slen) break; + emptyopt = PCRE2_NOTEMPTY | PCRE2_ANCHORED; } } @@ -5933,7 +5984,8 @@ while (*s) restore_expand_strings(save_expand_nmax, save_expand_nstring, save_expand_nlength); - continue; + if (skipping) continue; + break; } /* Handle keyed and numbered substring extraction. If the first argument @@ -5943,8 +5995,7 @@ while (*s) { int field_number = 1; BOOL field_number_set = FALSE; - uschar *save_lookup_value = lookup_value; - uschar *sub[3]; + uschar * save_lookup_value = lookup_value, * sub[3]; int save_expand_nmax = save_expand_strings(save_expand_nstring, save_expand_nlength); @@ -5970,7 +6021,7 @@ while (*s) if (skipping) { - for (int j = 5; j > 0 && *s == '{'; j--) /*'}'*/ + for (int j = 5; j > 0 && *s == '{'; j--) /*'}'*/ { if (!expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok)) goto EXPAND_FAILED; /*'{'*/ @@ -5981,13 +6032,13 @@ while (*s) } Uskip_whitespace(&s); } - if ( Ustrncmp(s, "fail", 4) == 0 /*'{'*/ + if ( Ustrncmp(s, "fail", 4) == 0 /*'{'*/ && (s[4] == '}' || s[4] == ' ' || s[4] == '\t' || !s[4]) ) { s += 4; Uskip_whitespace(&s); - } /*'{'*/ + } /*'{'*/ if (*s != '}') { expand_string_message = US"missing '}' closing extract"; @@ -5997,10 +6048,10 @@ while (*s) else for (int i = 0, j = 2; i < j; i++) /* Read the proper number of arguments */ { - if (Uskip_whitespace(&s) == '{') /*'}'*/ + if (Uskip_whitespace(&s) == '{') /*'}'*/ { if (!(sub[i] = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok))) - goto EXPAND_FAILED; /*'{'*/ + goto EXPAND_FAILED; /*'{'*/ if (*s++ != '}') { expand_string_message = string_sprintf( @@ -6017,7 +6068,7 @@ while (*s) { int len; int x = 0; - uschar *p = sub[0]; + uschar * p = sub[0]; Uskip_whitespace(&p); sub[0] = p; @@ -6026,7 +6077,7 @@ while (*s) while (len > 0 && isspace(p[len-1])) len--; p[len] = 0; - if (*p == 0) + if (!*p) { expand_string_message = US"first argument of \"extract\" must " "not be empty"; @@ -6038,8 +6089,8 @@ while (*s) field_number = -1; p++; } - while (*p != 0 && isdigit(*p)) x = x * 10 + *p++ - '0'; - if (*p == 0) + while (*p && isdigit(*p)) x = x * 10 + *p++ - '0'; + if (!*p) { field_number *= x; if (fmt == extract_basic) j = 3; /* Need 3 args */ @@ -6169,7 +6220,8 @@ while (*s) restore_expand_strings(save_expand_nmax, save_expand_nstring, save_expand_nlength); - continue; + if (skipping) continue; + break; } /* return the Nth item from a list */ @@ -6177,8 +6229,7 @@ while (*s) case EITEM_LISTEXTRACT: { int field_number = 1; - uschar *save_lookup_value = lookup_value; - uschar *sub[2]; + uschar * save_lookup_value = lookup_value, * sub[2]; int save_expand_nmax = save_expand_strings(save_expand_nstring, save_expand_nlength); @@ -6186,15 +6237,15 @@ while (*s) for (int i = 0; i < 2; i++) { - if (Uskip_whitespace(&s) != '{') /*'}'*/ + if (Uskip_whitespace(&s) != '{') /*}*/ { expand_string_message = string_sprintf( - "missing '{' for arg %d of listextract", i+1); + "missing '{' for arg %d of listextract", i+1); /*}*/ goto EXPAND_FAILED_CURLY; } sub[i] = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok); - if (!sub[i]) goto EXPAND_FAILED; /*{*/ + if (!sub[i]) goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { expand_string_message = string_sprintf( @@ -6267,7 +6318,8 @@ while (*s) restore_expand_strings(save_expand_nmax, save_expand_nstring, save_expand_nlength); - continue; + if (skipping) continue; + break; } case EITEM_LISTQUOTE: @@ -6285,14 +6337,14 @@ while (*s) yield = string_catn(yield, sub[1], 1); } else yield = string_catn(yield, US" ", 1); - continue; + if (skipping) continue; + break; } #ifndef DISABLE_TLS case EITEM_CERTEXTRACT: { - uschar *save_lookup_value = lookup_value; - uschar *sub[2]; + uschar * save_lookup_value = lookup_value, * sub[2]; int save_expand_nmax = save_expand_strings(save_expand_nstring, save_expand_nlength); @@ -6300,10 +6352,10 @@ while (*s) if (Uskip_whitespace(&s) != '{') /*}*/ { expand_string_message = US"missing '{' for field arg of certextract"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } sub[0] = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok); - if (!sub[0]) goto EXPAND_FAILED; /*{*/ + if (!sub[0]) goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing field arg of certextract"; @@ -6326,7 +6378,7 @@ while (*s) if (Uskip_whitespace(&s) != '{') /*}*/ { expand_string_message = US"missing '{' for cert variable arg of certextract"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } if (*++s != '$') { @@ -6335,7 +6387,7 @@ while (*s) goto EXPAND_FAILED; } sub[1] = expand_string_internal(s+1, TRUE, &s, skipping, FALSE, &resetok); - if (!sub[1]) goto EXPAND_FAILED; /*{*/ + if (!sub[1]) goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing cert variable arg of certextract"; @@ -6364,7 +6416,8 @@ while (*s) restore_expand_strings(save_expand_nmax, save_expand_nstring, save_expand_nlength); - continue; + if (skipping) continue; + break; } #endif /*DISABLE_TLS*/ @@ -6374,23 +6427,22 @@ while (*s) case EITEM_MAP: case EITEM_REDUCE: { - int sep = 0; - int save_ptr = gstring_length(yield); + int sep = 0, save_ptr = gstring_length(yield); uschar outsep[2] = { '\0', '\0' }; const uschar *list, *expr, *temp; - uschar *save_iterate_item = iterate_item; - uschar *save_lookup_value = lookup_value; + uschar * save_iterate_item = iterate_item; + uschar * save_lookup_value = lookup_value; Uskip_whitespace(&s); - if (*s++ != '{') + if (*s++ != '{') /*}*/ { expand_string_message = string_sprintf("missing '{' for first arg of %s", name); - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } if (!(list = expand_string_internal(s, TRUE, &s, skipping, TRUE, &resetok))) - goto EXPAND_FAILED; + goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { expand_string_message = @@ -6402,14 +6454,14 @@ while (*s) { uschar * t; Uskip_whitespace(&s); - if (*s++ != '{') + if (*s++ != '{') /*}*/ { expand_string_message = US"missing '{' for second arg of reduce"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } t = expand_string_internal(s, TRUE, &s, skipping, TRUE, &resetok); if (!t) goto EXPAND_FAILED; - lookup_value = t; + lookup_value = t; /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing second arg of reduce"; @@ -6418,10 +6470,10 @@ while (*s) } Uskip_whitespace(&s); - if (*s++ != '{') + if (*s++ != '{') /*}*/ { expand_string_message = - string_sprintf("missing '{' for last arg of %s", name); + string_sprintf("missing '{' for last arg of %s", name); /*}*/ goto EXPAND_FAILED_CURLY; } @@ -6433,13 +6485,10 @@ while (*s) condition for real. For EITEM_MAP and EITEM_REDUCE, do the same, using the normal internal expansion function. */ - if (item_type == EITEM_FILTER) - { - if ((temp = eval_condition(expr, &resetok, NULL))) - s = temp; - } - else + if (item_type != EITEM_FILTER) temp = expand_string_internal(s, TRUE, &s, TRUE, TRUE, &resetok); + else + if ((temp = eval_condition(expr, &resetok, NULL))) s = temp; if (!temp) { @@ -6448,18 +6497,18 @@ while (*s) goto EXPAND_FAILED; } - Uskip_whitespace(&s); + Uskip_whitespace(&s); /*{{{*/ if (*s++ != '}') - { /*{*/ + { expand_string_message = string_sprintf("missing } at end of condition " "or expression inside \"%s\"; could be an unquoted } in the content", name); goto EXPAND_FAILED; } - Uskip_whitespace(&s); /*{*/ + Uskip_whitespace(&s); /*{{*/ if (*s++ != '}') - { /*{*/ + { expand_string_message = string_sprintf("missing } at end of \"%s\"", name); goto EXPAND_FAILED; @@ -6539,7 +6588,7 @@ while (*s) too many; backup and end the loop. Otherwise arrange to double the separator. */ - if (temp[seglen] == '\0') { yield->ptr--; break; } + if (!temp[seglen]) { yield->ptr--; break; } yield = string_catn(yield, outsep, 1); temp += seglen + 1; } @@ -6568,28 +6617,27 @@ while (*s) /* Restore preserved $item */ iterate_item = save_iterate_item; - continue; + if (skipping) continue; + break; } case EITEM_SORT: { - int cond_type; - int sep = 0; - const uschar *srclist, *cmp, *xtract; + int sep = 0, cond_type; + const uschar * srclist, * cmp, * xtract; uschar * opname, * srcitem; - const uschar *dstlist = NULL, *dstkeylist = NULL; - uschar * tmp; - uschar *save_iterate_item = iterate_item; + const uschar * dstlist = NULL, * dstkeylist = NULL; + uschar * tmp, * save_iterate_item = iterate_item; Uskip_whitespace(&s); - if (*s++ != '{') + if (*s++ != '{') /*}*/ { expand_string_message = US"missing '{' for list arg of sort"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } srclist = expand_string_internal(s, TRUE, &s, skipping, TRUE, &resetok); - if (!srclist) goto EXPAND_FAILED; + if (!srclist) goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing list arg of sort"; @@ -6597,14 +6645,14 @@ while (*s) } Uskip_whitespace(&s); - if (*s++ != '{') + if (*s++ != '{') /*}*/ { expand_string_message = US"missing '{' for comparator arg of sort"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } cmp = expand_string_internal(s, TRUE, &s, skipping, FALSE, &resetok); - if (!cmp) goto EXPAND_FAILED; + if (!cmp) goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing comparator arg of sort"; @@ -6631,25 +6679,25 @@ while (*s) } Uskip_whitespace(&s); - if (*s++ != '{') + if (*s++ != '{') /*}*/ { expand_string_message = US"missing '{' for extractor arg of sort"; - goto EXPAND_FAILED_CURLY; + goto EXPAND_FAILED_CURLY; /*}*/ } xtract = s; if (!(tmp = expand_string_internal(s, TRUE, &s, TRUE, TRUE, &resetok))) goto EXPAND_FAILED; xtract = string_copyn(xtract, s - xtract); - + /*{{*/ if (*s++ != '}') { expand_string_message = US"missing '}' closing extractor arg of sort"; goto EXPAND_FAILED_CURLY; } - /*{*/ + /*{{*/ if (*s++ != '}') - { /*{*/ + { expand_string_message = US"missing } at end of \"sort\""; goto EXPAND_FAILED; } @@ -6659,8 +6707,7 @@ while (*s) while ((srcitem = string_nextinlist(&srclist, &sep, NULL, 0))) { uschar * srcfield, * dstitem; - gstring * newlist = NULL; - gstring * newkeylist = NULL; + gstring * newlist = NULL, * newkeylist = NULL; DEBUG(D_expand) debug_printf_indent("%s: $item = \"%s\"\n", name, srcitem); @@ -6684,7 +6731,7 @@ while (*s) /* field for comparison */ if (!(dstfield = string_nextinlist(&dstkeylist, &sep, NULL, 0))) - goto sort_mismatch; + goto SORT_MISMATCH; /* String-comparator names start with a letter; numeric names do not */ @@ -6705,7 +6752,7 @@ while (*s) while ((dstitem = string_nextinlist(&dstlist, &sep, NULL, 0))) { if (!(dstfield = string_nextinlist(&dstkeylist, &sep, NULL, 0))) - goto sort_mismatch; + goto SORT_MISMATCH; newlist = string_append_listele(newlist, sep, dstitem); newkeylist = string_append_listele(newkeylist, sep, dstfield); } @@ -6736,9 +6783,9 @@ while (*s) /* Restore preserved $item */ iterate_item = save_iterate_item; - continue; + break; - sort_mismatch: + SORT_MISMATCH: expand_string_message = US"Internal error in sort (list mismatch)"; goto EXPAND_FAILED; } @@ -6759,13 +6806,13 @@ while (*s) #else /* EXPAND_DLFUNC */ { - tree_node *t; - exim_dlfunc_t *func; - uschar *result; + tree_node * t; + exim_dlfunc_t * func; + uschar * result; int status, argc; - uschar *argv[EXPAND_DLFUNC_MAX_ARGS + 3]; + uschar * argv[EXPAND_DLFUNC_MAX_ARGS + 3]; - if ((expand_forbid & RDO_DLFUNC) != 0) + if (expand_forbid & RDO_DLFUNC) { expand_string_message = US"dynamically-loaded functions are not permitted"; @@ -6789,7 +6836,7 @@ while (*s) if (!(t = tree_search(dlobj_anchor, argv[0]))) { - void *handle = dlopen(CS argv[0], RTLD_LAZY); + void * handle = dlopen(CS argv[0], RTLD_LAZY); if (!handle) { expand_string_message = string_sprintf("dlopen \"%s\" failed: %s", @@ -6823,15 +6870,9 @@ while (*s) resetok = FALSE; result = NULL; - for (argc = 0; argv[argc]; argc++); - status = func(&result, argc - 2, &argv[2]); - if(status == OK) - { - if (!result) result = US""; - yield = string_cat(yield, result); - continue; - } - else + for (argc = 0; argv[argc]; argc++) ; + + if ((status = func(&result, argc - 2, &argv[2])) != OK) { expand_string_message = result ? result : US"(no message)"; if (status == FAIL_FORCED) @@ -6841,6 +6882,9 @@ while (*s) argv[0], argv[1], status, expand_string_message); goto EXPAND_FAILED; } + + if (result) yield = string_cat(yield, result); + break; } #endif /* EXPAND_DLFUNC */ @@ -6853,10 +6897,10 @@ while (*s) goto EXPAND_FAILED; key = expand_string_internal(s+1, TRUE, &s, skipping, TRUE, &resetok); - if (!key) goto EXPAND_FAILED; /*{*/ + if (!key) goto EXPAND_FAILED; /*{{*/ if (*s++ != '}') { - expand_string_message = US"missing '{' for name arg of env"; + expand_string_message = US"missing '}' for name arg of env"; goto EXPAND_FAILED_CURLY; } @@ -6874,7 +6918,8 @@ while (*s) case 1: goto EXPAND_FAILED; /* when all is well, the */ case 2: goto EXPAND_FAILED_CURLY; /* returned value is 0 */ } - continue; + if (skipping) continue; + break; } #ifdef SUPPORT_SRS @@ -6955,10 +7000,25 @@ while (*s) /* @$original_domain */ yield = string_catn(yield, US"@", 1); yield = string_cat(yield, sub[2]); - continue; + + if (skipping) continue; + break; } #endif /*SUPPORT_SRS*/ + + default: + goto NOT_ITEM; } /* EITEM_* switch */ + /*NOTREACHED*/ + + DEBUG(D_expand) + if (yield && (start > 0 || *s)) /* only if not the sole expansion of the line */ + debug_expansion_interim(US"item-res", + yield->s + start, yield->ptr - start, skipping); + continue; + +NOT_ITEM: ; + } /* Control reaches here if the name is not recognized as one of the more complicated expansion items. Check for the "operator" syntax (name terminated @@ -6968,10 +7028,9 @@ while (*s) if (*s == ':') { int c; - uschar *arg = NULL; - uschar *sub; + uschar * arg = NULL, * sub; #ifndef DISABLE_TLS - var_entry *vp = NULL; + var_entry * vp = NULL; #endif /* Owing to an historical mis-design, an underscore may be part of the @@ -7005,7 +7064,7 @@ while (*s) FALSE, &resetok); if (!sub) goto EXPAND_FAILED; /*{*/ if (*s1 != '}') - { + { /*{*/ expand_string_message = string_sprintf("missing '}' closing cert arg of %s", name); goto EXPAND_FAILED_CURLY; @@ -7034,139 +7093,128 @@ while (*s) if (skipping && c >= 0) continue; - /* Otherwise, switch on the operator type */ + /* Otherwise, switch on the operator type. After handling go back + to the main loop top. */ - switch(c) + { + int start = yield->ptr; + switch(c) { case EOP_BASE32: { - uschar *t; - unsigned long int n = Ustrtoul(sub, &t, 10); + uschar *t; + unsigned long int n = Ustrtoul(sub, &t, 10); gstring * g = NULL; - if (*t != 0) - { - expand_string_message = string_sprintf("argument for base32 " - "operator is \"%s\", which is not a decimal number", sub); - goto EXPAND_FAILED; - } + if (*t != 0) + { + expand_string_message = string_sprintf("argument for base32 " + "operator is \"%s\", which is not a decimal number", sub); + goto EXPAND_FAILED; + } for ( ; n; n >>= 5) g = string_catn(g, &base32_chars[n & 0x1f], 1); if (g) while (g->ptr > 0) yield = string_catn(yield, &g->s[--g->ptr], 1); - continue; + break; } case EOP_BASE32D: - { - uschar *tt = sub; - unsigned long int n = 0; - while (*tt) - { - uschar * t = Ustrchr(base32_chars, *tt++); - if (!t) - { - expand_string_message = string_sprintf("argument for base32d " - "operator is \"%s\", which is not a base 32 number", sub); - goto EXPAND_FAILED; - } - n = n * 32 + (t - base32_chars); - } - yield = string_fmt_append(yield, "%ld", n); - continue; - } - - case EOP_BASE62: - { - uschar *t; - unsigned long int n = Ustrtoul(sub, &t, 10); - if (*t != 0) - { - expand_string_message = string_sprintf("argument for base62 " - "operator is \"%s\", which is not a decimal number", sub); - goto EXPAND_FAILED; - } - yield = string_cat(yield, string_base62(n)); - continue; - } + { + uschar *tt = sub; + unsigned long int n = 0; + while (*tt) + { + uschar * t = Ustrchr(base32_chars, *tt++); + if (!t) + { + expand_string_message = string_sprintf("argument for base32d " + "operator is \"%s\", which is not a base 32 number", sub); + goto EXPAND_FAILED; + } + n = n * 32 + (t - base32_chars); + } + yield = string_fmt_append(yield, "%ld", n); + break; + } + + case EOP_BASE62: + { + uschar *t; + unsigned long int n = Ustrtoul(sub, &t, 10); + if (*t != 0) + { + expand_string_message = string_sprintf("argument for base62 " + "operator is \"%s\", which is not a decimal number", sub); + goto EXPAND_FAILED; + } + yield = string_cat(yield, string_base62(n)); + break; + } /* Note that for Darwin and Cygwin, BASE_62 actually has the value 36 */ case EOP_BASE62D: - { - uschar *tt = sub; - unsigned long int n = 0; - while (*tt != 0) - { - uschar *t = Ustrchr(base62_chars, *tt++); - if (!t) - { - expand_string_message = string_sprintf("argument for base62d " - "operator is \"%s\", which is not a base %d number", sub, - BASE_62); - goto EXPAND_FAILED; - } - n = n * BASE_62 + (t - base62_chars); - } - yield = string_fmt_append(yield, "%ld", n); - continue; - } - - case EOP_BLESS: - /* This is purely for the convenience of the test harness. Do not enable - it otherwise as it defeats the taint-checking security. */ - - if (f.running_in_test_harness) - yield = string_cat(yield, is_tainted(sub) - ? string_copy_taint(sub, FALSE) : sub); - else + { + uschar *tt = sub; + unsigned long int n = 0; + while (*tt != 0) { - DEBUG(D_expand) debug_printf_indent("bless operator not supported\n"); - yield = string_cat(yield, sub); + uschar *t = Ustrchr(base62_chars, *tt++); + if (!t) + { + expand_string_message = string_sprintf("argument for base62d " + "operator is \"%s\", which is not a base %d number", sub, + BASE_62); + goto EXPAND_FAILED; + } + n = n * BASE_62 + (t - base62_chars); } - continue; + yield = string_fmt_append(yield, "%ld", n); + break; + } case EOP_EXPAND: - { - uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping, TRUE, &resetok); - if (!expanded) - { - expand_string_message = - string_sprintf("internal expansion of \"%s\" failed: %s", sub, - expand_string_message); - goto EXPAND_FAILED; - } - yield = string_cat(yield, expanded); - continue; - } + { + uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping, TRUE, &resetok); + if (!expanded) + { + expand_string_message = + string_sprintf("internal expansion of \"%s\" failed: %s", sub, + expand_string_message); + goto EXPAND_FAILED; + } + yield = string_cat(yield, expanded); + break; + } case EOP_LC: - { - int count = 0; - uschar *t = sub - 1; - while (*(++t) != 0) { *t = tolower(*t); count++; } - yield = string_catn(yield, sub, count); - continue; - } + { + int count = 0; + uschar *t = sub - 1; + while (*(++t) != 0) { *t = tolower(*t); count++; } + yield = string_catn(yield, sub, count); + break; + } case EOP_UC: - { - int count = 0; - uschar *t = sub - 1; - while (*(++t) != 0) { *t = toupper(*t); count++; } - yield = string_catn(yield, sub, count); - continue; - } + { + int count = 0; + uschar *t = sub - 1; + while (*(++t) != 0) { *t = toupper(*t); count++; } + yield = string_catn(yield, sub, count); + break; + } case EOP_MD5: -#ifndef DISABLE_TLS + #ifndef DISABLE_TLS if (vp && *(void **)vp->value) { uschar * cp = tls_cert_fprt_md5(*(void **)vp->value); yield = string_cat(yield, cp); } else -#endif + #endif { md5 base; uschar digest[16]; @@ -7175,17 +7223,17 @@ while (*s) for (int j = 0; j < 16; j++) yield = string_fmt_append(yield, "%02x", digest[j]); } - continue; + break; case EOP_SHA1: -#ifndef DISABLE_TLS + #ifndef DISABLE_TLS if (vp && *(void **)vp->value) { uschar * cp = tls_cert_fprt_sha1(*(void **)vp->value); yield = string_cat(yield, cp); } else -#endif + #endif { hctx h; uschar digest[20]; @@ -7194,11 +7242,11 @@ while (*s) for (int j = 0; j < 20; j++) yield = string_fmt_append(yield, "%02X", digest[j]); } - continue; + break; case EOP_SHA2: case EOP_SHA256: -#ifdef EXIM_HAVE_SHA2 + #ifdef EXIM_HAVE_SHA2 if (vp && *(void **)vp->value) if (c == EOP_SHA256) yield = string_cat(yield, tls_cert_fprt_sha256(*(void **)vp->value)); @@ -7225,13 +7273,13 @@ while (*s) while (b.len-- > 0) yield = string_fmt_append(yield, "%02X", *b.data++); } -#else + #else expand_string_message = US"sha256 only supported with TLS"; -#endif - continue; + #endif + break; case EOP_SHA3: -#ifdef EXIM_HAVE_SHA3 + #ifdef EXIM_HAVE_SHA3 { hctx h; blob b; @@ -7253,84 +7301,84 @@ while (*s) while (b.len-- > 0) yield = string_fmt_append(yield, "%02X", *b.data++); } - continue; -#else + break; + #else expand_string_message = US"sha3 only supported with GnuTLS 3.5.0 + or OpenSSL 1.1.1 +"; goto EXPAND_FAILED; -#endif + #endif /* Convert hex encoding to base64 encoding */ case EOP_HEX2B64: - { - int c = 0; - int b = -1; - uschar *in = sub; - uschar *out = sub; - uschar *enc; + { + int c = 0; + int b = -1; + uschar *in = sub; + uschar *out = sub; + uschar *enc; - for (enc = sub; *enc; enc++) - { - if (!isxdigit(*enc)) - { - expand_string_message = string_sprintf("\"%s\" is not a hex " - "string", sub); - goto EXPAND_FAILED; - } - c++; - } + for (enc = sub; *enc; enc++) + { + if (!isxdigit(*enc)) + { + expand_string_message = string_sprintf("\"%s\" is not a hex " + "string", sub); + goto EXPAND_FAILED; + } + c++; + } - if ((c & 1) != 0) - { - expand_string_message = string_sprintf("\"%s\" contains an odd " - "number of characters", sub); - goto EXPAND_FAILED; - } + if ((c & 1) != 0) + { + expand_string_message = string_sprintf("\"%s\" contains an odd " + "number of characters", sub); + goto EXPAND_FAILED; + } - while ((c = *in++) != 0) - { - if (isdigit(c)) c -= '0'; - else c = toupper(c) - 'A' + 10; - if (b == -1) - b = c << 4; - else - { - *out++ = b | c; - b = -1; - } - } + while ((c = *in++) != 0) + { + if (isdigit(c)) c -= '0'; + else c = toupper(c) - 'A' + 10; + if (b == -1) + b = c << 4; + else + { + *out++ = b | c; + b = -1; + } + } - enc = b64encode(CUS sub, out - sub); - yield = string_cat(yield, enc); - continue; - } + enc = b64encode(CUS sub, out - sub); + yield = string_cat(yield, enc); + break; + } /* Convert octets outside 0x21..0x7E to \xXX form */ case EOP_HEXQUOTE: { - uschar *t = sub - 1; - while (*(++t) != 0) - { - if (*t < 0x21 || 0x7E < *t) - yield = string_fmt_append(yield, "\\x%02x", *t); + uschar *t = sub - 1; + while (*(++t) != 0) + { + if (*t < 0x21 || 0x7E < *t) + yield = string_fmt_append(yield, "\\x%02x", *t); else yield = string_catn(yield, t, 1); - } - continue; + } + break; } /* count the number of list elements */ case EOP_LISTCOUNT: - { + { int cnt = 0, sep = 0; uschar * buf = store_get(2, is_tainted(sub)); while (string_nextinlist(CUSS &sub, &sep, buf, 1)) cnt++; yield = string_fmt_append(yield, "%d", cnt); - continue; - } + break; + } /* expand a named list given the name */ /* handles nested named lists; requotes as colon-sep list */ @@ -7340,7 +7388,7 @@ while (*s) yield = expand_listnamed(yield, sub, arg); if (expand_string_message) goto EXPAND_FAILED; - continue; + break; /* quote a list-item for the given list-separator */ @@ -7348,54 +7396,65 @@ while (*s) ${mask:131.111.10.206/28} is 131.111.10.192/28. */ case EOP_MASK: - { - int count; - uschar *endptr; - int binary[4]; - int mask, maskoffset; - int type = string_is_ip_address(sub, &maskoffset); - uschar buffer[64]; - - if (type == 0) - { - expand_string_message = string_sprintf("\"%s\" is not an IP address", - sub); - goto EXPAND_FAILED; - } + { + int count; + uschar *endptr; + int binary[4]; + int type, mask, maskoffset; + BOOL normalised; + uschar buffer[64]; - if (maskoffset == 0) - { - expand_string_message = string_sprintf("missing mask value in \"%s\"", - sub); - goto EXPAND_FAILED; - } + if ((type = string_is_ip_address(sub, &maskoffset)) == 0) + { + expand_string_message = string_sprintf("\"%s\" is not an IP address", + sub); + goto EXPAND_FAILED; + } - mask = Ustrtol(sub + maskoffset + 1, &endptr, 10); + if (maskoffset == 0) + { + expand_string_message = string_sprintf("missing mask value in \"%s\"", + sub); + goto EXPAND_FAILED; + } - if (*endptr != 0 || mask < 0 || mask > ((type == 4)? 32 : 128)) - { - expand_string_message = string_sprintf("mask value too big in \"%s\"", - sub); - goto EXPAND_FAILED; - } + mask = Ustrtol(sub + maskoffset + 1, &endptr, 10); + + if (*endptr || mask < 0 || mask > (type == 4 ? 32 : 128)) + { + expand_string_message = string_sprintf("mask value too big in \"%s\"", + sub); + goto EXPAND_FAILED; + } - /* Convert the address to binary integer(s) and apply the mask */ + /* If an optional 'n' was given, ipv6 gets normalised output: + colons rather than dots, and zero-compressed. */ - sub[maskoffset] = 0; - count = host_aton(sub, binary); - host_mask(count, binary, mask); + normalised = arg && *arg == 'n'; - /* Convert to masked textual format and add to output. */ + /* Convert the address to binary integer(s) and apply the mask */ - yield = string_catn(yield, buffer, - host_nmtoa(count, binary, mask, buffer, '.')); - continue; - } + sub[maskoffset] = 0; + count = host_aton(sub, binary); + host_mask(count, binary, mask); + + /* Convert to masked textual format and add to output. */ + + if (type == 4 || !normalised) + yield = string_catn(yield, buffer, + host_nmtoa(count, binary, mask, buffer, '.')); + else + { + ipv6_nmtoa(binary, buffer); + yield = string_fmt_append(yield, "%s/%d", buffer, mask); + } + break; + } case EOP_IPV6NORM: case EOP_IPV6DENORM: { - int type = string_is_ip_address(sub, NULL); + int type = string_is_ip_address(sub, NULL); int binary[4]; uschar buffer[44]; @@ -7421,94 +7480,94 @@ while (*s) ? ipv6_nmtoa(binary, buffer) : host_nmtoa(4, binary, -1, buffer, ':') ); - continue; + break; } case EOP_ADDRESS: case EOP_LOCAL_PART: case EOP_DOMAIN: - { - uschar * error; - int start, end, domain; - uschar * t = parse_extract_address(sub, &error, &start, &end, &domain, - FALSE); - if (t) + { + uschar * error; + int start, end, domain; + uschar * t = parse_extract_address(sub, &error, &start, &end, &domain, + FALSE); + if (t) if (c != EOP_DOMAIN) yield = c == EOP_LOCAL_PART && domain > 0 ? string_catn(yield, t, domain - 1) : string_cat(yield, t); else if (domain > 0) yield = string_cat(yield, t + domain); - continue; - } + break; + } case EOP_ADDRESSES: - { - uschar outsep[2] = { ':', '\0' }; - uschar *address, *error; - int save_ptr = gstring_length(yield); - int start, end, domain; /* Not really used */ + { + uschar outsep[2] = { ':', '\0' }; + uschar *address, *error; + int save_ptr = gstring_length(yield); + int start, end, domain; /* Not really used */ if (Uskip_whitespace(&sub) == '>') - if (*outsep = *++sub) ++sub; - else + if (*outsep = *++sub) ++sub; + else { - expand_string_message = string_sprintf("output separator " - "missing in expanding ${addresses:%s}", --sub); - goto EXPAND_FAILED; - } - f.parse_allow_group = TRUE; + expand_string_message = string_sprintf("output separator " + "missing in expanding ${addresses:%s}", --sub); + goto EXPAND_FAILED; + } + f.parse_allow_group = TRUE; - for (;;) - { - uschar * p = parse_find_address_end(sub, FALSE); - uschar saveend = *p; - *p = '\0'; - address = parse_extract_address(sub, &error, &start, &end, &domain, - FALSE); - *p = saveend; - - /* Add the address to the output list that we are building. This is - done in chunks by searching for the separator character. At the - start, unless we are dealing with the first address of the output - list, add in a space if the new address begins with the separator - character, or is an empty string. */ - - if (address) - { - if (yield && yield->ptr != save_ptr && address[0] == *outsep) - yield = string_catn(yield, US" ", 1); + for (;;) + { + uschar * p = parse_find_address_end(sub, FALSE); + uschar saveend = *p; + *p = '\0'; + address = parse_extract_address(sub, &error, &start, &end, &domain, + FALSE); + *p = saveend; + + /* Add the address to the output list that we are building. This is + done in chunks by searching for the separator character. At the + start, unless we are dealing with the first address of the output + list, add in a space if the new address begins with the separator + character, or is an empty string. */ + + if (address) + { + if (yield && yield->ptr != save_ptr && address[0] == *outsep) + yield = string_catn(yield, US" ", 1); - for (;;) - { - size_t seglen = Ustrcspn(address, outsep); - yield = string_catn(yield, address, seglen + 1); + for (;;) + { + size_t seglen = Ustrcspn(address, outsep); + yield = string_catn(yield, address, seglen + 1); - /* If we got to the end of the string we output one character - too many. */ + /* If we got to the end of the string we output one character + too many. */ - if (address[seglen] == '\0') { yield->ptr--; break; } - yield = string_catn(yield, outsep, 1); - address += seglen + 1; - } + if (address[seglen] == '\0') { yield->ptr--; break; } + yield = string_catn(yield, outsep, 1); + address += seglen + 1; + } - /* Output a separator after the string: we will remove the - redundant final one at the end. */ + /* Output a separator after the string: we will remove the + redundant final one at the end. */ - yield = string_catn(yield, outsep, 1); - } + yield = string_catn(yield, outsep, 1); + } - if (saveend == '\0') break; - sub = p + 1; - } + if (saveend == '\0') break; + sub = p + 1; + } - /* If we have generated anything, remove the redundant final - separator. */ + /* If we have generated anything, remove the redundant final + separator. */ - if (yield && yield->ptr != save_ptr) yield->ptr--; - f.parse_allow_group = FALSE; - continue; - } + if (yield && yield->ptr != save_ptr) yield->ptr--; + f.parse_allow_group = FALSE; + break; + } /* quote puts a string in quotes if it is empty or contains anything @@ -7522,582 +7581,593 @@ while (*s) case EOP_QUOTE: case EOP_QUOTE_LOCAL_PART: - if (!arg) - { - BOOL needs_quote = (!*sub); /* TRUE for empty string */ - uschar *t = sub - 1; + if (!arg) + { + BOOL needs_quote = (!*sub); /* TRUE for empty string */ + uschar *t = sub - 1; - if (c == EOP_QUOTE) - while (!needs_quote && *++t) - needs_quote = !isalnum(*t) && !strchr("_-.", *t); + if (c == EOP_QUOTE) + while (!needs_quote && *++t) + needs_quote = !isalnum(*t) && !strchr("_-.", *t); - else /* EOP_QUOTE_LOCAL_PART */ - while (!needs_quote && *++t) - needs_quote = !isalnum(*t) - && strchr("!#$%&'*+-/=?^_`{|}~", *t) == NULL - && (*t != '.' || t == sub || !t[1]); + else /* EOP_QUOTE_LOCAL_PART */ + while (!needs_quote && *++t) + needs_quote = !isalnum(*t) + && strchr("!#$%&'*+-/=?^_`{|}~", *t) == NULL + && (*t != '.' || t == sub || !t[1]); - if (needs_quote) - { - yield = string_catn(yield, US"\"", 1); - t = sub - 1; - while (*++t) - if (*t == '\n') - yield = string_catn(yield, US"\\n", 2); - else if (*t == '\r') - yield = string_catn(yield, US"\\r", 2); - else - { - if (*t == '\\' || *t == '"') - yield = string_catn(yield, US"\\", 1); - yield = string_catn(yield, t, 1); - } - yield = string_catn(yield, US"\"", 1); - } - else - yield = string_cat(yield, sub); - continue; - } + if (needs_quote) + { + yield = string_catn(yield, US"\"", 1); + t = sub - 1; + while (*++t) + if (*t == '\n') + yield = string_catn(yield, US"\\n", 2); + else if (*t == '\r') + yield = string_catn(yield, US"\\r", 2); + else + { + if (*t == '\\' || *t == '"') + yield = string_catn(yield, US"\\", 1); + yield = string_catn(yield, t, 1); + } + yield = string_catn(yield, US"\"", 1); + } + else + yield = string_cat(yield, sub); + break; + } - /* quote_lookuptype does lookup-specific quoting */ + /* quote_lookuptype does lookup-specific quoting */ - else - { - int n; - uschar *opt = Ustrchr(arg, '_'); + else + { + int n; + uschar * opt = Ustrchr(arg, '_'); - if (opt) *opt++ = 0; + if (opt) *opt++ = 0; - if ((n = search_findtype(arg, Ustrlen(arg))) < 0) - { - expand_string_message = search_error_message; - goto EXPAND_FAILED; - } + if ((n = search_findtype(arg, Ustrlen(arg))) < 0) + { + expand_string_message = search_error_message; + goto EXPAND_FAILED; + } if (lookup_list[n]->quote) sub = (lookup_list[n]->quote)(sub, opt); else if (opt) sub = NULL; - if (!sub) - { - expand_string_message = string_sprintf( - "\"%s\" unrecognized after \"${quote_%s\"", - opt, arg); - goto EXPAND_FAILED; - } + if (!sub) + { + expand_string_message = string_sprintf( + "\"%s\" unrecognized after \"${quote_%s\"", /*}*/ + opt, arg); + goto EXPAND_FAILED; + } - yield = string_cat(yield, sub); - continue; - } + yield = string_cat(yield, sub); + break; + } - /* rx quote sticks in \ before any non-alphameric character so that - the insertion works in a regular expression. */ + /* rx quote sticks in \ before any non-alphameric character so that + the insertion works in a regular expression. */ - case EOP_RXQUOTE: - { - uschar *t = sub - 1; - while (*(++t) != 0) - { - if (!isalnum(*t)) - yield = string_catn(yield, US"\\", 1); - yield = string_catn(yield, t, 1); - } - continue; - } + case EOP_RXQUOTE: + { + uschar *t = sub - 1; + while (*(++t) != 0) + { + if (!isalnum(*t)) + yield = string_catn(yield, US"\\", 1); + yield = string_catn(yield, t, 1); + } + break; + } - /* RFC 2047 encodes, assuming headers_charset (default ISO 8859-1) as - prescribed by the RFC, if there are characters that need to be encoded */ + /* RFC 2047 encodes, assuming headers_charset (default ISO 8859-1) as + prescribed by the RFC, if there are characters that need to be encoded */ - case EOP_RFC2047: - yield = string_cat(yield, - parse_quote_2047(sub, Ustrlen(sub), headers_charset, - FALSE)); - continue; + case EOP_RFC2047: + yield = string_cat(yield, + parse_quote_2047(sub, Ustrlen(sub), headers_charset, + FALSE)); + break; - /* RFC 2047 decode */ + /* RFC 2047 decode */ - case EOP_RFC2047D: - { - int len; - uschar *error; - uschar *decoded = rfc2047_decode(sub, check_rfc2047_length, - headers_charset, '?', &len, &error); - if (error) - { - expand_string_message = error; - goto EXPAND_FAILED; - } - yield = string_catn(yield, decoded, len); - continue; - } + case EOP_RFC2047D: + { + int len; + uschar *error; + uschar *decoded = rfc2047_decode(sub, check_rfc2047_length, + headers_charset, '?', &len, &error); + if (error) + { + expand_string_message = error; + goto EXPAND_FAILED; + } + yield = string_catn(yield, decoded, len); + break; + } - /* from_utf8 converts UTF-8 to 8859-1, turning non-existent chars into - underscores */ + /* from_utf8 converts UTF-8 to 8859-1, turning non-existent chars into + underscores */ - case EOP_FROM_UTF8: - { - uschar * buff = store_get(4, is_tainted(sub)); - while (*sub) - { - int c; - GETUTF8INC(c, sub); - if (c > 255) c = '_'; - buff[0] = c; - yield = string_catn(yield, buff, 1); - } - continue; - } - - /* replace illegal UTF-8 sequences by replacement character */ - - #define UTF8_REPLACEMENT_CHAR US"?" - - case EOP_UTF8CLEAN: - { - int seq_len = 0, index = 0; - int bytes_left = 0; - long codepoint = -1; - int complete; - uschar seq_buff[4]; /* accumulate utf-8 here */ - - /* Manually track tainting, as we deal in individual chars below */ + case EOP_FROM_UTF8: + { + uschar * buff = store_get(4, is_tainted(sub)); + while (*sub) + { + int c; + GETUTF8INC(c, sub); + if (c > 255) c = '_'; + buff[0] = c; + yield = string_catn(yield, buff, 1); + } + break; + } - if (is_tainted(sub)) - if (yield->s && yield->ptr) - gstring_rebuffer(yield); - else - yield->s = store_get(yield->size = Ustrlen(sub), TRUE); + /* replace illegal UTF-8 sequences by replacement character */ - /* Check the UTF-8, byte-by-byte */ + #define UTF8_REPLACEMENT_CHAR US"?" - while (*sub) + case EOP_UTF8CLEAN: { - complete = 0; - uschar c = *sub++; + int seq_len = 0, index = 0; + int bytes_left = 0; + long codepoint = -1; + int complete; + uschar seq_buff[4]; /* accumulate utf-8 here */ + + /* Manually track tainting, as we deal in individual chars below */ - if (bytes_left) + if (is_tainted(sub)) { - if ((c & 0xc0) != 0x80) - /* wrong continuation byte; invalidate all bytes */ - complete = 1; /* error */ + if (yield->s && yield->ptr) + gstring_rebuffer(yield); else - { - codepoint = (codepoint << 6) | (c & 0x3f); - seq_buff[index++] = c; - if (--bytes_left == 0) /* codepoint complete */ - if(codepoint > 0x10FFFF) /* is it too large? */ - complete = -1; /* error (RFC3629 limit) */ - else - { /* finished; output utf-8 sequence */ - yield = string_catn(yield, seq_buff, seq_len); - index = 0; - } - } + yield->s = store_get(yield->size = Ustrlen(sub), is_tainted(sub)); } - else /* no bytes left: new sequence */ + + /* Check the UTF-8, byte-by-byte */ + + while (*sub) { - if(!(c & 0x80)) /* 1-byte sequence, US-ASCII, keep it */ - { - yield = string_catn(yield, &c, 1); - continue; - } - if((c & 0xe0) == 0xc0) /* 2-byte sequence */ + complete = 0; + uschar c = *sub++; + + if (bytes_left) { - if(c == 0xc0 || c == 0xc1) /* 0xc0 and 0xc1 are illegal */ - complete = -1; + if ((c & 0xc0) != 0x80) + /* wrong continuation byte; invalidate all bytes */ + complete = 1; /* error */ else { - bytes_left = 1; - codepoint = c & 0x1f; + codepoint = (codepoint << 6) | (c & 0x3f); + seq_buff[index++] = c; + if (--bytes_left == 0) /* codepoint complete */ + if(codepoint > 0x10FFFF) /* is it too large? */ + complete = -1; /* error (RFC3629 limit) */ + else + { /* finished; output utf-8 sequence */ + yield = string_catn(yield, seq_buff, seq_len); + index = 0; + } } } - else if((c & 0xf0) == 0xe0) /* 3-byte sequence */ + else /* no bytes left: new sequence */ { - bytes_left = 2; - codepoint = c & 0x0f; - } - else if((c & 0xf8) == 0xf0) /* 4-byte sequence */ + if(!(c & 0x80)) /* 1-byte sequence, US-ASCII, keep it */ + { + yield = string_catn(yield, &c, 1); + continue; + } + if((c & 0xe0) == 0xc0) /* 2-byte sequence */ + { + if(c == 0xc0 || c == 0xc1) /* 0xc0 and 0xc1 are illegal */ + complete = -1; + else + { + bytes_left = 1; + codepoint = c & 0x1f; + } + } + else if((c & 0xf0) == 0xe0) /* 3-byte sequence */ + { + bytes_left = 2; + codepoint = c & 0x0f; + } + else if((c & 0xf8) == 0xf0) /* 4-byte sequence */ + { + bytes_left = 3; + codepoint = c & 0x07; + } + else /* invalid or too long (RFC3629 allows only 4 bytes) */ + complete = -1; + + seq_buff[index++] = c; + seq_len = bytes_left + 1; + } /* if(bytes_left) */ + + if (complete != 0) { - bytes_left = 3; - codepoint = c & 0x07; + bytes_left = index = 0; + yield = string_catn(yield, UTF8_REPLACEMENT_CHAR, 1); } - else /* invalid or too long (RFC3629 allows only 4 bytes) */ - complete = -1; + if ((complete == 1) && ((c & 0x80) == 0)) + /* ASCII character follows incomplete sequence */ + yield = string_catn(yield, &c, 1); + } + /* If given a sequence truncated mid-character, we also want to report ? + Eg, ${length_1:フィル} is one byte, not one character, so we expect + ${utf8clean:${length_1:フィル}} to yield '?' */ + + if (bytes_left != 0) + yield = string_catn(yield, UTF8_REPLACEMENT_CHAR, 1); - seq_buff[index++] = c; - seq_len = bytes_left + 1; - } /* if(bytes_left) */ + break; + } - if (complete != 0) + #ifdef SUPPORT_I18N + case EOP_UTF8_DOMAIN_TO_ALABEL: + { + uschar * error = NULL; + uschar * s = string_domain_utf8_to_alabel(sub, &error); + if (error) { - bytes_left = index = 0; - yield = string_catn(yield, UTF8_REPLACEMENT_CHAR, 1); + expand_string_message = string_sprintf( + "error converting utf8 (%s) to alabel: %s", + string_printing(sub), error); + goto EXPAND_FAILED; } - if ((complete == 1) && ((c & 0x80) == 0)) - /* ASCII character follows incomplete sequence */ - yield = string_catn(yield, &c, 1); + yield = string_cat(yield, s); + break; } - /* If given a sequence truncated mid-character, we also want to report ? - * Eg, ${length_1:フィル} is one byte, not one character, so we expect - * ${utf8clean:${length_1:フィル}} to yield '?' */ - if (bytes_left != 0) - yield = string_catn(yield, UTF8_REPLACEMENT_CHAR, 1); - - continue; - } -#ifdef SUPPORT_I18N - case EOP_UTF8_DOMAIN_TO_ALABEL: - { - uschar * error = NULL; - uschar * s = string_domain_utf8_to_alabel(sub, &error); - if (error) + case EOP_UTF8_DOMAIN_FROM_ALABEL: { - expand_string_message = string_sprintf( - "error converting utf8 (%s) to alabel: %s", - string_printing(sub), error); - goto EXPAND_FAILED; + uschar * error = NULL; + uschar * s = string_domain_alabel_to_utf8(sub, &error); + if (error) + { + expand_string_message = string_sprintf( + "error converting alabel (%s) to utf8: %s", + string_printing(sub), error); + goto EXPAND_FAILED; + } + yield = string_cat(yield, s); + break; } - yield = string_cat(yield, s); - continue; - } - case EOP_UTF8_DOMAIN_FROM_ALABEL: - { - uschar * error = NULL; - uschar * s = string_domain_alabel_to_utf8(sub, &error); - if (error) + case EOP_UTF8_LOCALPART_TO_ALABEL: { - expand_string_message = string_sprintf( - "error converting alabel (%s) to utf8: %s", - string_printing(sub), error); - goto EXPAND_FAILED; + uschar * error = NULL; + uschar * s = string_localpart_utf8_to_alabel(sub, &error); + if (error) + { + expand_string_message = string_sprintf( + "error converting utf8 (%s) to alabel: %s", + string_printing(sub), error); + goto EXPAND_FAILED; + } + yield = string_cat(yield, s); + DEBUG(D_expand) debug_printf_indent("yield: '%s'\n", yield->s); + break; } - yield = string_cat(yield, s); - continue; - } - case EOP_UTF8_LOCALPART_TO_ALABEL: - { - uschar * error = NULL; - uschar * s = string_localpart_utf8_to_alabel(sub, &error); - if (error) + case EOP_UTF8_LOCALPART_FROM_ALABEL: { - expand_string_message = string_sprintf( - "error converting utf8 (%s) to alabel: %s", - string_printing(sub), error); - goto EXPAND_FAILED; + uschar * error = NULL; + uschar * s = string_localpart_alabel_to_utf8(sub, &error); + if (error) + { + expand_string_message = string_sprintf( + "error converting alabel (%s) to utf8: %s", + string_printing(sub), error); + goto EXPAND_FAILED; + } + yield = string_cat(yield, s); + break; } - yield = string_cat(yield, s); - DEBUG(D_expand) debug_printf_indent("yield: '%s'\n", yield->s); - continue; - } + #endif /* EXPERIMENTAL_INTERNATIONAL */ - case EOP_UTF8_LOCALPART_FROM_ALABEL: - { - uschar * error = NULL; - uschar * s = string_localpart_alabel_to_utf8(sub, &error); - if (error) + /* escape turns all non-printing characters into escape sequences. */ + + case EOP_ESCAPE: { - expand_string_message = string_sprintf( - "error converting alabel (%s) to utf8: %s", - string_printing(sub), error); - goto EXPAND_FAILED; + const uschar * t = string_printing(sub); + yield = string_cat(yield, t); + break; } - yield = string_cat(yield, s); - continue; - } -#endif /* EXPERIMENTAL_INTERNATIONAL */ - /* escape turns all non-printing characters into escape sequences. */ - - case EOP_ESCAPE: - { - const uschar * t = string_printing(sub); - yield = string_cat(yield, t); - continue; - } + case EOP_ESCAPE8BIT: + { + uschar c; - case EOP_ESCAPE8BIT: - { - uschar c; + for (const uschar * s = sub; (c = *s); s++) + yield = c < 127 && c != '\\' + ? string_catn(yield, s, 1) + : string_fmt_append(yield, "\\%03o", c); + break; + } - for (const uschar * s = sub; (c = *s); s++) - yield = c < 127 && c != '\\' - ? string_catn(yield, s, 1) - : string_fmt_append(yield, "\\%03o", c); - continue; - } + /* Handle numeric expression evaluation */ - /* Handle numeric expression evaluation */ + case EOP_EVAL: + case EOP_EVAL10: + { + uschar *save_sub = sub; + uschar *error = NULL; + int_eximarith_t n = eval_expr(&sub, (c == EOP_EVAL10), &error, FALSE); + if (error) + { + expand_string_message = string_sprintf("error in expression " + "evaluation: %s (after processing \"%.*s\")", error, + (int)(sub-save_sub), save_sub); + goto EXPAND_FAILED; + } + yield = string_fmt_append(yield, PR_EXIM_ARITH, n); + break; + } - case EOP_EVAL: - case EOP_EVAL10: - { - uschar *save_sub = sub; - uschar *error = NULL; - int_eximarith_t n = eval_expr(&sub, (c == EOP_EVAL10), &error, FALSE); - if (error) - { - expand_string_message = string_sprintf("error in expression " - "evaluation: %s (after processing \"%.*s\")", error, - (int)(sub-save_sub), save_sub); - goto EXPAND_FAILED; - } - yield = string_fmt_append(yield, PR_EXIM_ARITH, n); - continue; - } + /* Handle time period formatting */ - /* Handle time period formatting */ + case EOP_TIME_EVAL: + { + int n = readconf_readtime(sub, 0, FALSE); + if (n < 0) + { + expand_string_message = string_sprintf("string \"%s\" is not an " + "Exim time interval in \"%s\" operator", sub, name); + goto EXPAND_FAILED; + } + yield = string_fmt_append(yield, "%d", n); + break; + } - case EOP_TIME_EVAL: - { - int n = readconf_readtime(sub, 0, FALSE); - if (n < 0) - { - expand_string_message = string_sprintf("string \"%s\" is not an " - "Exim time interval in \"%s\" operator", sub, name); - goto EXPAND_FAILED; - } - yield = string_fmt_append(yield, "%d", n); - continue; - } + case EOP_TIME_INTERVAL: + { + int n; + uschar *t = read_number(&n, sub); + if (*t != 0) /* Not A Number*/ + { + expand_string_message = string_sprintf("string \"%s\" is not a " + "positive number in \"%s\" operator", sub, name); + goto EXPAND_FAILED; + } + t = readconf_printtime(n); + yield = string_cat(yield, t); + break; + } - case EOP_TIME_INTERVAL: - { - int n; - uschar *t = read_number(&n, sub); - if (*t != 0) /* Not A Number*/ - { - expand_string_message = string_sprintf("string \"%s\" is not a " - "positive number in \"%s\" operator", sub, name); - goto EXPAND_FAILED; - } - t = readconf_printtime(n); - yield = string_cat(yield, t); - continue; - } + /* Convert string to base64 encoding */ - /* Convert string to base64 encoding */ + case EOP_STR2B64: + case EOP_BASE64: + { + #ifndef DISABLE_TLS + uschar * s = vp && *(void **)vp->value + ? tls_cert_der_b64(*(void **)vp->value) + : b64encode(CUS sub, Ustrlen(sub)); + #else + uschar * s = b64encode(CUS sub, Ustrlen(sub)); + #endif + yield = string_cat(yield, s); + break; + } - case EOP_STR2B64: - case EOP_BASE64: - { -#ifndef DISABLE_TLS - uschar * s = vp && *(void **)vp->value - ? tls_cert_der_b64(*(void **)vp->value) - : b64encode(CUS sub, Ustrlen(sub)); -#else - uschar * s = b64encode(CUS sub, Ustrlen(sub)); -#endif - yield = string_cat(yield, s); - continue; - } + case EOP_BASE64D: + { + uschar * s; + int len = b64decode(sub, &s); + if (len < 0) + { + expand_string_message = string_sprintf("string \"%s\" is not " + "well-formed for \"%s\" operator", sub, name); + goto EXPAND_FAILED; + } + yield = string_cat(yield, s); + break; + } - case EOP_BASE64D: - { - uschar * s; - int len = b64decode(sub, &s); - if (len < 0) - { - expand_string_message = string_sprintf("string \"%s\" is not " - "well-formed for \"%s\" operator", sub, name); - goto EXPAND_FAILED; - } - yield = string_cat(yield, s); - continue; - } + /* strlen returns the length of the string */ - /* strlen returns the length of the string */ + case EOP_STRLEN: + yield = string_fmt_append(yield, "%d", Ustrlen(sub)); + break; - case EOP_STRLEN: - yield = string_fmt_append(yield, "%d", Ustrlen(sub)); - continue; + /* length_n or l_n takes just the first n characters or the whole string, + whichever is the shorter; + + substr_m_n, and s_m_n take n characters from offset m; negative m take + from the end; l_n is synonymous with s_0_n. If n is omitted in substr it + takes the rest, either to the right or to the left. + + hash_n or h_n makes a hash of length n from the string, yielding n + characters from the set a-z; hash_n_m makes a hash of length n, but + uses m characters from the set a-zA-Z0-9. + + nhash_n returns a single number between 0 and n-1 (in text form), while + nhash_n_m returns a div/mod hash as two numbers "a/b". The first lies + between 0 and n-1 and the second between 0 and m-1. */ + + case EOP_LENGTH: + case EOP_L: + case EOP_SUBSTR: + case EOP_S: + case EOP_HASH: + case EOP_H: + case EOP_NHASH: + case EOP_NH: + { + int sign = 1; + int value1 = 0; + int value2 = -1; + int *pn; + int len; + uschar *ret; - /* length_n or l_n takes just the first n characters or the whole string, - whichever is the shorter; - - substr_m_n, and s_m_n take n characters from offset m; negative m take - from the end; l_n is synonymous with s_0_n. If n is omitted in substr it - takes the rest, either to the right or to the left. - - hash_n or h_n makes a hash of length n from the string, yielding n - characters from the set a-z; hash_n_m makes a hash of length n, but - uses m characters from the set a-zA-Z0-9. - - nhash_n returns a single number between 0 and n-1 (in text form), while - nhash_n_m returns a div/mod hash as two numbers "a/b". The first lies - between 0 and n-1 and the second between 0 and m-1. */ - - case EOP_LENGTH: - case EOP_L: - case EOP_SUBSTR: - case EOP_S: - case EOP_HASH: - case EOP_H: - case EOP_NHASH: - case EOP_NH: - { - int sign = 1; - int value1 = 0; - int value2 = -1; - int *pn; - int len; - uschar *ret; - - if (!arg) - { - expand_string_message = string_sprintf("missing values after %s", - name); - goto EXPAND_FAILED; - } + if (!arg) + { + expand_string_message = string_sprintf("missing values after %s", + name); + goto EXPAND_FAILED; + } - /* "length" has only one argument, effectively being synonymous with - substr_0_n. */ + /* "length" has only one argument, effectively being synonymous with + substr_0_n. */ - if (c == EOP_LENGTH || c == EOP_L) - { - pn = &value2; - value2 = 0; - } + if (c == EOP_LENGTH || c == EOP_L) + { + pn = &value2; + value2 = 0; + } - /* The others have one or two arguments; for "substr" the first may be - negative. The second being negative means "not supplied". */ + /* The others have one or two arguments; for "substr" the first may be + negative. The second being negative means "not supplied". */ - else - { - pn = &value1; - if (name[0] == 's' && *arg == '-') { sign = -1; arg++; } - } + else + { + pn = &value1; + if (name[0] == 's' && *arg == '-') { sign = -1; arg++; } + } - /* Read up to two numbers, separated by underscores */ + /* Read up to two numbers, separated by underscores */ - ret = arg; - while (*arg != 0) - { - if (arg != ret && *arg == '_' && pn == &value1) - { - pn = &value2; - value2 = 0; - if (arg[1] != 0) arg++; - } - else if (!isdigit(*arg)) - { - expand_string_message = - string_sprintf("non-digit after underscore in \"%s\"", name); - goto EXPAND_FAILED; - } - else *pn = (*pn)*10 + *arg++ - '0'; - } - value1 *= sign; + ret = arg; + while (*arg != 0) + { + if (arg != ret && *arg == '_' && pn == &value1) + { + pn = &value2; + value2 = 0; + if (arg[1] != 0) arg++; + } + else if (!isdigit(*arg)) + { + expand_string_message = + string_sprintf("non-digit after underscore in \"%s\"", name); + goto EXPAND_FAILED; + } + else *pn = (*pn)*10 + *arg++ - '0'; + } + value1 *= sign; - /* Perform the required operation */ + /* Perform the required operation */ - ret = c == EOP_HASH || c == EOP_H - ? compute_hash(sub, value1, value2, &len) - : c == EOP_NHASH || c == EOP_NH - ? compute_nhash(sub, value1, value2, &len) - : extract_substr(sub, value1, value2, &len); - if (!ret) goto EXPAND_FAILED; + ret = c == EOP_HASH || c == EOP_H + ? compute_hash(sub, value1, value2, &len) + : c == EOP_NHASH || c == EOP_NH + ? compute_nhash(sub, value1, value2, &len) + : extract_substr(sub, value1, value2, &len); + if (!ret) goto EXPAND_FAILED; - yield = string_catn(yield, ret, len); - continue; - } + yield = string_catn(yield, ret, len); + break; + } - /* Stat a path */ + /* Stat a path */ - case EOP_STAT: - { - uschar smode[12]; - uschar **modetable[3]; - mode_t mode; - struct stat st; + case EOP_STAT: + { + uschar smode[12]; + uschar **modetable[3]; + mode_t mode; + struct stat st; - if (expand_forbid & RDO_EXISTS) - { - expand_string_message = US"Use of the stat() expansion is not permitted"; - goto EXPAND_FAILED; - } + if (expand_forbid & RDO_EXISTS) + { + expand_string_message = US"Use of the stat() expansion is not permitted"; + goto EXPAND_FAILED; + } - if (stat(CS sub, &st) < 0) - { - expand_string_message = string_sprintf("stat(%s) failed: %s", - sub, strerror(errno)); - goto EXPAND_FAILED; - } - mode = st.st_mode; - switch (mode & S_IFMT) - { - case S_IFIFO: smode[0] = 'p'; break; - case S_IFCHR: smode[0] = 'c'; break; - case S_IFDIR: smode[0] = 'd'; break; - case S_IFBLK: smode[0] = 'b'; break; - case S_IFREG: smode[0] = '-'; break; - default: smode[0] = '?'; break; - } + if (stat(CS sub, &st) < 0) + { + expand_string_message = string_sprintf("stat(%s) failed: %s", + sub, strerror(errno)); + goto EXPAND_FAILED; + } + mode = st.st_mode; + switch (mode & S_IFMT) + { + case S_IFIFO: smode[0] = 'p'; break; + case S_IFCHR: smode[0] = 'c'; break; + case S_IFDIR: smode[0] = 'd'; break; + case S_IFBLK: smode[0] = 'b'; break; + case S_IFREG: smode[0] = '-'; break; + default: smode[0] = '?'; break; + } - modetable[0] = ((mode & 01000) == 0)? mtable_normal : mtable_sticky; - modetable[1] = ((mode & 02000) == 0)? mtable_normal : mtable_setid; - modetable[2] = ((mode & 04000) == 0)? mtable_normal : mtable_setid; + modetable[0] = ((mode & 01000) == 0)? mtable_normal : mtable_sticky; + modetable[1] = ((mode & 02000) == 0)? mtable_normal : mtable_setid; + modetable[2] = ((mode & 04000) == 0)? mtable_normal : mtable_setid; - for (int i = 0; i < 3; i++) - { - memcpy(CS(smode + 7 - i*3), CS(modetable[i][mode & 7]), 3); - mode >>= 3; - } + for (int i = 0; i < 3; i++) + { + memcpy(CS(smode + 7 - i*3), CS(modetable[i][mode & 7]), 3); + mode >>= 3; + } - smode[10] = 0; - yield = string_fmt_append(yield, - "mode=%04lo smode=%s inode=%ld device=%ld links=%ld " - "uid=%ld gid=%ld size=" OFF_T_FMT " atime=%ld mtime=%ld ctime=%ld", - (long)(st.st_mode & 077777), smode, (long)st.st_ino, - (long)st.st_dev, (long)st.st_nlink, (long)st.st_uid, - (long)st.st_gid, st.st_size, (long)st.st_atime, - (long)st.st_mtime, (long)st.st_ctime); - continue; - } + smode[10] = 0; + yield = string_fmt_append(yield, + "mode=%04lo smode=%s inode=%ld device=%ld links=%ld " + "uid=%ld gid=%ld size=" OFF_T_FMT " atime=%ld mtime=%ld ctime=%ld", + (long)(st.st_mode & 077777), smode, (long)st.st_ino, + (long)st.st_dev, (long)st.st_nlink, (long)st.st_uid, + (long)st.st_gid, st.st_size, (long)st.st_atime, + (long)st.st_mtime, (long)st.st_ctime); + break; + } - /* vaguely random number less than N */ + /* vaguely random number less than N */ - case EOP_RANDINT: - { - int_eximarith_t max = expanded_string_integer(sub, TRUE); + case EOP_RANDINT: + { + int_eximarith_t max = expanded_string_integer(sub, TRUE); - if (expand_string_message) - goto EXPAND_FAILED; - yield = string_fmt_append(yield, "%d", vaguely_random_number((int)max)); - continue; - } + if (expand_string_message) + goto EXPAND_FAILED; + yield = string_fmt_append(yield, "%d", vaguely_random_number((int)max)); + break; + } - /* Reverse IP, including IPv6 to dotted-nibble */ + /* Reverse IP, including IPv6 to dotted-nibble */ - case EOP_REVERSE_IP: - { - int family, maskptr; - uschar reversed[128]; + case EOP_REVERSE_IP: + { + int family, maskptr; + uschar reversed[128]; - family = string_is_ip_address(sub, &maskptr); - if (family == 0) - { - expand_string_message = string_sprintf( - "reverse_ip() not given an IP address [%s]", sub); - goto EXPAND_FAILED; - } - invert_address(reversed, sub); - yield = string_cat(yield, reversed); - continue; - } + family = string_is_ip_address(sub, &maskptr); + if (family == 0) + { + expand_string_message = string_sprintf( + "reverse_ip() not given an IP address [%s]", sub); + goto EXPAND_FAILED; + } + invert_address(reversed, sub); + yield = string_cat(yield, reversed); + break; + } - /* Unknown operator */ + /* Unknown operator */ - default: - expand_string_message = - string_sprintf("unknown expansion operator \"%s\"", name); - goto EXPAND_FAILED; - } + default: + expand_string_message = + string_sprintf("unknown expansion operator \"%s\"", name); + goto EXPAND_FAILED; + } /* EOP_* switch */ + + DEBUG(D_expand) + if (start > 0 || *s) /* only if not the sole expansion of the line */ + debug_expansion_interim(US"op-res", + yield->s + start, yield->ptr - start, skipping); + continue; + } } + /* Not an item or an operator */ /* Handle a plain name. If this is the first thing in the expansion, release the pre-allocated buffer. If the result data is known to be in a new buffer, newsize will be set to the size of that buffer, and we can just point at that @@ -8107,6 +8177,7 @@ while (*s) /*{*/ if (*s++ == '}') { + const uschar * value; int len; int newsize = 0; gstring * g = NULL; @@ -8133,7 +8204,7 @@ while (*s) yield = g; yield->size = newsize; yield->ptr = len; - yield->s = value; + yield->s = US value; /* known to be in new store i.e. a copy, so deconst safe */ } else yield = string_catn(yield, value, len); @@ -8151,7 +8222,7 @@ while (*s) /* If we hit the end of the string when ket_ends is set, there is a missing terminating brace. */ -if (ket_ends && *s == 0) +if (ket_ends && !*s) { expand_string_message = malformed_header ? US"missing } at end of string - could be header name not terminated by colon" @@ -8228,6 +8299,7 @@ that is a bad idea, because expand_string_message is in dynamic store. */ EXPAND_FAILED: if (left) *left = s; DEBUG(D_expand) + { DEBUG(D_noutf8) { debug_printf_indent("|failed to expand: %s\n", string); @@ -8247,6 +8319,7 @@ DEBUG(D_expand) if (f.expand_string_forcedfail) debug_printf_indent(UTF8_UP_RIGHT "failure was forced\n"); } + } if (resetok_p && !resetok) *resetok_p = FALSE; expand_level--; return NULL; @@ -8554,6 +8627,7 @@ typedef struct { const uschar *var_data; } err_ctx; +/* Called via tree_walk, which allows nonconst name/data. Our usage is const. */ static void assert_variable_notin(uschar * var_name, uschar * var_data, void * ctx) { @@ -8575,13 +8649,14 @@ err_ctx e = { .region_start = ptr, .region_end = US ptr + len, tree_walk(acl_var_c, assert_variable_notin, &e); tree_walk(acl_var_m, assert_variable_notin, &e); -/* check auth variables */ +/* check auth variables. +assert_variable_notin() treats as const, so deconst is safe. */ for (int i = 0; i < AUTH_VARS; i++) if (auth_vars[i]) - assert_variable_notin(US"auth", auth_vars[i], &e); + assert_variable_notin(US"auth", US auth_vars[i], &e); -/* check regex variables */ +/* check regex variables. assert_variable_notin() treats as const. */ for (int i = 0; i < REGEX_VARS; i++) if (regex_vars[i]) - assert_variable_notin(US"regex", regex_vars[i], &e); + assert_variable_notin(US"regex", US regex_vars[i], &e); /* check known-name variables */ for (var_entry * v = var_table; v < var_table + var_table_size; v++) @@ -8612,11 +8687,11 @@ if (e.var_name) BOOL -regex_match_and_setup(const pcre *re, uschar *subject, int options, int setup) +regex_match_and_setup(const pcre2_code *re, uschar *subject, int options, int setup) { -int ovector[3*(EXPAND_MAXN+1)]; +int ovec[3*(EXPAND_MAXN+1)]; int n = pcre_exec(re, NULL, subject, Ustrlen(subject), 0, PCRE_EOPT|options, - ovector, nelem(ovector)); + ovec, nelem(ovec)); BOOL yield = n >= 0; if (n == 0) n = EXPAND_MAXN + 1; if (yield) @@ -8624,8 +8699,8 @@ if (yield) expand_nmax = setup < 0 ? 0 : setup + 1; for (int nn = setup < 0 ? 0 : 2; nn < n*2; nn += 2) { - expand_nstring[expand_nmax] = subject + ovector[nn]; - expand_nlength[expand_nmax++] = ovector[nn+1] - ovector[nn]; + expand_nstring[expand_nmax] = subject + ovec[nn]; + expand_nlength[expand_nmax++] = ovec[nn+1] - ovec[nn]; } expand_nmax--; } @@ -8641,6 +8716,7 @@ debug_selector = D_v; debug_file = stderr; debug_fd = fileno(debug_file); big_buffer = malloc(big_buffer_size); +store_init(); for (int i = 1; i < argc; i++) {