while (*s && *s != '=' && !isspace(*s)) s++;
dkeylength = s - dkey;
- if (Uskip_whitespace(&s) == '=') while (isspace(*++s));
+ if (Uskip_whitespace(&s) == '=')
+ while (isspace(*++s)) ;
data = string_dequote(&s);
if (length == dkeylength && strncmpic(key, dkey, length) == 0)
/* A recipients list is available only during system message filtering,
during ACL processing after DATA, and while expanding pipe commands
generated from a system filter, but not elsewhere. Note that this does
-not check for comman in the elements, and uses comma-space as seperator -
+not check for commas in the elements, and uses comma-space as seperator -
so cannot be used as an exim list as-is. */
static uschar *
fn_recipients(void)
{
-uschar * s;
gstring * g = NULL;
if (!f.enable_dollar_recipients) return NULL;
for (int i = 0; i < recipients_count; i++)
{
- s = recipients_list[i].address;
+ const uschar * s = recipients_list[i].address;
g = string_append2_listele_n(g, US", ", s, Ustrlen(s));
}
gstring_release_unused(g);
case ECOND_ISIP:
case ECOND_ISIP4:
case ECOND_ISIP6:
- rc = string_is_ip_address(sub[0], NULL);
- *yield = ((cond_type == ECOND_ISIP)? (rc != 0) :
- (cond_type == ECOND_ISIP4)? (rc == 4) : (rc == 6)) == testfor;
+ {
+ const uschar *errp;
+ const uschar **errpp;
+ DEBUG(D_expand) errpp = &errp; else errpp = 0;
+ if (0 == (rc = string_is_ip_addressX(sub[0], NULL, errpp)))
+ DEBUG(D_expand) debug_printf("failed: %s\n", errp);
+
+ *yield = ( cond_type == ECOND_ISIP ? rc != 0 :
+ cond_type == ECOND_ISIP4 ? rc == 4 : rc == 6) == testfor;
+ }
+
break;
/* Various authentication tests - all optionally compiled */
/* If a zero-length secret was given, we're done. Otherwise carry on
and validate the given SRS local_part againt our secret. */
- if (!*sub[1])
+ if (*sub[1])
{
- boolvalue = TRUE;
- goto srs_result;
- }
+ /* check the timestamp */
+ {
+ struct timeval now;
+ uschar * ss = sub[0] + ovec[4]; /* substring 2, the timestamp */
+ long d;
+ int n;
- /* check the timestamp */
- {
- 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 */
- gettimeofday(&now, NULL);
- now.tv_sec /= 86400; /* days since epoch */
+ /* Decode substring 2 from base32 to a number */
- /* Decode substring 2 from base32 to a number */
+ for (d = 0, n = ovec[5]-ovec[4]; n; n--)
+ {
+ uschar * t = Ustrchr(base32_chars, *ss++);
+ d = d * 32 + (t - base32_chars);
+ }
- for (d = 0, n = ovec[5]-ovec[4]; n; n--)
- {
- uschar * t = Ustrchr(base32_chars, *ss++);
- d = d * 32 + (t - base32_chars);
+ if (((now.tv_sec - d) & 0x3ff) > 10) /* days since SRS generated */
+ {
+ DEBUG(D_expand) debug_printf("SRS too old\n");
+ goto srs_result;
+ }
}
- if (((now.tv_sec - d) & 0x3ff) > 10) /* days since SRS generated */
+ /* check length of substring 1, the offered checksum */
+
+ if (ovec[3]-ovec[2] != 4)
{
- DEBUG(D_expand) debug_printf("SRS too old\n");
+ DEBUG(D_expand) debug_printf("SRS checksum wrong size\n");
goto srs_result;
}
- }
- /* check length of substring 1, the offered checksum */
+ /* Hash the address with our secret, and compare that computed checksum
+ with the one extracted from the arg */
- if (ovec[3]-ovec[2] != 4)
- {
- DEBUG(D_expand) debug_printf("SRS checksum wrong size\n");
- goto srs_result;
- }
-
- /* Hash the address with our secret, and compare that computed checksum
- with the one extracted from the arg */
-
- hmac_md5(sub[1], srs_recipient, cksum, sizeof(cksum));
- if (Ustrncmp(cksum, sub[0] + ovec[2], 4) != 0)
- {
- DEBUG(D_expand) debug_printf("SRS checksum mismatch\n");
- goto srs_result;
+ hmac_md5(sub[1], srs_recipient, cksum, sizeof(cksum));
+ if (Ustrncmp(cksum, sub[0] + ovec[2], 4) != 0)
+ {
+ DEBUG(D_expand) debug_printf("SRS checksum mismatch\n");
+ goto srs_result;
+ }
}
boolvalue = TRUE;
if (*s != ')')
*error = US"expecting closing parenthesis";
else
- while (isspace(*++s));
+ while (isspace(*++s)) ;
else if (*s)
*error = US"expecting operator";
*sptr = s;
/************************************************/
static void
debug_expansion_interim(const uschar * what, const uschar * value, int nchar,
- BOOL skipping)
+ esi_flags flags)
{
-DEBUG(D_noutf8)
- debug_printf_indent("|");
-else
- debug_printf_indent(UTF8_VERT_RIGHT);
+debug_printf_indent("%V", "K");
for (int fill = 11 - Ustrlen(what); fill > 0; fill--)
- DEBUG(D_noutf8)
- debug_printf("-");
- else
- debug_printf(UTF8_HORIZ);
+ debug_printf("%V", "-");
-debug_printf("%s: %.*s\n", what, nchar, value);
+debug_printf("%s: %.*W\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");
- }
+ debug_printf_indent("%V %V(tainted)\n",
+ flags & ESI_SKIPPING ? "|" : " ", "\\__");
}
DEBUG(D_expand)
{
- DEBUG(D_noutf8)
- debug_printf_indent("%c%s: %s\n",
- first ? '/' : '|',
- flags & ESI_SKIPPING ? "---scanning" : "considering", s);
- else
- debug_printf_indent("%s%s: %s\n",
- first ? UTF8_DOWN_RIGHT : UTF8_VERT_RIGHT,
- flags & ESI_SKIPPING
- ? UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ "scanning"
- : "considering",
- s);
+ debug_printf_indent("%V%V%s: %W\n",
+ first ? "/" : "K",
+ flags & ESI_SKIPPING ? "---" : "",
+ flags & ESI_SKIPPING ? "scanning" : "considering", s);
first = FALSE;
}
for (s = t; *s ; s++) if (*s == '\\' && s[1] == 'N') break;
DEBUG(D_expand)
- debug_expansion_interim(US"protected", t, (int)(s - t), !!(flags & ESI_SKIPPING));
- yield = string_catn(yield, t, s - t);
+ debug_expansion_interim(US"protected", t, (int)(s - t), flags);
+ if (!(flags & ESI_SKIPPING))
+ yield = string_catn(yield, t, s - t);
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]);
+ debug_printf_indent("%Vbackslashed: '\\%c'\n", "K", s[1]);
ch[0] = string_interpret_escape(&s);
+ if (!(flags & ESI_SKIPPING))
+ yield = string_catn(yield, ch, 1);
s++;
- yield = string_catn(yield, ch, 1);
}
continue;
}
for (const uschar * t = s+1;
*t && *t != '$' && *t != '}' && *t != '\\'; t++) i++;
- DEBUG(D_expand) debug_expansion_interim(US"text", s, i, !!(flags & ESI_SKIPPING));
+ DEBUG(D_expand) debug_expansion_interim(US"text", s, i, flags);
- yield = string_catn(yield, s, i);
+ if (!(flags & ESI_SKIPPING))
+ yield = string_catn(yield, s, i);
s += i;
continue;
}
/* If this is the first thing to be expanded, release the pre-allocated
buffer. */
- if (!yield)
- g = store_get(sizeof(gstring), GET_UNTAINTED);
- else if (yield->ptr == 0)
- {
- if (resetok) reset_point = store_reset(reset_point);
- yield = NULL;
- reset_point = store_mark();
- g = store_get(sizeof(gstring), GET_UNTAINTED); /* alloc _before_ calling find_variable() */
- }
+ if (!(flags & ESI_SKIPPING))
+ if (!yield)
+ g = store_get(sizeof(gstring), GET_UNTAINTED);
+ else if (yield->ptr == 0)
+ {
+ if (resetok) reset_point = store_reset(reset_point);
+ yield = NULL;
+ reset_point = store_mark();
+ g = store_get(sizeof(gstring), GET_UNTAINTED); /* alloc _before_ calling find_variable() */
+ }
/* Header */
reset in the middle of the buffer will make it inaccessible. */
len = Ustrlen(value);
- DEBUG(D_expand) debug_expansion_interim(US"value", value, len, !!(flags & ESI_SKIPPING));
- if (!yield && newsize != 0)
- {
- yield = g;
- yield->size = newsize;
- yield->ptr = len;
- yield->s = US value; /* known to be in new store i.e. a copy, so deconst safe */
- }
- else
- yield = string_catn(yield, value, len);
+ DEBUG(D_expand) debug_expansion_interim(US"value", value, len, flags);
+ if (!(flags & ESI_SKIPPING))
+ if (!yield && newsize != 0)
+ {
+ yield = g;
+ yield->size = newsize;
+ yield->ptr = len;
+ yield->s = US value; /* known to be in new store i.e. a copy, so deconst safe */
+ }
+ else
+ yield = string_catn(yield, value, len);
continue;
}
s = read_cnumber(&n, s);
if (n >= 0 && n <= expand_nmax)
{
- DEBUG(D_expand) debug_expansion_interim(US"value", expand_nstring[n], expand_nlength[n], !!(flags & ESI_SKIPPING));
- yield = string_catn(yield, expand_nstring[n], expand_nlength[n]);
+ DEBUG(D_expand) debug_expansion_interim(US"value", expand_nstring[n], expand_nlength[n], flags);
+ if (!(flags & ESI_SKIPPING))
+ yield = string_catn(yield, expand_nstring[n], expand_nlength[n]);
}
continue;
}
}
if (n >= 0 && n <= expand_nmax)
{
- DEBUG(D_expand) debug_expansion_interim(US"value", expand_nstring[n], expand_nlength[n], !!(flags & ESI_SKIPPING));
- yield = string_catn(yield, expand_nstring[n], expand_nlength[n]);
+ DEBUG(D_expand) debug_expansion_interim(US"value", expand_nstring[n], expand_nlength[n], flags);
+ if (!(flags & ESI_SKIPPING))
+ yield = string_catn(yield, expand_nstring[n], expand_nlength[n]);
}
continue;
}
DEBUG(D_expand)
{
- debug_expansion_interim(US"condition", s, (int)(next_s - s), !!(flags & ESI_SKIPPING));
+ debug_expansion_interim(US"condition", s, (int)(next_s - s), flags);
debug_expansion_interim(US"result",
- cond ? US"true" : US"false", cond ? 4 : 5, !!(flags & ESI_SKIPPING));
+ cond ? US"true" : US"false", cond ? 4 : 5, flags);
}
s = next_s;
FILE * f;
const uschar * arg, ** argv;
unsigned late_expand = TSUC_EXPAND_ARGS | TSUC_ALLOW_TAINTED_ARGS | TSUC_ALLOW_RECIPIENTS;
- uschar * save_value = lookup_value;
- int yesno;
if (expand_forbid & RDO_RUN)
{
expand_string_message = string_sprintf("command killed by signal %d",
-runrc);
- lookup_value = save_value;
goto EXPAND_FAILED;
}
}
/* Process the yes/no strings; $value may be useful in both cases */
- yesno = process_yesno(
+ switch(process_yesno(
flags, /* were previously skipping */
runrc == 0, /* success/failure indicator */
lookup_value, /* value to reset for string2 */
&s, /* input pointer */
&yield, /* output pointer */
US"run", /* condition type */
- &resetok);
- lookup_value = save_value;
-
- switch(yesno)
+ &resetok))
{
case 1: goto EXPAND_FAILED; /* when all is well, the */
case 2: goto EXPAND_FAILED_CURLY; /* returned value is 0 */
case 3: goto EXPAND_FAILED;
}
- yield = string_cat(yield, sub[0]);
- o2m = Ustrlen(sub[2]) - 1;
-
- if (o2m >= 0) for (; oldptr < yield->ptr; oldptr++)
+ if ( (yield = string_cat(yield, sub[0]))
+ && (o2m = Ustrlen(sub[2]) - 1) >= 0)
+ for (; oldptr < yield->ptr; oldptr++)
{
uschar * m = Ustrrchr(sub[1], yield->s[oldptr]);
if (m)
{
int o = m - sub[1];
- yield->s[oldptr] = sub[2][(o < o2m)? o : o2m];
+ yield->s[oldptr] = sub[2][o < o2m ? o : o2m];
}
}
goto EXPAND_FAILED_CURLY; /*}*/
}
+ DEBUG(D_expand) debug_printf_indent("%s: evaluate input list list\n", name);
if (!(list = expand_string_internal(s,
ESI_BRACE_ENDS | ESI_HONOR_DOLLAR | flags, &s, &resetok, NULL)))
goto EXPAND_FAILED; /*{{*/
expand_string_message = US"missing '{' for second arg of reduce";
goto EXPAND_FAILED_CURLY; /*}*/
}
+ DEBUG(D_expand) debug_printf_indent("reduce: initial result list\n");
t = expand_string_internal(s,
ESI_BRACE_ENDS | ESI_HONOR_DOLLAR | flags, &s, &resetok, NULL);
if (!t) goto EXPAND_FAILED;
condition for real. For EITEM_MAP and EITEM_REDUCE, do the same, using
the normal internal expansion function. */
+ DEBUG(D_expand) debug_printf_indent("%s: find end of conditionn\n", name);
if (item_type != EITEM_FILTER)
temp = expand_string_internal(s,
ESI_BRACE_ENDS | ESI_HONOR_DOLLAR | ESI_SKIPPING, &s, &resetok, NULL);
gstring_release_unused(h);
s = string_from_gstring(h);
}
- g = string_cat(g, s);
+ if (s) g = string_cat(g, s);
}
/* Assume that if the original local_part had quotes
if (yield && (expansion_start > 0 || *s))
debug_expansion_interim(US"item-res",
yield->s + expansion_start, yield->ptr - expansion_start,
- !!(flags & ESI_SKIPPING));
+ flags);
continue;
NOT_ITEM: ;
case EOP_BASE64D:
{
uschar * s;
- int len = b64decode(sub, &s);
+ int len = b64decode(sub, &s, sub);
if (len < 0)
{
expand_string_message = string_sprintf("string \"%s\" is not "
int i = gstring_length(yield) - expansion_start;
BOOL tainted = is_tainted(s);
- DEBUG(D_noutf8)
+ debug_printf_indent("%Vop-res: %.*s\n", "K-----", i, s);
+ if (tainted)
{
- debug_printf_indent("|-----op-res: %.*s\n", i, s);
- if (tainted)
- {
- debug_printf_indent("%s \\__", flags & ESI_SKIPPING ? "| " : " ");
- debug_print_taint(res);
- }
- }
- else
- {
- debug_printf_indent(UTF8_VERT_RIGHT
- UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
- "op-res: %.*s\n", i, s);
- if (tainted)
- {
- debug_printf_indent("%s",
- flags & ESI_SKIPPING
- ? UTF8_VERT " " : " " UTF8_UP_RIGHT UTF8_HORIZ UTF8_HORIZ);
- debug_print_taint(res);
- }
+ debug_printf_indent("%V %V",
+ flags & ESI_SKIPPING ? "|" : " ",
+ "\\__");
+ debug_print_taint(res);
}
}
continue;
DEBUG(D_expand)
{
BOOL tainted = is_tainted(res);
- DEBUG(D_noutf8)
- {
- debug_printf_indent("|--expanding: %.*s\n", (int)(s - string), string);
- debug_printf_indent("%sresult: %s\n",
- flags & ESI_SKIPPING ? "|-----" : "\\_____", res);
- if (tainted)
- {
- debug_printf_indent("%s \\__", flags & ESI_SKIPPING ? "| " : " ");
- debug_print_taint(res);
- }
- if (flags & ESI_SKIPPING)
- debug_printf_indent("\\___skipping: result is not used\n");
- }
+ debug_printf_indent("%Vexpanded: %.*W\n",
+ "K---",
+ (int)(s - string), string);
+ debug_printf_indent("%Vresult: ",
+ flags & ESI_SKIPPING ? "K-----" : "\\_____");
+ if (*res || !(flags & ESI_SKIPPING))
+ debug_printf("%W\n", res);
else
+ debug_printf(" %Vskipped%V\n", "<", ">");
+ if (tainted)
{
- debug_printf_indent(UTF8_VERT_RIGHT UTF8_HORIZ UTF8_HORIZ
- "expanding: %.*s\n",
- (int)(s - string), string);
- debug_printf_indent("%s" UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
- "result: %s\n",
- flags & ESI_SKIPPING ? UTF8_VERT_RIGHT : UTF8_UP_RIGHT,
- res);
- if (tainted)
- {
- debug_printf_indent("%s",
- flags & ESI_SKIPPING
- ? UTF8_VERT " " : " " UTF8_UP_RIGHT UTF8_HORIZ UTF8_HORIZ);
- debug_print_taint(res);
- }
- if (flags & ESI_SKIPPING)
- debug_printf_indent(UTF8_UP_RIGHT UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
- "skipping: result is not used\n");
+ debug_printf_indent("%V %V",
+ flags & ESI_SKIPPING ? "|" : " ",
+ "\\__"
+ );
+ debug_print_taint(res);
}
+ if (flags & ESI_SKIPPING)
+ debug_printf_indent("%Vskipping: result is not used\n", "\\___");
}
if (textonly_p) *textonly_p = textonly;
expand_level--;
if (left) *left = s;
DEBUG(D_expand)
{
- DEBUG(D_noutf8)
- {
- debug_printf_indent("|failed to expand: %s\n", string);
- debug_printf_indent("%serror message: %s\n",
- f.expand_string_forcedfail ? "|---" : "\\___", expand_string_message);
- if (f.expand_string_forcedfail)
- debug_printf_indent("\\failure was forced\n");
- }
- else
- {
- debug_printf_indent(UTF8_VERT_RIGHT "failed to expand: %s\n",
- string);
- debug_printf_indent("%s" UTF8_HORIZ UTF8_HORIZ UTF8_HORIZ
- "error message: %s\n",
- f.expand_string_forcedfail ? UTF8_VERT_RIGHT : UTF8_UP_RIGHT,
- expand_string_message);
- if (f.expand_string_forcedfail)
- debug_printf_indent(UTF8_UP_RIGHT "failure was forced\n");
- }
+ debug_printf_indent("%Vfailed to expand: %s\n", "K", string);
+ debug_printf_indent("%Verror message: %s\n",
+ f.expand_string_forcedfail ? "K---" : "\\___", expand_string_message);
+ if (f.expand_string_forcedfail)
+ debug_printf_indent("%Vfailure was forced\n", "\\");
}
if (resetok_p && !resetok) *resetok_p = FALSE;
expand_level--;
const uschar *
expand_string_2(const uschar * string, BOOL * textonly_p)
{
+f.expand_string_forcedfail = f.search_find_defer = malformed_header = FALSE;
if (Ustrpbrk(string, "$\\") != NULL)
{
int old_pool = store_pool;
uschar * s;
- f.search_find_defer = FALSE;
- malformed_header = FALSE;
store_pool = POOL_MAIN;
s = expand_string_internal(string, ESI_HONOR_DOLLAR, NULL, NULL, textonly_p);
store_pool = old_pool;
*/
int
-exp_bool(address_item *addr,
- uschar *mtype, uschar *mname, unsigned dbg_opt,
- uschar *oname, BOOL bvalue,
- uschar *svalue, BOOL *rvalue)
+exp_bool(address_item * addr,
+ uschar * mtype, uschar * mname, unsigned dbg_opt,
+ uschar * oname, BOOL bvalue,
+ uschar * svalue, BOOL * rvalue)
{
-uschar *expanded;
+uschar * expanded;
+
+DEBUG(D_expand) debug_printf("try option %s\n", oname);
if (!svalue) { *rvalue = bvalue; return OK; }
if (!(expanded = expand_string(svalue)))
git://git.exim.org / exim.git / blobdiff