-
-/*
- * 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
*/
#include <h/mh.h>
+#include <h/fmt_scan.h>
+#include <h/fmt_compile.h>
#include <h/signals.h>
#include <setjmp.h>
#include <fcntl.h>
#include <h/mime.h>
#include <h/tws.h>
#include <h/utils.h>
+#include <h/mts.h>
#ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
#endif
#include <time.h>
+#ifdef OAUTH_SUPPORT
+#include <h/oauth.h>
+#endif
+#include "../sbr/m_maildir.h"
+#include "../sbr/m_mktemp.h"
+#include "../sbr/message_id.h"
+
+#ifdef OAUTH_SUPPORT
+static int setup_oauth_params(char *[], int *, const char *, const char **);
+#endif /* OAUTH_SUPPORT */
+
int debugsw = 0; /* global */
int forwsw = 1;
int inplace = 1;
static jmp_buf env;
-static char body_file_name[PATH_MAX + 1]; /* name of temporary file for body content */
-static char composition_file_name[PATH_MAX + 1]; /* name of mhbuild composition temporary file */
-static int field_size; /* size of header field buffer */
-static char *field; /* header field buffer */
-static FILE *draft_file; /* draft file pointer */
-static FILE *body_file; /* body file pointer */
-static FILE *composition_file; /* composition file pointer */
-
-/*
- * 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 int attach(char *, char *, int);
-static void clean_up_temporary_files(void);
-static int get_line(void);
-static void make_mime_composition_file_entry(char *, int, char *);
-static char *mime_type (const 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 *);
+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 **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, 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();
-
- 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;
}
-static int
-attach(char *attachment_header_field_name, char *draft_file_name,
- int attachformat)
-{
- char buf[PATH_MAX + 6]; /* miscellaneous buffer */
- int c; /* current character for body copy */
- int has_attachment; /* draft has at least one attachment */
- int has_body; /* draft has a message body */
- int length; /* length of attachment header field name */
- char *p; /* miscellaneous string pointer */
- FILE *fp; /* pointer for mhn.defaults */
-
- /*
- * Open up the draft file.
- */
-
- if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0)
- adios((char *)0, "can't open draft file `%s'.", draft_file_name);
-
- /*
- * Allocate a buffer to hold the header components as they're read in.
- * This buffer might need to be quite large, so we grow it as needed.
- */
-
- field = (char *)mh_xmalloc(field_size = 256);
-
- /*
- * Scan the draft file for a header field name, with a non-empty
- * body, that matches the -attach argument. The existence of one
- * indicates that the draft has attachments. Bail out if there
- * are no attachments because we're done. Read to the end of the
- * headers even if we have no attachments.
- */
-
- length = strlen(attachment_header_field_name);
-
- has_attachment = 0;
-
- while (get_line() != EOF && *field != '\0' && *field != '-') {
- if (strncasecmp(field, attachment_header_field_name, length) == 0 &&
- field[length] == ':') {
- for (p = field + length + 1; *p == ' ' || *p == '\t'; p++)
- ;
- if (strlen (p) > 0) {
- has_attachment = 1;
- }
- }
- }
-
- if (has_attachment == 0)
- return (DONE);
-
- /*
- * We have at least one attachment. Look for at least one non-blank line
- * in the body of the message which indicates content in the body.
- */
-
- has_body = 0;
-
- while (get_line() != EOF) {
- for (p = field; *p != '\0'; p++) {
- if (*p != ' ' && *p != '\t') {
- has_body = 1;
- break;
- }
- }
-
- if (has_body)
- break;
- }
-
- /*
- * Make names for the temporary files.
- */
-
- (void)strncpy(body_file_name,
- m_mktemp(m_maildir(invo_name), NULL, NULL),
- sizeof (body_file_name));
- (void)strncpy(composition_file_name,
- m_mktemp(m_maildir(invo_name), NULL, NULL),
- sizeof (composition_file_name));
-
- if (has_body)
- body_file = fopen(body_file_name, "w");
-
- composition_file = fopen(composition_file_name, "w");
-
- if ((has_body && body_file == (FILE *)0) || composition_file == (FILE *)0) {
- clean_up_temporary_files();
- adios((char *)0, "unable to open all of the temporary files.");
- }
-
- /*
- * Start at the beginning of the draft file. Copy all
- * non-attachment header fields to the temporary composition
- * file. Then add the dashed line separator.
- */
-
- rewind(draft_file);
-
- while (get_line() != EOF && *field != '\0' && *field != '-')
- if (strncasecmp(field, attachment_header_field_name, length) != 0 ||
- field[length] != ':')
- (void)fprintf(composition_file, "%s\n", field);
-
- (void)fputs("--------\n", composition_file);
-
- /*
- * Copy the message body to a temporary file.
- */
-
- if (has_body) {
- while ((c = getc(draft_file)) != EOF)
- putc(c, body_file);
-
- (void)fclose(body_file);
- }
-
- /*
- * Add a mhbuild MIME composition file line for the body if there was one.
- * Set the default content type to text/plain so that mhbuild takes care
- * of any necessary encoding.
- */
-
- if (has_body)
- make_mime_composition_file_entry(body_file_name, attachformat,
- "text/plain");
-
- /*
- * Now, go back to the beginning of the draft file and look for
- * header fields that specify attachments. Add a mhbuild MIME
- * composition file for each.
- */
-
- if ((fp = fopen (p = etcpath ("mhn.defaults"), "r"))) {
- readconfig ((struct node **) NULL, fp, p, 0);
- fclose(fp);
- }
-
- rewind(draft_file);
-
- while (get_line() != EOF && *field != '\0' && *field != '-') {
- if (strncasecmp(field, attachment_header_field_name, length) == 0 &&
- field[length] == ':') {
- for (p = field + length + 1; *p == ' ' || *p == '\t'; p++)
- ;
-
- /* Skip empty attachment_header_field_name lines. */
- if (strlen (p) > 0) {
- struct stat st;
- if (stat (p, &st) == OK) {
- if (S_ISREG (st.st_mode)) {
- /* Don't set the default content type so take
- make_mime_composition_file_entry() will try
- to infer it from the file type. */
- make_mime_composition_file_entry(p, attachformat, 0);
- } else {
- adios (NULL, "unable to attach %s, not a plain file",
- p);
- }
- } else {
- adios (NULL, "unable to access file \"%s\"", p);
- }
- }
- }
- }
-
- (void)fclose(composition_file);
-
- /*
- * We're ready to roll! Run mhbuild on the composition file.
- * Note that mhbuild is in the context as buildmimeproc.
- */
-
- (void)sprintf(buf, "%s %s", buildmimeproc, composition_file_name);
-
- if (system(buf) != 0) {
- clean_up_temporary_files();
- return (NOTOK);
- }
-
- return (OK);
-}
-
-static void
-clean_up_temporary_files(void)
-{
- (void)unlink(body_file_name);
- (void)unlink(composition_file_name);
-
- return;
-}
-
-static int
-get_line(void)
-{
- int c; /* current character */
- int n; /* number of bytes in buffer */
- char *p; /* buffer pointer */
-
- /*
- * Get a line from the input file, growing the field buffer as needed. We do this
- * so that we can fit an entire line in the buffer making it easy to do a string
- * comparison on both the field name and the field body which might be a long path
- * name.
- */
-
- for (n = 0, p = field; (c = getc(draft_file)) != EOF; *p++ = c) {
- if (c == '\n' && (c = getc(draft_file)) != ' ' && c != '\t') {
- (void)ungetc(c, draft_file);
- c = '\n';
- break;
- }
-
- if (++n >= field_size - 1) {
- field = (char *)mh_xrealloc((void *)field, field_size += 256);
-
- p = field + n - 1;
- }
- }
-
- /*
- * NUL-terminate the field..
- */
-
- *p = '\0';
-
- return (c);
-}
-
-static void
-make_mime_composition_file_entry(char *file_name, int attachformat,
- char *default_content_type)
-{
- int binary; /* binary character found flag */
- int c; /* current character */
- char cmd[PATH_MAX + 8]; /* file command buffer */
- char *content_type; /* mime content type */
- FILE *fp; /* content and pipe file pointer */
- struct node *np; /* context scan node pointer */
- char *p; /* miscellaneous string pointer */
- struct stat st; /* file status buffer */
-
- if ((content_type = mime_type (file_name)) == NULL) {
- /*
- * Check the file name for a suffix. Scan the context for
- * that suffix on a mhshow-suffix- entry. We use these
- * entries to be compatible with mhnshow, and there's no
- * reason to make the user specify each suffix twice. Context
- * entries of the form "mhshow-suffix-contenttype" in the name
- * have the suffix in the field, including the dot.
- */
- if ((p = strrchr(file_name, '.')) != (char *)0) {
- for (np = m_defs; np; np = np->n_next) {
- if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 &&
- strcasecmp(p, np->n_field ? np->n_field : "") == 0) {
- content_type = strdup (np->n_name + 14);
- break;
- }
- }
- }
-
- if (content_type == NULL && default_content_type != NULL) {
- content_type = strdup (default_content_type);
- }
- }
-
- /*
- * No content type was found, either because there was no matching entry in the
- * context or because the file name has no suffix. Open the file and check for
- * non-ASCII characters. Choose the content type based on this check.
- */
-
- if (content_type == (char *)0) {
- if ((fp = fopen(file_name, "r")) == (FILE *)0) {
- clean_up_temporary_files();
- adios((char *)0, "unable to access file \"%s\"", file_name);
- }
-
- binary = 0;
-
- while ((c = getc(fp)) != EOF) {
- if (c > 127 || c < 0) {
- binary = 1;
- break;
- }
- }
-
- (void)fclose(fp);
-
- content_type =
- strdup (binary ? "application/octet-stream" : "text/plain");
- }
-
- /*
- * Make sure that the attachment file exists and is readable. Append a mhbuild
- * directive to the draft file. This starts with the content type. Append a
- * file name attribute and a private x-unix-mode attribute. Also append a
- * description obtained (if possible) by running the "file" command on the file.
- */
-
- if (stat(file_name, &st) == -1 || access(file_name, R_OK) != 0) {
- clean_up_temporary_files();
- adios((char *)0, "unable to access file \"%s\"", file_name);
- }
-
- switch (attachformat) {
- case 0:
- /* Insert name, file mode, and Content-Id. */
- (void)fprintf(composition_file, "#%s; name=\"%s\"; x-unix-mode=0%.3ho",
- content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1, (unsigned short)(st.st_mode & 0777));
-
- if (strlen(file_name) > PATH_MAX) {
- clean_up_temporary_files();
- adios((char *)0, "attachment file name `%s' too long.", file_name);
- }
-
- (void)sprintf(cmd, "file '%s'", file_name);
-
- if ((fp = popen(cmd, "r")) != (FILE *)0 && fgets(cmd, sizeof (cmd), fp) != (char *)0) {
- *strchr(cmd, '\n') = '\0';
-
- /*
- * The output of the "file" command is of the form
- *
- * file: description
- *
- * Strip off the "file:" and subsequent white space.
- */
-
- for (p = cmd; *p != '\0'; p++) {
- if (*p == ':') {
- for (p++; *p != '\0'; p++) {
- if (*p != '\t')
- break;
- }
- break;
- }
- }
-
- if (*p != '\0')
- /* Insert Content-Description. */
- (void)fprintf(composition_file, " [ %s ]", p);
-
- (void)pclose(fp);
- }
-
- break;
- case 1:
- if (stringdex (m_maildir(invo_name), file_name) == 0) {
- /* Content had been placed by send into a temp file.
- Don't generate Content-Disposition header, because
- it confuses Microsoft Outlook, Build 10.0.6626, at
- least. */
- (void) fprintf (composition_file, "#%s <>", content_type);
- } else {
- /* Suppress Content-Id, insert simple Content-Disposition
- and Content-Description with filename.
- The Content-Disposition type needs to be "inline" for
- MS Outlook and BlackBerry calendar programs to properly
- handle a text/calendar attachment. */
- p = strrchr(file_name, '/');
- (void) fprintf (composition_file,
- "#%s; name=\"%s\" <> [%s]{%s}",
- content_type,
- (p == (char *)0) ? file_name : p + 1,
- (p == (char *)0) ? file_name : p + 1,
- strcmp ("text/calendar", content_type)
- ? "attachment" : "inline");
- }
-
- break;
- case 2:
- if (stringdex (m_maildir(invo_name), file_name) == 0) {
- /* Content had been placed by send into a temp file.
- Don't generate Content-Disposition header, because
- it confuses Microsoft Outlook, Build 10.0.6626, at
- least. */
- (void) fprintf (composition_file, "#%s <>", content_type);
- } else {
- /* Suppress Content-Id, insert Content-Disposition with
- modification date and Content-Description wtih filename.
- The Content-Disposition type needs to be "inline" for
- MS Outlook and BlackBerry calendar programs to properly
- handle a text/calendar attachment. */
- p = strrchr(file_name, '/');
- (void) fprintf (composition_file,
- "#%s; name=\"%s\" <>[%s]{%s; "
- "modification-date=\"%s\"}",
- content_type,
- (p == (char *)0) ? file_name : p + 1,
- (p == (char *)0) ? file_name : p + 1,
- strcmp ("text/calendar", content_type)
- ? "attachment" : "inline",
- dtime (&st.st_mtime, 0));
- }
-
- break;
- default:
- adios ((char *)0, "unsupported attachformat %d", attachformat);
- }
-
- free (content_type);
-
- /*
- * Finish up with the file name.
- */
-
- (void)fprintf(composition_file, " %s\n", file_name);
-
- return;
-}
-
-/*
- * Try to use external command to determine mime type, and possibly
- * encoding. Caller is responsible for free'ing returned memory.
- */
-static char *
-mime_type (const char *file_name) {
- char *content_type = NULL; /* mime content type */
-
-#ifdef MIMETYPEPROC
- char cmd[2 * PATH_MAX + 2]; /* file command buffer */
- char buf[BUFSIZ >= 2048 ? BUFSIZ : 2048];
- FILE *fp; /* content and pipe file pointer */
- char mimetypeproc[] = MIMETYPEPROC " '%s'";
-
- if ((int) snprintf (cmd, sizeof cmd, mimetypeproc, file_name) <
- (int) sizeof cmd) {
- if ((fp = popen (cmd, "r")) != NULL) {
- if (fgets (buf, sizeof cmd, fp)) {
- char *cp;
-
- /* Skip leading <filename>:<whitespace>, if present. */
- if ((content_type = strchr (buf, ':')) != NULL) {
- ++content_type;
- while (*content_type && isblank (*content_type)) {
- ++content_type;
- }
- } else {
- content_type = buf;
- }
-
- /* Truncate at newline (LF or CR), if present. */
- if ((cp = strpbrk (content_type, "\n\n")) != NULL) {
- *cp = '\0';
- }
- } else {
- advise (NULL, "unable to read mime type");
- }
- } else {
- advise (NULL, "unable to run %s", buf);
- }
- } else {
- advise (NULL, "filename to large to deduce mime type");
- }
-#else
- NMH_UNUSED (file_name);
-#endif
-
- return content_type ? strdup (content_type) : NULL;
-}
-
/*
* Split large message into several messages of
* type "message/partial" and send them.
int compnum, nparts, partno, state, status;
long pos, start;
time_t clock;
- char *cp, *dp, buffer[BUFSIZ], msgid[BUFSIZ];
+ char *cp, *dp, buffer[NMH_BUFSIZ], msgid[BUFSIZ];
char subject[BUFSIZ];
char name[NAMESZ], partnum[BUFSIZ];
FILE *in;
* 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;
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) {
/* 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);
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
for (;;) {
long len;
- if (!fgets (buffer, sizeof(buffer) - 1, in)) {
+ if (!fgets (buffer, sizeof buffer, in)) {
if (partno == nparts)
break;
adios (NULL, "premature eof");
}
-
+
if ((pos += (len = strlen (buffer))) > CPERMSG) {
fseek (in, -len, SEEK_CUR);
break;
fclose (out);
if (!pushsw && verbsw) {
- printf ("\n");
+ putchar('\n');
fflush (stdout);
}
snprintf (partnum, sizeof(partnum), "%d", partno);
status = sendaux (vec, vecp, program, tmpdrf, st);
- unlink (tmpdrf);
+ (void) m_unlink (tmpdrf);
if (status != OK)
break;
}
free (cp);
- if (dp)
- free (dp);
+ mh_xfree(dp);
fclose (in); /* close the draft */
return status;
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");
+ inform("unable to create temporary file in %s for "
+ "annotation list, continuing...", get_temp_dir());
}
}
+ vec[vecp++] = drft;
if (distfile && distout (drft, distfile, backup) == NOTOK)
done (1);
vec[vecp] = NULL;
/*
* 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) {
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);
if (distfile) {
- unlink (drft);
+ (void) m_unlink (drft);
if (rename (backup, drft) == NOTOK)
advise (drft, "unable to rename %s to", backup);
}
case NOTOK:
/* oops -- fork error */
advise ("fork", "unable to");
+ /* FALLTHRU */
case OK:
/* child process -- send it */
if ((in = open (file, O_RDONLY)) == NOTOK) {
admonish (file, "unable to re-open");
} else {
- lseek (out, (off_t) 0, SEEK_END);
+ lseek(out, 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);
}
}
- lseek (out, (off_t) 0, SEEK_SET);
+ lseek(out, 0, SEEK_SET);
dup2 (out, fileno (stdin));
close (out);
/* create subject for error notification */
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);
+ inform("temporary file %s selected", tfile);
else
- if (unlink (tfile) == NOTOK)
+ if (m_unlink (tfile) == NOTOK)
advise (tfile, "unable to remove");
return fd;
|| st->st_dev != st2.st_dev
|| st->st_ino != st2.st_ino)) {
if (debugsw)
- admonish (NULL, "$mhaltmsg mismatch");
+ inform("$mhaltmsg mismatch, continuing...");
return;
}
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:
+ case OK:
/* block a few signals */
sigemptyset (&set);
sigaddset (&set, SIGHUP);
sigaddset (&set, SIGTERM);
sigprocmask (SIG_BLOCK, &set, &oset);
+ unregister_for_removal(0);
+
annoaux (fd);
if (child_id == OK)
_exit (0);
/* reset the signal mask */
sigprocmask (SIG_SETMASK, &oset, &set);
- chdir (cwd);
+ if (chdir (cwd) < 0) {
+ advise (cwd, "chdir");
+ }
break;
default: /* no waiting... */
if ((folder = getenv ("mhfolder")) == NULL || *folder == 0) {
if (debugsw)
- admonish (NULL, "$mhfolder not set");
+ inform("$mhfolder not set, continuing...");
return;
}
maildir = m_maildir (folder);
}
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... */
}
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);
+ lseek(fd, 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;
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);
}
}
}
-static void
+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.<svc>.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 NORETURN
armed_done (int status)
{
longjmp (env, status ? status : NOTOK);
projects / nmh / blobdiff