X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7c545bcaf9158021853d3dc097d2e41b7417ad10..c347c3bb:/uip/sendsbr.c?ds=sidebyside diff --git a/uip/sendsbr.c b/uip/sendsbr.c index a3270e09..792ac12f 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -1,6 +1,4 @@ - -/* - * sendsbr.c -- routines to help WhatNow/Send along +/* sendsbr.c -- routines to help WhatNow/Send along * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -26,7 +24,7 @@ #ifdef OAUTH_SUPPORT #include -static int setup_oauth_params(char *[], int *, int, const char **); +static int setup_oauth_params(char *[], int *, const char *, const char **); #endif /* OAUTH_SUPPORT */ int debugsw = 0; /* global */ @@ -52,7 +50,7 @@ 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 *); +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 *); @@ -64,7 +62,7 @@ static void armed_done (int) NORETURN; int sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, - int rename_drft) + int rename_drft, const char *auth_svc) { int status, i; pid_t child; @@ -88,7 +86,7 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, break; case OK: - buildvec = argsplit(buildmimeproc, &buildprogram, &i); + buildvec = argsplit(buildmimeproc, &buildprogram, &i); buildvec[i++] = "-auto"; if (distfile) buildvec[i++] = "-dist"; @@ -124,12 +122,28 @@ sendsbr (char **vec, int vecp, char *program, char *draft, struct stat *st, 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); + handle_sendfrom(vec, nvecsp, draft, auth_svc); } /* @@ -270,7 +284,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, nparts = 1; pos = start; - while (fgets (buffer, sizeof(buffer) - 1, in)) { + while (fgets (buffer, sizeof buffer, in)) { long len; if ((pos += (len = strlen (buffer))) > CPERMSG) { @@ -282,8 +296,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); @@ -341,7 +354,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, for (;;) { long len; - if (!fgets (buffer, sizeof(buffer) - 1, in)) { + if (!fgets (buffer, sizeof buffer, in)) { if (partno == nparts) break; adios (NULL, "premature eof"); @@ -361,7 +374,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft, fclose (out); if (!pushsw && verbsw) { - printf ("\n"); + putchar('\n'); fflush (stdout); } @@ -389,8 +402,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; @@ -418,8 +430,8 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) snprintf (buf, sizeof(buf), "%d", fd2); vec[vecp++] = buf; } else { - admonish (NULL, "unable to create temporary file in %s " - "for annotation list", get_temp_dir()); + inform("unable to create temporary file in %s for " + "annotation list, continuing...", get_temp_dir()); } } vec[vecp++] = drft; @@ -440,7 +452,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) /* * child process -- send it * - * If fd is ok, then we are pushing and fd points to temp + * If fd is OK, then we are pushing and fd points to temp * file, so capture anything on stdout and stderr there. */ if (fd != NOTOK) { @@ -470,7 +482,7 @@ sendaux (char **vec, int vecp, char *program, char *drft, struct stat *st) alert (drft, fd); close (fd); } else { - advise (NULL, "message not delivered to anyone"); + inform("message not delivered to anyone"); } if (annotext && fd2 != NOTOK) close (fd2); @@ -508,6 +520,7 @@ alert (char *file, int out) case NOTOK: /* oops -- fork error */ advise ("fork", "unable to"); + /* FALLTHRU */ case OK: /* child process -- send it */ @@ -572,7 +585,7 @@ tmp_fd (void) if ((tfile = m_mktemp2(NULL, invo_name, &fd, NULL)) == NULL) return NOTOK; if (debugsw) - advise (NULL, "temporary file %s selected", tfile); + inform("temporary file %s selected", tfile); else if (m_unlink (tfile) == NOTOK) advise (tfile, "unable to remove"); @@ -595,7 +608,7 @@ anno (int fd, struct stat *st) || st->st_dev != st2.st_dev || st->st_ino != st2.st_ino)) { if (debugsw) - admonish (NULL, "$mhaltmsg mismatch"); + inform("$mhaltmsg mismatch, continuing..."); return; } @@ -603,10 +616,10 @@ anno (int fd, struct stat *st) switch (child_id) { case NOTOK: /* oops */ if (!debugsw) - advise (NULL, - "unable to fork, so doing annotations by hand..."); + inform("unable to fork, so doing annotations by hand..."); if (cwd == NULL) - cwd = getcpy (pwd ()); + cwd = mh_xstrdup(pwd ()); + /* FALLTHRU */ case OK: /* block a few signals */ @@ -649,7 +662,7 @@ annoaux (int fd) if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) { if (debugsw) - admonish (NULL, "$mhfolder not set"); + inform("$mhfolder not set, continuing..."); return; } maildir = m_maildir (folder); @@ -660,20 +673,20 @@ annoaux (int fd) } if (!(mp = folder_read (folder, 0))) { if (debugsw) - admonish (NULL, "unable to read folder %s", folder); + inform("unable to read folder %s, continuing...", folder); return; } /* check for empty folder */ if (mp->nummsg == 0) { if (debugsw) - admonish (NULL, "no messages in %s", folder); + inform("no messages in %s, continuing...", folder); goto oops; } if ((cp = getenv ("mhmessages")) == NULL || *cp == 0) { if (debugsw) - admonish (NULL, "$mhmessages not set"); + inform("$mhmessages not set, continuing..."); goto oops; } if (!debugsw /* MOBY HACK... */ @@ -685,21 +698,21 @@ 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) dup2 (fd2, fileno (stderr)); if (mp->numsel == 0) { if (debugsw) - admonish (NULL, "no messages to annotate"); + inform("no messages to annotate, continuing..."); goto oops; } lseek (fd, (off_t) 0, SEEK_SET); if ((fp = fdopen (fd, "r")) == NULL) { if (debugsw) - admonish (NULL, "unable to fdopen annotation list"); + inform("unable to fdopen annotation list, continuing..."); goto oops; } cp = NULL; @@ -708,12 +721,12 @@ annoaux (int fd) fclose (fp); if (debugsw) - advise (NULL, "annotate%s with %s: \"%s\"", + inform("annotate%s with %s: \"%s\"", inplace ? " inplace" : "", annotext, cp); for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) { if (is_selected(mp, msgnum)) { if (debugsw) - advise (NULL, "annotate message %d", msgnum); + inform("annotate message %d", msgnum); annotate (m_name (msgnum), annotext, cp, inplace, 1, -2, 0); } } @@ -727,7 +740,7 @@ oops: static void -handle_sendfrom(char **vec, int *vecp, char *draft) { +handle_sendfrom(char **vec, int *vecp, char *draft, const char *auth_svc) { const char *addr, *host; const char *message; @@ -749,22 +762,13 @@ handle_sendfrom(char **vec, int *vecp, char *draft) { for (vp = vec; *vp; ++vp) { if (strcmp(*vp, "xoauth2") == 0) { #ifdef OAUTH_SUPPORT - int snoop = 0; - - /* -snoop will be in vec if it was enabled. */ - for (vp = vec; vp && *vp; ++vp) { - if (strcmp(*vp, "-snoop") == 0) { - snoop = 1; - break; - } - } - - if (setup_oauth_params(vec, vecp, snoop, &message) != OK) { + if (setup_oauth_params(vec, vecp, auth_svc, &message) != OK) { adios(NULL, message); } break; #else - adios(NULL, "sendfrom built without OAUTH_SUPPORT, " + NMH_UNUSED(auth_svc); + adios(NULL, "send built without OAUTH_SUPPORT, " "so -saslmech xoauth2 is not supported"); #endif /* OAUTH_SUPPORT */ } @@ -775,12 +779,14 @@ handle_sendfrom(char **vec, int *vecp, char *draft) { #ifdef OAUTH_SUPPORT /* - * For XOAUTH2, append access token, from mh_oauth_do_xoauth(), for the user to vec. + * For XOAUTH2, append profile entries so post can do the heavy lifting */ -static -int -setup_oauth_params(char *vec[], int *vecp, int snoop, const char **message) { - const char *saslmech = NULL, *user = NULL, *auth_svc = NULL; +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. */ @@ -807,11 +813,28 @@ setup_oauth_params(char *vec[], int *vecp, int snoop, const char **message) { return NOTOK; } - vec[(*vecp)++] = getcpy("-authservice"); if (saslmech && ! strcasecmp(saslmech, "xoauth2")) { - vec[(*vecp)++] = mh_oauth_do_xoauth(user, auth_svc, snoop ? stderr : NULL); - } else { - vec[(*vecp)++] = getcpy(auth_svc); + 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); } } @@ -834,27 +857,43 @@ get_from_header_info(const char *filename, const char **addr, const char **host, return NOTOK; } - if ((in = fopen(filename, "r")) != NULL) { - char *addrformat = "%(addr{from})", *hostformat = "%(host{from})"; - - if ((*addr = get_message_header_info(in, addrformat)) == NULL) { - *message = "unable to find From: address in"; - 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; + } + } } - rewind(in); + /* Use the hostformat that corresponds to the successful addrformat. */ if ((*host = get_message_header_info(in, hostformat)) == NULL) { fclose(in); - *message = "unable to find From: host in"; + *message = "unable to find sender host in"; + fclose(in); return NOTOK; } fclose(in); return OK; - } else { - *message = "unable to open"; - return NOTOK; } + + *message = "unable to open"; + return NOTOK; } @@ -883,6 +922,7 @@ get_message_header_info(FILE *in, char *format) { /* * Read in the message and process the header. */ + rewind (in); parsing_header = 1; do { char name[NAMESZ], rbuf[NMH_BUFSIZ]; @@ -920,8 +960,11 @@ get_message_header_info(FILE *in, char *format) { /* Trim trailing newline, if any. */ retval = rtrim(charstring_buffer_copy((buffer))); charstring_free(buffer); + if (*retval) + return retval; - return retval; + free(retval); + return NULL; } @@ -951,7 +994,7 @@ merge_profile_entry(const char *addr, const char *host, char *vec[], int *vecp) } /* Use argsplit() to do the real work of splitting the args in the profile entry. */ - if (profile_entry && strlen(profile_entry) > 0) { + if (profile_entry && *profile_entry) { int profile_vecp; char *file; char **profile_vec = argsplit(profile_entry, &file, &profile_vecp);