X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/96646146f2dcca09a23108ef3d9b6bedd7da8a39..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/sendsbr.c?ds=sidebyside diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 2b946689..497c868b 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -8,18 +8,27 @@ */ #include +#include +#include #include #include #include #include #include #include +#include #ifdef HAVE_SYS_TIME_H # include #endif #include +#ifdef OAUTH_SUPPORT +#include + +static int setup_oauth_params(char *[], int *, const char *, const char **); +#endif /* OAUTH_SUPPORT */ + int debugsw = 0; /* global */ int forwsw = 1; int inplace = 1; @@ -34,142 +43,138 @@ char *distfile = NULL; static jmp_buf env; -/* - * external prototypes - */ -int sendsbr (char **, int, char *, char *, struct stat *, int, char *, int); -char *getusername (void); - /* * static prototypes */ -static void armed_done (int) NORETURN; static void alert (char *, int); static int tmp_fd (void); static void anno (int, struct stat *); static void annoaux (int); static int splitmsg (char **, int, char *, char *, struct stat *, int); static int sendaux (char **, int, char *, char *, struct stat *); - +static void handle_sendfrom(char **, int *, char *, const char *); +static int get_from_header_info(const char *, const char **, const char **, const char **); +static const char *get_message_header_info(FILE *, char *); +static void merge_profile_entry(const char *, const char *, char *[], int *); +static void armed_done (int) NORETURN; /* * Entry point into (back-end) routines to send message. */ int -sendsbr (char **vec, int vecp, char *program, char *drft, struct stat *st, - int rename_drft, char *attachment_header_field_name, int attachformat) +sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, + int rename_drft, const char *auth_svc) { - int status; + int status, i; + pid_t child; char buffer[BUFSIZ], file[BUFSIZ]; struct stat sts; - char *original_draft; /* name of original draft file */ - char *p; /* string pointer for building file name */ - char composition_file_name[PATH_MAX + 1]; /* name of mhbuild composition temporary file */ - char body_file_name[PATH_MAX + 1]; /* name of temporary file for body content */ + char **buildvec, *buildprogram; + char *volatile drft = draft; + /* nvecs is volatile to prevent warning from gcc about possible clobbering + by longjmp. */ + volatile int nvecs = vecp; + int *nvecsp = (int *) &nvecs; /* - * Save the original name of the draft file. The name of the draft file is changed - * to a temporary file containing the built MIME message if there are attachments. - * We need the original name so that it can be renamed after the message is sent. + * Run the mimebuildproc (which is by default mhbuild) on the message + * with the addition of the "-auto" flag */ - original_draft = drft; - - /* - * There might be attachments if a header field name for attachments is supplied. - * Convert the draft to a MIME message. Use the mhbuild composition file for the - * draft if there was a successful conversion because that now contains the MIME - * message. A nice side effect of this is that it leaves the original draft file - * untouched so that it can be retrieved and modified if desired. - */ - - if (attachment_header_field_name != (char *)0) { - switch (attach(attachment_header_field_name, drft, - body_file_name, sizeof body_file_name, - composition_file_name, sizeof composition_file_name, - attachformat)) { - case OK: - drft = composition_file_name; - break; + switch (child = fork()) { + case NOTOK: + adios("fork", "unable to"); + break; - case NOTOK: - return (NOTOK); + case OK: + buildvec = argsplit(buildmimeproc, &buildprogram, &i); + buildvec[i++] = "-auto"; + if (distfile) + buildvec[i++] = "-dist"; + buildvec[i++] = (char *) drft; + buildvec[i] = NULL; + execvp(buildprogram, buildvec); + fprintf(stderr, "unable to exec "); + perror(buildmimeproc); + _exit(-1); + break; - case DONE: - break; - } + default: + if (pidXwait(child, buildmimeproc)) + return NOTOK; + break; } done=armed_done; switch (setjmp (env)) { - case OK: + case OK: /* * If given -push and -unique (which is undocumented), then * rename the draft file. I'm not quite sure why. */ if (pushsw && unique) { - char *cp = m_mktemp2(drft, invo_name, NULL, NULL); - if (cp == NULL) { - adios ("sendsbr", "unable to create temporary file"); - } + char *cp = m_mktemp2(drft, invo_name, NULL, NULL); + if (cp == NULL) { + adios(NULL, "unable to create temporary file in %s", + get_temp_dir()); + } if (rename (drft, strncpy(file, cp, sizeof(file))) == NOTOK) adios (file, "unable to rename %s to", drft); drft = file; } + /* + * Add in any necessary profile entries for xoauth + */ + + if (auth_svc) { +#ifdef OAUTH_SUPPORT + const char *errmsg; + if (setup_oauth_params(vec, nvecsp, auth_svc, &errmsg) != OK) { + adios(NULL, errmsg); + } +#else + adios(NULL, "send built without OAUTH_SUPPORT, " + "so auth_svc %s is not supported", auth_svc); +#endif /* OAUTH_SUPPORT */ + } + + /* + * Rework the vec based on From: header in draft, as specified + * by sendfrom-address entries in profile. + */ + if (context_find_prefix("sendfrom-")) { + handle_sendfrom(vec, nvecsp, draft, auth_svc); + } + /* * Check if we need to split the message into * multiple messages of type "message/partial". */ - if (splitsw >= 0 && !distfile && stat (drft, &sts) != NOTOK + if (splitsw >= 0 && !distfile && stat ((char *) drft, &sts) != NOTOK && sts.st_size >= CPERMSG) { - status = splitmsg (vec, vecp, program, drft, st, splitsw) ? NOTOK : OK; + status = splitmsg (vec, nvecs, program, drft, + st, splitsw) ? NOTOK : OK; } else { - status = sendaux (vec, vecp, program, drft, st) ? NOTOK : OK; + status = sendaux (vec, nvecs, program, drft, st) ? NOTOK : OK; } /* rename the original draft */ if (rename_drft && status == OK && - rename (original_draft, strncpy (buffer, m_backup (original_draft), sizeof(buffer))) == NOTOK) + rename (drft, strncpy (buffer, m_backup (drft), + sizeof(buffer))) == NOTOK) advise (buffer, "unable to rename %s to", drft); break; - default: + default: status = DONE; break; } done=exit; if (distfile) - unlink (distfile); - - /* - * Get rid of any temporary files that we created for attachments. Also get rid of - * the renamed composition file that mhbuild leaves as a turd. It looks confusing, - * but we use the body file name to help build the renamed composition file name. - */ - - if (drft == composition_file_name) { - clean_up_temporary_files(body_file_name, composition_file_name); - - if (strlen(composition_file_name) >= sizeof (composition_file_name) - 6) - advise((char *)0, "unable to remove original composition file."); - - else { - if ((p = strrchr(composition_file_name, '/')) == (char *)0) - p = composition_file_name; - else - p++; - - (void)strcpy(body_file_name, p); - *p++ = ','; - (void)strcpy(p, body_file_name); - (void)strcat(p, ".orig"); - - (void)unlink(composition_file_name); - } - } + (void) m_unlink (distfile); return status; } @@ -228,7 +233,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, * of message/partials. For the "Subject" header * field, we also record it, so that a modified * version of it, can be copied to the header - * of each messsage/partial in the collection. + * of each message/partial in the collection. */ if (!strcasecmp (name, "Subject")) { size_t sublen; @@ -293,8 +298,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, /* Only one part, nothing to split */ if (nparts == 1) { free (cp); - if (dp) - free (dp); + mh_xfree(dp); fclose (in); return sendaux (vec, vecp, program, drft, st); @@ -321,10 +325,10 @@ splitmsg (char **vec, int vecp, char *program, char *drft, char *cp = m_mktemp2(drft, invo_name, NULL, &out); if (cp == NULL) { - adios (drft, "unable to create temporary file for"); + adios(NULL, "unable to create temporary file in %s", + get_temp_dir()); } strncpy(tmpdrf, cp, sizeof(tmpdrf)); - chmod (tmpdrf, 0600); /* * Output the header fields @@ -357,7 +361,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, break; adios (NULL, "premature eof"); } - + if ((pos += (len = strlen (buffer))) > CPERMSG) { fseek (in, -len, SEEK_CUR); break; @@ -372,7 +376,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, fclose (out); if (!pushsw && verbsw) { - printf ("\n"); + putchar('\n'); fflush (stdout); } @@ -388,7 +392,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, snprintf (partnum, sizeof(partnum), "%d", partno); status = sendaux (vec, vecp, program, tmpdrf, st); - unlink (tmpdrf); + (void) m_unlink (tmpdrf); if (status != OK) break; @@ -400,8 +404,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, } free (cp); - if (dp) - free (dp); + mh_xfree(dp); fclose (in); /* close the draft */ return status; @@ -423,16 +426,17 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) fd = pushsw ? tmp_fd () : NOTOK; fd2 = NOTOK; - vec[vecp++] = drft; if (annotext) { if ((fd2 = tmp_fd ()) != NOTOK) { vec[vecp++] = "-idanno"; snprintf (buf, sizeof(buf), "%d", fd2); vec[vecp++] = buf; } else { - admonish (NULL, "unable to create file for annotation list"); + admonish (NULL, "unable to create temporary file in %s " + "for annotation list", get_temp_dir()); } } + vec[vecp++] = drft; if (distfile && distout (drft, distfile, backup) == NOTOK) done (1); vec[vecp] = NULL; @@ -485,7 +489,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) if (annotext && fd2 != NOTOK) close (fd2); if (distfile) { - unlink (drft); + (void) m_unlink (drft); if (rename (backup, drft) == NOTOK) advise (drft, "unable to rename %s to", backup); } @@ -531,13 +535,19 @@ alert (char *file, int out) } else { lseek (out, (off_t) 0, SEEK_END); strncpy (buf, "\nMessage not delivered to anyone.\n", sizeof(buf)); - write (out, buf, strlen (buf)); + if (write (out, buf, strlen (buf)) < 0) { + advise (file, "write"); + } strncpy (buf, "\n------- Unsent Draft\n\n", sizeof(buf)); - write (out, buf, strlen (buf)); + if (write (out, buf, strlen (buf)) < 0) { + advise (file, "write"); + } cpydgst (in, out, file, "temporary file"); close (in); strncpy (buf, "\n------- End of Unsent Draft\n", sizeof(buf)); - write (out, buf, strlen (buf)); + if (write (out, buf, strlen (buf)) < 0) { + advise (file, "write"); + } if (rename (file, strncpy (buf, m_backup (file), sizeof(buf))) == NOTOK) admonish (buf, "unable to rename %s to", file); } @@ -571,16 +581,14 @@ static int tmp_fd (void) { int fd; - char *tfile = NULL; + char *tfile; - tfile = m_mktemp2(NULL, invo_name, &fd, NULL); - if (tfile == NULL) return NOTOK; - fchmod(fd, 0600); + if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK; if (debugsw) advise (NULL, "temporary file %s selected", tfile); else - if (unlink (tfile) == NOTOK) + if (m_unlink (tfile) == NOTOK) advise (tfile, "unable to remove"); return fd; @@ -612,9 +620,9 @@ anno (int fd, struct stat *st) advise (NULL, "unable to fork, so doing annotations by hand..."); if (cwd == NULL) - cwd = getcpy (pwd ()); + cwd = mh_xstrdup(pwd ()); - case OK: + case OK: /* block a few signals */ sigemptyset (&set); sigaddset (&set, SIGHUP); @@ -623,6 +631,8 @@ anno (int fd, struct stat *st) sigaddset (&set, SIGTERM); sigprocmask (SIG_BLOCK, &set, &oset); + unregister_for_removal(0); + annoaux (fd); if (child_id == OK) _exit (0); @@ -630,7 +640,9 @@ anno (int fd, struct stat *st) /* reset the signal mask */ sigprocmask (SIG_SETMASK, &oset, &set); - chdir (cwd); + if (chdir (cwd) < 0) { + advise (cwd, "chdir"); + } break; default: /* no waiting... */ @@ -687,7 +699,7 @@ annoaux (int fd) } else fd2 = NOTOK; - for (ap = brkstring (cp = getcpy (cp), " ", NULL); *ap; ap++) + for (ap = brkstring (cp = mh_xstrdup(cp), " ", NULL); *ap; ap++) m_convert (mp, *ap); free (cp); if (fd2 != NOTOK) @@ -727,6 +739,277 @@ oops: } +static +void +handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) { + const char *addr, *host; + const char *message; + + /* Extract address and host from From: header line in draft. */ + if (get_from_header_info(draft, &addr, &host, &message) != OK) { + adios(draft, message); + } + + /* Merge in any address or host specific switches to post(1) from profile. */ + merge_profile_entry(addr, host, vec, vecp); + free((void *) host); + free((void *) addr); + + vec[*vecp] = NULL; + + { + char **vp; + + for (vp = vec; *vp; ++vp) { + if (strcmp(*vp, "xoauth2") == 0) { +#ifdef OAUTH_SUPPORT + if (setup_oauth_params(vec, vecp, auth_svc, &message) != OK) { + adios(NULL, message); + } + break; +#else + NMH_UNUSED(auth_svc); + adios(NULL, "send built without OAUTH_SUPPORT, " + "so -saslmech xoauth2 is not supported"); +#endif /* OAUTH_SUPPORT */ + } + } + } +} + + +#ifdef OAUTH_SUPPORT +/* + * For XOAUTH2, append profile entries so post can do the heavy lifting + */ +static int +setup_oauth_params(char *vec[], int *vecp, const char *auth_svc, + const char **message) { + const char *saslmech = NULL, *user = NULL; + mh_oauth_service_info svc; + char errbuf[256]; + int i; + + /* Make sure we have all the information we need. */ + for (i = 1; i < *vecp; ++i) { + /* Don't support abbreviated switches, to avoid collisions in the + future if new ones are added. */ + if (! strcmp(vec[i-1], "-saslmech")) { + saslmech = vec[i]; + } else if (! strcmp(vec[i-1], "-user")) { + user = vec[i]; + } else if (! strcmp(vec[i-1], "-authservice")) { + auth_svc = vec[i]; + } + } + + if (auth_svc == NULL) { + if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { + *message = "must specify -authservice with -saslmech xoauth2"; + return NOTOK; + } + } else { + if (user == NULL) { + *message = "must specify -user with -saslmech xoauth2"; + return NOTOK; + } + + if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { + if (! mh_oauth_get_service_info(auth_svc, &svc, errbuf, + sizeof(errbuf))) + adios(NULL, "Unable to retrieve oauth profile entries: %s", + errbuf); + + vec[(*vecp)++] = mh_xstrdup("-authservice"); + vec[(*vecp)++] = mh_xstrdup(auth_svc); + vec[(*vecp)++] = mh_xstrdup("-oauthcredfile"); + vec[(*vecp)++] = mh_xstrdup(mh_oauth_cred_fn(auth_svc)); + vec[(*vecp)++] = mh_xstrdup("-oauthclientid"); + vec[(*vecp)++] = getcpy(svc.client_id); + vec[(*vecp)++] = mh_xstrdup("-oauthclientsecret"); + vec[(*vecp)++] = getcpy(svc.client_secret); + vec[(*vecp)++] = mh_xstrdup("-oauthauthendpoint"); + vec[(*vecp)++] = getcpy(svc.auth_endpoint); + vec[(*vecp)++] = mh_xstrdup("-oauthredirect"); + vec[(*vecp)++] = getcpy(svc.redirect_uri); + vec[(*vecp)++] = mh_xstrdup("-oauthtokenendpoint"); + vec[(*vecp)++] = getcpy(svc.token_endpoint); + vec[(*vecp)++] = mh_xstrdup("-oauthscope"); + vec[(*vecp)++] = getcpy(svc.scope); + } + } + + return 0; +} +#endif /* OAUTH_SUPPORT */ + + +/* + * Extract user and domain from From: header line in draft. + */ +static +int +get_from_header_info(const char *filename, const char **addr, const char **host, const char **message) { + struct stat st; + FILE *in; + + if (stat (filename, &st) == NOTOK) { + *message = "unable to stat draft file"; + return NOTOK; + } + + if ((in = fopen (filename, "r")) != NULL) { + /* There must be a non-blank Envelope-From or {Resent-}Sender or + {Resent-}From header. */ + char *addrformat = "%(addr{Envelope-From})"; + char *hostformat = "%(host{Envelope-From})"; + + if ((*addr = get_message_header_info (in, addrformat)) == NULL || + !**addr) { + addrformat = distfile == NULL ? "%(addr{Sender})" : "%(addr{Resent-Sender})"; + hostformat = distfile == NULL ? "%(host{Sender})" : "%(host{Resent-Sender})"; + + if ((*addr = get_message_header_info (in, addrformat)) == NULL) { + addrformat = distfile == NULL ? "%(addr{From})" : "%(addr{Resent-From})"; + hostformat = distfile == NULL ? "%(host{From})" : "%(host{Resent-From})"; + + if ((*addr = get_message_header_info (in, addrformat)) == NULL) { + *message = "unable to find sender address in"; + fclose(in); + return NOTOK; + } + } + } + + /* Use the hostformat that corresponds to the successful addrformat. */ + if ((*host = get_message_header_info(in, hostformat)) == NULL) { + fclose(in); + *message = "unable to find sender host in"; + fclose(in); + return NOTOK; + } + fclose(in); + + return OK; + } + + *message = "unable to open"; + return NOTOK; +} + + +/* + * Get formatted information from header of a message. + * Adapted from process_single_file() in uip/fmttest.c. + */ +static +const char * +get_message_header_info(FILE *in, char *format) { + int dat[5]; + struct format *fmt; + struct stat st; + int parsing_header; + m_getfld_state_t gstate = 0; + charstring_t buffer = charstring_create(0); + char *retval; + + dat[0] = dat[1] = dat[4] = 0; + dat[2] = fstat(fileno(in), &st) == 0 ? st.st_size : 0; + dat[3] = INT_MAX; + + (void) fmt_compile(new_fs(NULL, NULL, format), &fmt, 1); + free_fs(); + + /* + * Read in the message and process the header. + */ + rewind (in); + parsing_header = 1; + do { + char name[NAMESZ], rbuf[NMH_BUFSIZ]; + int bufsz = sizeof rbuf; + int state = m_getfld(&gstate, name, rbuf, &bufsz, in); + + switch (state) { + case FLD: + case FLDPLUS: { + int bucket = fmt_addcomptext(name, rbuf); + + if (bucket != -1) { + while (state == FLDPLUS) { + bufsz = sizeof rbuf; + state = m_getfld(&gstate, name, rbuf, &bufsz, in); + fmt_appendcomp(bucket, name, rbuf); + } + } + + while (state == FLDPLUS) { + bufsz = sizeof rbuf; + state = m_getfld(&gstate, name, rbuf, &bufsz, in); + } + break; + } + default: + parsing_header = 0; + } + } while (parsing_header); + m_getfld_state_destroy(&gstate); + + fmt_scan(fmt, buffer, INT_MAX, dat, NULL); + fmt_free(fmt, 1); + + /* Trim trailing newline, if any. */ + retval = rtrim(charstring_buffer_copy((buffer))); + charstring_free(buffer); + if (*retval) + return retval; + + free(retval); + return NULL; +} + + +/* + * Look in profile for entry corresponding to addr or host, and add its contents to vec. + * + * Could do some of this automatically, by looking for: + * 1) access-$(mbox{from}) in oauth-svc file using mh_oauth_cred_load(), which isn't + * static and doesn't have side effects; free the result with mh_oauth_cred_free()) + * 2) machine $(mbox{from}) in creds + * If no -server passed in from profile or commandline, could use smtp..com for gmail, + * but that might not generalize for other svcs. + */ +static +void +merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp) { + char *addr_entry = concat("sendfrom-", addr, NULL); + char *profile_entry = context_find(addr_entry); + + free(addr_entry); + if (profile_entry == NULL) { + /* No entry for the user. Look for one for the host. */ + char *host_entry = concat("sendfrom-", host, NULL); + + profile_entry = context_find(host_entry); + free(host_entry); + } + + /* Use argsplit() to do the real work of splitting the args in the profile entry. */ + if (profile_entry && *profile_entry) { + int profile_vecp; + char *file; + char **profile_vec = argsplit(profile_entry, &file, &profile_vecp); + int i; + + for (i = 0; i < profile_vecp; ++i) { + vec[(*vecp)++] = getcpy(profile_vec[i]); + } + + arglist_free(file, profile_vec); + } +} + + static void armed_done (int status) {