X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/44644c2e404a3ea0191db0b0458e86924fb240bb..3c90bbcdc7cf73298156f7bcd5f5e750e7814e72:/src/src/expand.c

diff --git a/src/src/expand.c b/src/src/expand.c
index b01512425..7b8462eef 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -1984,11 +1984,12 @@ switch (vp->type)
     ss = (uschar **)(val);
     if (!*ss && deliver_datafile >= 0)  /* Read body when needed */
       {
-      uschar *body;
+      uschar * body;
       off_t start_offset = SPOOL_DATA_START_OFFSET;
       int len = message_body_visible;
+
       if (len > message_size) len = message_size;
-      *ss = body = store_malloc(len+1);
+      *ss = body = store_get(len+1, TRUE);
       body[0] = 0;
       if (vp->type == vtype_msgbody_end)
 	{
@@ -2003,8 +2004,7 @@ switch (vp->type)
       if (lseek(deliver_datafile, start_offset, SEEK_SET) < 0)
 	log_write(0, LOG_MAIN|LOG_PANIC_DIE, "deliver_datafile lseek: %s",
 	  strerror(errno));
-      len = read(deliver_datafile, body, len);
-      if (len > 0)
+      if ((len = read(deliver_datafile, body, len)) > 0)
 	{
 	body[len] = 0;
 	if (message_body_newlines)   /* Separate loops for efficiency */
@@ -3451,7 +3451,7 @@ switch(cond_type = identify_operator(&s, &opname))
     uschar * sub[2];
     const pcre * re;
     int ovec[3*(4+1)];
-    int n;
+    int n, quoting = 0;
     uschar cksum[4];
     BOOL boolvalue = FALSE;
 
@@ -3474,10 +3474,20 @@ switch(cond_type = identify_operator(&s, &opname))
       goto srs_result;
       }
 
-    /* Side-effect: record the decoded recipient */
+    if (sub[0][0] == '"')
+      quoting = 1;
+    else for (uschar * s = sub[0]; *s; s++)
+      if (!isalnum(*s) && Ustrchr(".!#$%&'*+-/=?^_`{|}~", *s) == NULL)
+	{ quoting = 1; break; }
+    if (quoting)
+      DEBUG(D_expand) debug_printf_indent("auto-quoting local part\n");
+
+    /* Record the (quoted, if needed) decoded recipient as $srs_recipient */
 
-    srs_recipient = string_sprintf("%.*S@%.*S",   		/* lowercased */
+    srs_recipient = string_sprintf("%.*s%.*S%.*s@%.*S",   	/* lowercased */
+		      quoting, "\"",
 		      ovec[9]-ovec[8], sub[0] + ovec[8],	/* substring 4 */
+		      quoting, "\"",
 		      ovec[7]-ovec[6], sub[0] + ovec[6]);	/* substring 3 */
 
     /* If a zero-length secret was given, we're done.  Otherwise carry on
@@ -4390,7 +4400,7 @@ if (is_tainted(string))
   goto EXPAND_FAILED;
   }
 
-while (*s != 0)
+while (*s)
   {
   uschar *value;
   uschar name[256];
@@ -4776,7 +4786,7 @@ while (*s != 0)
       int save_expand_nmax =
         save_expand_strings(save_expand_nstring, save_expand_nlength);
 
-      if ((expand_forbid & RDO_LOOKUP) != 0)
+      if (expand_forbid & RDO_LOOKUP)
         {
         expand_string_message = US"lookup expansions are not permitted";
         goto EXPAND_FAILED;
@@ -4875,21 +4885,7 @@ while (*s != 0)
       file types, the query (i.e. "key") starts with a file name. */
 
       if (!key)
-        {
-	Uskip_whitespace(&filename);
-        key = filename;
-
-        if (mac_islookup(stype, lookup_querystyle))
-          filename = NULL;
-        else
-          if (*filename == '/')
-	    {
-	    while (*key && !isspace(*key)) key++;
-	    if (*key) *key++ = '\0';
-	    }
-	  else
-	    filename = NULL;
-        }
+	key = search_args(stype, name, filename, &filename, opts);
 
       /* If skipping, don't do the next bit - just lookup_value == NULL, as if
       the entry was not found. Note that there is no search_close() function.
@@ -5265,7 +5261,7 @@ while (*s != 0)
 
       if (!(f = Ufopen(sub_arg[0], "rb")))
         {
-        expand_string_message = string_open_failed(errno, "%s", sub_arg[0]);
+        expand_string_message = string_open_failed("%s", sub_arg[0]);
         goto EXPAND_FAILED;
         }
 
@@ -6791,6 +6787,8 @@ while (*s != 0)
       {
       uschar * sub[3];
       uschar cksum[4];
+      gstring * g = NULL;
+      BOOL quoted = FALSE;
 
       switch (read_subs(sub, 3, 3, CUSS &s, skipping, TRUE, name, &resetok))
         {
@@ -6799,41 +6797,65 @@ while (*s != 0)
         case 3: goto EXPAND_FAILED;
         }
 
-      yield = string_catn(yield, US"SRS0=", 5);
+      g = string_catn(g, US"SRS0=", 5);
 
       /* ${l_4:${hmac{md5}{SRS_SECRET}{${lc:$return_path}}}}= */
       hmac_md5(sub[0], string_copylc(sub[1]), cksum, sizeof(cksum));
-      yield = string_catn(yield, cksum, sizeof(cksum));
-      yield = string_catn(yield, US"=", 1);
+      g = string_catn(g, cksum, sizeof(cksum));
+      g = string_catn(g, US"=", 1);
 
       /* ${base32:${eval:$tod_epoch/86400&0x3ff}}= */
 	{
 	struct timeval now;
 	unsigned long i;
-	gstring * g = NULL;
+	gstring * h = NULL;
 
 	gettimeofday(&now, NULL);
 	for (unsigned long i = (now.tv_sec / 86400) & 0x3ff; i; i >>= 5)
-	  g = string_catn(g, &base32_chars[i & 0x1f], 1);
-	if (g) while (g->ptr > 0)
-	  yield = string_catn(yield, &g->s[--g->ptr], 1);
+	  h = string_catn(h, &base32_chars[i & 0x1f], 1);
+	if (h) while (h->ptr > 0)
+	  g = string_catn(g, &h->s[--h->ptr], 1);
 	}
-      yield = string_catn(yield, US"=", 1);
+      g = string_catn(g, US"=", 1);
 
       /* ${domain:$return_path}=${local_part:$return_path} */
 	{
         int start, end, domain;
         uschar * t = parse_extract_address(sub[1], &expand_string_message,
 					  &start, &end, &domain, FALSE);
+	uschar * s;
+
         if (!t)
 	  goto EXPAND_FAILED;
 
-	if (domain > 0) yield = string_cat(yield, t + domain);
-	yield = string_catn(yield, US"=", 1);
-	yield = domain > 0
-	  ? string_catn(yield, t, domain - 1) : string_cat(yield, t);
+	if (domain > 0) g = string_cat(g, t + domain);
+	g = string_catn(g, US"=", 1);
+
+	s = domain > 0 ? string_copyn(t, domain - 1) : t;
+	if ((quoted = Ustrchr(s, '"') != NULL))
+	  {
+	  gstring * h = NULL;
+	  DEBUG(D_expand) debug_printf_indent("auto-quoting local part\n");
+	  while (*s)		/* de-quote */
+	    {
+	    while (*s && *s != '"') h = string_catn(h, s++, 1);
+	    if (*s) s++;
+	    while (*s && *s != '"') h = string_catn(h, s++, 1);
+	    if (*s) s++;
+	    }
+	  gstring_release_unused(h);
+	  s = string_from_gstring(h);
+	  }
+	g = string_cat(g, s);
         }
 
+      /* Assume that if the original local_part had quotes
+      it was for good reason */
+
+      if (quoted) yield = string_catn(yield, US"\"", 1);
+      yield = string_catn(yield, g->s, g->ptr);
+      if (quoted) yield = string_catn(yield, US"\"", 1);
+
       /* @$original_domain */
       yield = string_catn(yield, US"@", 1);
       yield = string_cat(yield, sub[2]);
@@ -7485,24 +7507,20 @@ while (*s != 0)
         uschar *t = sub - 1;
 
         if (c == EOP_QUOTE)
-          {
-          while (!needs_quote && *(++t) != 0)
+          while (!needs_quote && *++t)
             needs_quote = !isalnum(*t) && !strchr("_-.", *t);
-          }
+
         else  /* EOP_QUOTE_LOCAL_PART */
-          {
-          while (!needs_quote && *(++t) != 0)
-            needs_quote = !isalnum(*t) &&
-              strchr("!#$%&'*+-/=?^_`{|}~", *t) == NULL &&
-              (*t != '.' || t == sub || t[1] == 0);
-          }
+          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) != 0)
-            {
+          while (*++t)
             if (*t == '\n')
               yield = string_catn(yield, US"\\n", 2);
             else if (*t == '\r')
@@ -7513,10 +7531,10 @@ while (*s != 0)
                 yield = string_catn(yield, US"\\", 1);
               yield = string_catn(yield, t, 1);
               }
-            }
           yield = string_catn(yield, US"\"", 1);
           }
-        else yield = string_cat(yield, sub);
+        else
+	  yield = string_cat(yield, sub);
         continue;
         }
 
@@ -7571,13 +7589,10 @@ while (*s != 0)
       prescribed by the RFC, if there are characters that need to be encoded */
 
       case EOP_RFC2047:
-        {
-        uschar buffer[2048];
         yield = string_cat(yield,
 			    parse_quote_2047(sub, Ustrlen(sub), headers_charset,
-			      buffer, sizeof(buffer), FALSE));
+			      FALSE));
         continue;
-        }
 
       /* RFC 2047 decode */