X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fspost.c;h=046f3403a66ed6ad758ff85bf563d61f3cf509e1;hp=7b74dcc918757026cb6a6e2cce4c2bb4ea702441;hb=3eaeef7c3cf27aa9d715e20ebb72982406ab1d53;hpb=80eeca1af5bc5120d9aeef933c2e162c382c9d29 diff --git a/uip/spost.c b/uip/spost.c index 7b74dcc..046f340 100644 --- a/uip/spost.c +++ b/uip/spost.c @@ -18,7 +18,6 @@ #include #define MAX_SM_FIELD 1476 /* < largest hdr field sendmail will accept */ -#define FCCS 10 /* max number of fccs allowed */ struct swit switches[] = { #define VERBSW 0 @@ -58,10 +57,8 @@ struct swit switches[] = { #define HSUB 0x0004 /* Subject: header */ #define HTRY 0x0008 /* try to send to addrs on header */ #define HBCC 0x0010 /* don't output this header */ -#define HNGR 0x0020 /* no groups allowed in this header */ -#define HFCC 0x0040 /* FCC: type header */ -#define HNIL 0x0080 /* okay for this header not to have addrs */ -#define HIGN 0x0100 /* ignore this header */ +#define HFCC 0x0020 /* FCC: type header */ +#define HIGN 0x0040 /* ignore this header */ /* flags for headers->set */ #define MFRM 0x0001 /* we've seen a From: */ @@ -77,26 +74,25 @@ struct headers { unsigned int set; }; - static struct headers NHeaders[] = { { "Return-Path", HBAD, 0 }, { "Received", HBAD, 0 }, - { "Reply-To", HADR|HNGR, 0 }, - { "From", HADR|HNGR, MFRM }, + { "Reply-To", HADR, 0 }, + { "From", HADR, MFRM }, { "Sender", HADR|HBAD, 0 }, { "Date", HNOP, MDAT }, { "Subject", HSUB, 0 }, { "To", HADR|HTRY, MVIS }, { "Cc", HADR|HTRY, MVIS }, - { "Bcc", HADR|HTRY|HBCC|HNIL, MINV }, + { "Bcc", HADR|HTRY|HBCC, MINV }, { "Message-Id", HBAD, 0 }, { "Fcc", HFCC, 0 }, { NULL, 0, 0 } }; static struct headers RHeaders[] = { - { "Resent-Reply-To", HADR|HNGR, 0 }, - { "Resent-From", HADR|HNGR, MRFM }, + { "Resent-Reply-To", HADR, 0 }, + { "Resent-From", HADR, MRFM }, { "Resent-Sender", HADR|HBAD, 0 }, { "Resent-Date", HNOP, MRDT }, { "Resent-Subject", HSUB, 0 }, @@ -124,18 +120,15 @@ static enum { normal, resent } msgstate = normal; -static char tmpfil[] = "/tmp/spost-XXXXXX"; -static char bccfil[] = "/tmp/spost-bcc-XXXXXX"; +static char *tmpfil; static char *subject = NULL; /* the subject field for BCC'ing */ static char fccs[BUFSIZ] = ""; -struct mailname *bccs = NULL; +struct mailname *bccs = NULL; /* list of the bcc recipients */ static struct headers *hdrtab; /* table for the message we're doing */ static FILE *out; /* output (temp) file */ -extern char *sendmail; - /* ** static prototypes */ @@ -144,14 +137,15 @@ static void finish_headers(FILE *); static int get_header(char *, struct headers *); static void putadr(char *, struct mailname *); static int putone(char *, int, int); +static void process_fcc(char *); static void fcc(char *, char *); -static void make_bcc_draft(char *); +static void process_bccs(char *); int main(int argc, char **argv) { - int state, i, pid, compnum; + int state, compnum; char *cp, *msg = NULL, **argp, **arguments; char *sargv[16], buf[BUFSIZ], name[NAMESZ]; FILE *in; @@ -254,15 +248,7 @@ main(int argc, char **argv) verbose++; out = stdout; } else { -#ifdef HAVE_MKSTEMP - if ((out = fdopen(mkstemp(tmpfil), "w")) == NULL) - adios(tmpfil, "unable to create"); -#else - mktemp(tmpfil); - if ((out = fopen(tmpfil, "w")) == NULL) - adios(tmpfil, "unable to create"); - chmod(tmpfil, 0600); -#endif + tmpfil = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out)); } hdrtab = (msgstate == normal) ? NHeaders : RHeaders; @@ -324,20 +310,6 @@ main(int argc, char **argv) fcc(tmpfil, fccs); } - /* process Bcc */ - if (bccs) { - make_bcc_draft(tmpfil); - } - - /* - ** re-open the temp file, unlink it and exec sendmail, giving it - ** the msg temp file as std in. - */ - if (!freopen(tmpfil, "r", stdin)) { - adios(tmpfil, "can't reopen for sendmail"); - } - unlink(tmpfil); - argp = sargv; *argp++ = "send-mail"; *argp++ = "-m"; /* send to me too */ @@ -349,29 +321,27 @@ main(int argc, char **argv) } *argp = NULL; - if (pushflg) { - /* fork to a child to run sendmail */ - for (i=0; (pid = fork()) == NOTOK && i < 5; i++) - sleep(5); - switch (pid) { - case NOTOK: - fprintf(verbose ? stdout : stderr, - "%s: can't fork to %s\n", - invo_name, sendmail); - exit(-1); - case OK: - /* we're the child .. */ - break; - default: + if (bccs) { + process_bccs(tmpfil); + if (!(msgflags & MVIS)) { + /* only Bcc rcpts: we're finished here */ + unlink(tmpfil); exit(0); } } - if (0 /*bccs*/) { + /* + ** re-open the temp file, unlink it and exec sendmail, giving it + ** the msg temp file as std in. + */ + if (!freopen(tmpfil, "r", stdin)) { + adios(tmpfil, "can't reopen for sendmail"); + } + unlink(tmpfil); + + if (pushflg) { /* fork to a child to run sendmail */ - for (i=0; (pid = fork()) == NOTOK && i < 5; i++) - sleep(5); - switch (pid) { + switch (fork()) { case NOTOK: fprintf(verbose ? stdout : stderr, "%s: can't fork to %s\n", @@ -379,149 +349,119 @@ main(int argc, char **argv) exit(-1); case OK: /* we're the child .. */ - exit(0); + break; default: exit(0); } } - execv(sendmail, sargv); adios(sendmail, "can't exec"); - return 0; /* dead code to satisfy the compiler */ + return -1; } + /* DRAFT GENERATION */ static void putfmt(char *name, char *str, FILE *out) { int i; - char *cp, *pp; + char *cp; struct headers *hdr; - while (*str == ' ' || *str == '\t') + /* remove all leading whitespace (even newlines) */ + while (*str==' ' || *str=='\t' || *str=='\n') { str++; + } if ((i = get_header(name, hdrtab)) == NOTOK) { - /* some boring header: push it through */ + /* no header we would care for: push it through */ fprintf(out, "%s: %s", name, str); return; } - /* one of the interesting headers */ + /* it's one of the interesting headers */ hdr = &hdrtab[i]; - if (hdr->flags & HIGN) { + if (hdr->flags & HIGN || !*str) { return; } + if (hdr->flags & HBAD) { advise(NULL, "illegal header line -- %s:", name); badmsg++; return; } + msgflags |= hdr->set; - if (hdr->flags & HSUB) { - if (subject) { - /* concatenate mupliple subject */ - char *cp = concat(subject, "\t", str, NULL); - free(subject); - subject = cp; - } else { - subject = getcpy(str); - } + if (hdr->flags & HFCC) { + process_fcc(str); + return; } - if (hdr->flags & HFCC) { - if (strlen(str)+strlen(fccs) > sizeof fccs /2) { - adios(NULL, "Too much Fcc data"); + if (hdr->flags & HBCC) { + struct mailname *mp = NULL; + + /* Create list of Bcc addrs. */ + while ((cp = getname(str))) { + mp = getm(cp, NULL, 0, AD_HOST, NULL); + mp->m_next = bccs; /* push */ + bccs = mp; } - /* todo: better have three states: SEPARATOR, PLUS, WORD */ - int state = 0; - for (cp=pp=str; *cp; cp++) { - switch (*cp) { - case ' ': - case '\t': - case '\n': - case ',': - if (state != 0) { - state = 0; - *cp = '\0'; - if (*pp=='+' || *pp=='@') { - strcat(fccs, " "); - } else { - strcat(fccs, " +"); - } - strcat(fccs, pp); - } - break; - default: - if (state == 0) { - state = 1; - pp = cp; - } - break; + return; + } + + if (aliasflg && hdr->flags & HTRY) { + /* + ** This header contains address(es) that we have to do + ** alias expansion on. Because of the saved state in + ** getname we have to put all the addresses into a list. + **/ + struct mailname *f = NULL; + struct mailname *mp = NULL; + + while ((cp = getname(str))) { + mp = getm(cp, NULL, 0, AD_HOST, NULL); + if (!f) { + f = mp; + mp->m_next = mp; + } else { + mp->m_next = f->m_next; + f->m_next = mp; + f = mp; } } + f = mp->m_next; + mp->m_next = NULL; + /* Now munch on the list, possibly expanding aliases */ + putadr(name, f); return; } - if (*str != '\n' && *str != '\0') { - if (hdr->flags & HBCC) { - struct mailname *mp = NULL; + /* + ** The author(s) of spost decided that alias substitution wasn't + ** necessary for the non-HTRY headers. Unfortunately, one of + ** those headers is "From:", and having alias substitution work on + ** that is extremely useful for someone with a lot of POP3 email + ** accounts or aliases. post supports aliasing of "From:"... + ** + ** Since "From:"-processing is incompletely implemented in this + ** unsupported and undocumented spost backend, I'm not going + ** to take the time to implement my new draft-From:-based email + ** address masquerading. If I do ever implement it here, I'd almost + ** certainly want to implement "From:" line alias processing as well. + ** -- Dan Harkless + */ + /* + ** Although there is no masquerading anymore in mmh, we might want + ** to have aliasing of From: addresses. Think about it. + ** -- meillo@marmaro.de 2012-02 + */ - /* Create list of Bcc adds. */ - while ((cp = getname(str))) { - mp = getm(cp, NULL, 0, AD_HOST, NULL); - mp->m_next = bccs; /* push */ - bccs = mp; - } - } else if (aliasflg && hdr->flags & HTRY) { - /* - ** this header contains address(es) that we have to do - ** alias expansion on. Because of the saved state in - ** getname we have to put all the addresses into a - ** list. We then let putadr munch on that list, - ** possibly expanding aliases. - **/ - register struct mailname *f = 0; - register struct mailname *mp = 0; - - while ((cp = getname(str))) { - mp = getm(cp, NULL, 0, AD_HOST, NULL); - if (f == 0) { - f = mp; - mp->m_next = mp; - } else { - mp->m_next = f->m_next; - f->m_next = mp; - f = mp; - } - } - f = mp->m_next; mp->m_next = 0; - putadr(name, f); - } else { - /* - ** The author(s) of spost decided that alias - ** substitution wasn't necessary for the non-HTRY - ** headers. Unfortunately, one of those headers - ** is "From:", and having alias substitution - ** work on that is extremely useful for someone - ** with a lot of POP3 email accounts or aliases. - ** post supports aliasing of "From:"... - ** - ** Since "From:"-processing is incompletely - ** implemented in this unsupported and - ** undocumented spost backend, I'm not - ** going to take the time to implement my new - ** draft-From:-based email address masquerading. - ** If I do ever implement it here, I'd almost - ** certainly want to implement "From:" line - ** alias processing as well. - ** -- Dan Harkless - */ - fprintf(out, "%s: %s", name, str); - } + if (hdr->flags & HSUB) { + subject = getcpy(str); } + fprintf(out, "%s: %s", name, str); } @@ -556,6 +496,7 @@ finish_headers(FILE *out) fprintf(out, "%sBcc: Blind Distribution List: ;\n", resentstr); } if (badmsg) { + unlink(tmpfil); adios(NULL, "re-format message and try again"); } } @@ -663,6 +604,44 @@ putone(char *adr, int pos, int indent) static void +process_fcc(char *str) +{ + char *cp, *pp; + int state = 0; + + if (strlen(str)+strlen(fccs) > sizeof fccs /2) { + adios(NULL, "Too much Fcc data"); + } + /* todo: better have three states: SEPARATOR, PLUS, WORD */ + for (cp=pp=str; *cp; cp++) { + switch (*cp) { + case ' ': + case '\t': + case '\n': + case ',': + if (state != 0) { + state = 0; + *cp = '\0'; + if (*pp=='+' || *pp=='@') { + strcat(fccs, " "); + } else { + strcat(fccs, " +"); + } + strcat(fccs, pp); + } + break; + default: + if (state == 0) { + state = 1; + pp = cp; + } + break; + } + } +} + + +static void fcc(char *file, char *folders) { int status; @@ -693,28 +672,33 @@ fcc(char *file, char *folders) /* BCC GENERATION */ static void -make_bcc_draft(char *draft) +process_bccs(char *origmsg) { - int fd; - FILE *out; - -#ifdef HAVE_MKSTEMP - fd = mkstemp(bccfil); - if (fd == -1 || (out = fdopen(fd, "w")) == NULL) - adios(bccfil, "unable to create"); -#else - mktemp(bccfil); - if ((out = fopen(bccfil, "w")) == NULL) - adios(bccfil, "unable to create"); -#endif - chmod(bccfil, 0600); - - if (subject) { - fprintf(out, "Subject: BCC: %s", subject); - } else { - fprintf(out, "Subject: BCC: message without subject"); + char *bccdraft = NULL; + char buf[BUFSIZ]; + struct mailname *mp = NULL; + FILE *out = NULL; + + for (mp=bccs; mp; mp=mp->m_next) { + /* + ** Note: This draft file will be left existing by send(1), + ** although renamed with backup prefix. + ** TODO: We should have it removed eventually. + */ + bccdraft = getcpy(m_mktemp2("/tmp/", invo_name, NULL, &out)); + fprintf(out, "To: %s\n", mp->m_text); + fprintf(out, "Subject: [BCC] %s", subject ? subject : ""); + fprintf(out, "%s: %s\n", attach_hdr, origmsg); + fprintf(out, "------------\n"); + fclose(out); + + snprintf(buf, sizeof buf, "%s%s %s", sendproc, + pushflg ? " -push" : "", bccdraft); + if (system(buf) != 0) { + admonish(invo_name, "Problems to send Bcc to %s", + mp->m_text); + unlink(bccdraft); + } + /* TODO: unlink renamed bcc draft after send(1) */ } - fprintf(out, "%s: %s\n", attach_hdr, draft); - fprintf(out, "------------\n"); - fclose(out); }