/*
* rfc822.c -- code for slicing and dicing RFC822 mail headers
*
- * Copyright 1996 by Eric S. Raymond
- * All rights reserved.
+ * Copyright 1997 by Eric S. Raymond
* For license terms, see the file COPYING in this directory.
*/
#include <stdlib.h>
#endif
+#include "config.h"
#include "fetchmail.h"
#define HEADER_END(p) ((p)[0] == '\n' && ((p)[1] != ' ' && (p)[1] != '\t'))
#ifdef TESTMAIN
static int verbose;
+char *program_name = "rfc822";
#endif /* TESTMAIN */
-void reply_hack(buf, host)
+char *reply_hack(buf, host)
/* hack message headers so replies will work properly */
char *buf; /* header to be hacked */
const char *host; /* server hostname */
{
- char *from, *cp;
+ char *from, *cp, last_nws = '\0', *parens_from = NULL;
int parendepth, state, has_bare_name_part, has_host_part;
+#ifndef TESTMAIN
+ int addresscount = 1;
+#endif /* TESTMAIN */
if (strncasecmp("From: ", buf, 6)
&& strncasecmp("To: ", buf, 4)
&& strncasecmp("Reply-To: ", buf, 10)
&& strncasecmp("Return-Path: ", buf, 13)
&& strncasecmp("Cc: ", buf, 4)
- && strncasecmp("Bcc: ", buf, 5)) {
- return;
+ && strncasecmp("Bcc: ", buf, 5)
+ && strncasecmp("Resent-From: ", buf, 13)
+ && strncasecmp("Resent-To: ", buf, 11)
+ && strncasecmp("Resent-Cc: ", buf, 11)
+ && strncasecmp("Resent-Bcc: ", buf, 12)
+ && strncasecmp("Apparently-From:", buf, 16)
+ && strncasecmp("Apparently-To:", buf, 14)
+ && strncasecmp("Sender:", buf, 7)
+ && strncasecmp("Resent-Sender:", buf, 14)
+ ) {
+ return(buf);
}
+#ifndef TESTMAIN
+ if (outlevel >= O_DEBUG)
+ report_build(stdout, "About to rewrite %s", buf);
+
+ /* make room to hack the address; buf must be malloced */
+ for (cp = buf; *cp; cp++)
+ if (*cp == ',' || isspace(*cp))
+ addresscount++;
+ buf = (char *)xrealloc(buf, strlen(buf) + addresscount * strlen(host) + 1);
+#endif /* TESTMAIN */
+
+ /*
+ * This is going to foo up on some ill-formed addresses.
+ * Note that we don't rewrite the fake address <> in order to
+ * avoid screwing up bounce suppression with a null Return-Path.
+ */
+
parendepth = state = 0;
has_host_part = has_bare_name_part = FALSE;
for (from = buf; *from; from++)
break;
case 1: /* we've seen the colon, we're looking for addresses */
+ if (!isspace(*from))
+ last_nws = *from;
if (*from == '<')
state = 3;
else if (*from == '@')
has_host_part = TRUE;
else if (*from == '"')
state = 2;
- else if ((*from == ',' || HEADER_END(from)) && has_bare_name_part && !has_host_part)
+ /*
+ * Not expanding on last non-WS == ';' deals with groupnames,
+ * an obscure misfeature described in sections
+ * 6.1, 6.2.6, and A.1.5 of the RFC822 standard.
+ */
+ else if ((*from == ',' || HEADER_END(from))
+ && has_bare_name_part
+ && !has_host_part
+ && last_nws != ';')
{
int hostlen;
+ char *p;
- while (isspace(*from))
+ p = from;
+ if (parens_from)
+ from = parens_from;
+ while (isspace(*from) || (*from == ','))
--from;
from++;
hostlen = strlen(host);
cp[hostlen+1] = *cp;
*from++ = '@';
memcpy(from, host, hostlen);
- from += strlen(from);
+ from = p + hostlen + 1;
has_host_part = TRUE;
}
+ else if (from[1] == '('
+ && has_bare_name_part
+ && !has_host_part
+ && last_nws != ';' && last_nws != ')')
+ {
+ parens_from = from;
+ }
else if (!isspace(*from))
has_bare_name_part = TRUE;
break;
case 3: /* we're in a <>-enclosed address */
if (*from == '@')
has_host_part = TRUE;
- else if (*from == '>' && !has_host_part)
+ else if (*from == '>' && from[-1] != '<')
{
- int hostlen;
-
- hostlen = strlen(host);
- for (cp = from + strlen(from); cp >= from; --cp)
- cp[hostlen+1] = *cp;
- *from++ = '@';
- memcpy(from, host, hostlen);
- from += strlen(from);
- has_host_part = TRUE;
+ state = 1;
+ if (!has_host_part)
+ {
+ int hostlen;
+
+ hostlen = strlen(host);
+ for (cp = from + strlen(from); cp >= from; --cp)
+ cp[hostlen+1] = *cp;
+ *from++ = '@';
+ memcpy(from, host, hostlen);
+ from += hostlen;
+ has_host_part = TRUE;
+ }
}
break;
}
+
+ /*
+ * If we passed a comma, reset everything.
+ */
+ if (from[-1] == ',' && !parendepth) {
+ has_host_part = has_bare_name_part = FALSE;
+ parens_from = NULL;
+ }
}
+
+#ifndef TESTMAIN
+ if (outlevel >= O_DEBUG)
+ report_complete(stdout, "Rewritten version is %s\n", buf);
+#endif /* TESTMAIN */
+ return(buf);
}
char *nxtaddr(hdr)
#ifdef TESTMAIN
static const char *orighdr;
#endif /* TESTMAIN */
- int parendepth;
+ int parendepth = 0;
#define START_HDR 0 /* before header colon */
#define SKIP_JUNK 1 /* skip whitespace, \n, and junk */
else if (HEADER_END(hp))
{
state = ENDIT_ALL;
- while (isspace(*--tp))
- continue;
- *++tp = '\0';
+ if (tp > address)
+ {
+ while (isspace(*--tp))
+ continue;
+ *++tp = '\0';
+ }
return(tp > address ? (tp = address) : (char *)NULL);
}
else if (*hp == '\\') /* handle RFC822 escaping */
else if (*hp == '(') /* address comment -- ignore */
{
parendepth = 1;
+ oldstate = SKIP_JUNK;
state = INSIDE_PARENS;
}
else if (*hp == '<') /* begin <address> */
else if (*hp == '(') /* beginning of comment */
{
parendepth = 1;
+ oldstate = BARE_ADDRESS;
state = INSIDE_PARENS;
}
else if (*hp == '<') /* beginning of real address */
else if (*hp == ')')
--parendepth;
if (parendepth == 0)
- state = SKIP_JUNK;
+ state = oldstate;
break;
case INSIDE_BRACKETS: /* possible <>-enclosed address */
projects / ~andy / fetchmail / blobdiff