X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f95d466465fffebda03aa078fa495f28f623be2d..efd67e1709a2936f42ddf5cbc9b97808d1fca210:/uip/mhbuildsbr.c diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c index cf7c53ac..7e2f9f48 100644 --- a/uip/mhbuildsbr.c +++ b/uip/mhbuildsbr.c @@ -170,7 +170,7 @@ build_mime (char *infile, int autobuild, int dist, int directives, /* abort if draft has Mime-Version or C-T-E header field */ if (strcasecmp (name, VRSN_FIELD) == 0 || - strcasecmp (name, ENCODING_FIELD) == 0) { + strcasecmp (name, ENCODING_FIELD) == 0) { if (autobuild) { fclose(in); return NULL; @@ -205,9 +205,9 @@ build_mime (char *infile, int autobuild, int dist, int directives, */ if (strcasecmp(ATTACH_FIELD, np) == 0) { - struct attach_list *entry; + struct attach_list *entry; char *s = vp, *e = vp + strlen(vp) - 1; - free(np); + free(np); /* * Make sure we can find the start of this filename. @@ -268,7 +268,7 @@ finish_field: */ for (hp = ct->c_first_hf; hp != NULL; hp = hp->next) { - if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) { + if (encode_rfc2047(hp->name, &hp->value, header_encoding, NULL)) { adios(NULL, "Unable to encode header \"%s\"", hp->name); } } @@ -327,8 +327,8 @@ finish_field: */ for (at_entry = attach_head; at_entry; ) { - struct attach_list *at_prev = at_entry; - struct part *part; + struct attach_list *at_prev = at_entry; + struct part *part; CT p; if (access(at_entry->filename, R_OK) != 0) { @@ -365,8 +365,8 @@ finish_field: */ if (!m->mp_parts) { - CT p; - struct part *part; + CT p; + struct part *part; struct text *t; if ((p = (CT) calloc (1, sizeof(*p))) == NULL) @@ -450,7 +450,7 @@ finish_field: } else { if (*++cp == 0) adios (NULL, "giving up trying to find a unique delimiter string"); - else + else (*cp)++; } } @@ -778,6 +778,7 @@ use_forw: */ if ((ct = (CT) calloc (1, sizeof(*ct))) == NULL) adios (NULL, "out of memory"); + init_decoded_content(ct, infilename); *ctp = ct; ci = &ct->c_ctinfo; if (get_ctinfo (buffer, ct, 0) == NOTOK) @@ -1161,7 +1162,7 @@ compose_content (CT ct, int verbose) for (pm = ci->ci_first_pm; pm; pm = pm->pm_next) { snprintf (bp, buflen, "%s%s=\"%s\"", s, - pm->pm_name, get_param_value(pm, '?')); + pm->pm_name, get_param_value(pm, '?')); len = strlen (bp); bp += len; buflen -= len; @@ -1278,13 +1279,17 @@ raw: static int scan_content (CT ct, size_t maxunencoded) { - int len; + int prefix_len; int check8bit = 0, contains8bit = 0; /* check if contains 8bit data */ - int checklinelen = 0, linelen = 0; /* check for long lines */ + int checknul = 0, containsnul = 0; /* check if contains NULs */ + int checklinelen = 0, linelen = 0; /* check for long lines */ int checkllinelen = 0; /* check for extra-long lines */ int checkboundary = 0, boundaryclash = 0; /* check if clashes with multipart boundary */ int checklinespace = 0, linespace = 0; /* check if any line ends with space */ - char *cp = NULL, buffer[BUFSIZ]; + char *cp = NULL; + char *bufp = NULL; + size_t buflen; + ssize_t gotlen; struct text *t = NULL; FILE *in = NULL; CE ce = &ct->c_cefile; @@ -1325,22 +1330,24 @@ scan_content (CT ct, size_t maxunencoded) if (ct->c_type == CT_TEXT) { t = (struct text *) ct->c_ctparams; - if (t->tx_charset == CHARSET_UNSPECIFIED) + if (t->tx_charset == CHARSET_UNSPECIFIED) { check8bit = 1; + checknul = 1; + } } switch (ct->c_reqencoding) { case CE_8BIT: - checkllinelen = 1; + checkllinelen = 1; checkboundary = 1; break; case CE_QUOTED: - checkboundary = 1; + checkboundary = 1; break; case CE_BASE64: break; case CE_UNKNOWN: - /* Use the default rules based on content-type */ + /* Use the default rules based on content-type */ switch (ct->c_type) { case CT_TEXT: checkboundary = 1; @@ -1354,6 +1361,7 @@ scan_content (CT ct, size_t maxunencoded) case CT_APPLICATION: check8bit = 1; + checknul = 1; checklinelen = 1; checklinespace = 1; checkboundary = 1; @@ -1393,29 +1401,31 @@ scan_content (CT ct, size_t maxunencoded) * Scan the unencoded content */ if (check8bit || checklinelen || checklinespace || checkboundary || - checkllinelen) { + checkllinelen || checknul) { if ((in = fopen (ce->ce_file, "r")) == NULL) adios (ce->ce_file, "unable to open for reading"); - len = strlen (prefix); + prefix_len = strlen (prefix); - while (fgets (buffer, sizeof(buffer) - 1, in)) { + while ((gotlen = getline(&bufp, &buflen, in)) != -1) { /* - * Check for 8bit data. + * Check for 8bit and NUL data. */ - if (check8bit) { - for (cp = buffer; *cp; cp++) { - if (!isascii ((unsigned char) *cp)) { - contains8bit = 1; - check8bit = 0; /* no need to keep checking */ - break; - } + for (cp = bufp; (check8bit || checknul) && + cp < bufp + gotlen; cp++) { + if (!isascii ((unsigned char) *cp)) { + contains8bit = 1; + check8bit = 0; /* no need to keep checking */ + } + if (!*cp) { + containsnul = 1; + checknul = 0; /* no need to keep checking */ } } /* * Check line length. */ - if (checklinelen && (strlen (buffer) > maxunencoded + 1)) { + if (checklinelen && ((size_t)gotlen > maxunencoded + 1)) { linelen = 1; checklinelen = 0; /* no need to keep checking */ } @@ -1427,7 +1437,7 @@ scan_content (CT ct, size_t maxunencoded) */ if (checkllinelen && !linelen && - (strlen(buffer) > MAXLONGLINE + 1)) { + (gotlen > MAXLONGLINE + 1)) { adios(NULL, "Line in content exceeds maximum line limit (%d)", MAXLONGLINE); } @@ -1435,7 +1445,8 @@ scan_content (CT ct, size_t maxunencoded) /* * Check if line ends with a space. */ - if (checklinespace && (cp = buffer + strlen (buffer) - 2) > buffer && isspace ((unsigned char) *cp)) { + if (checklinespace && (cp = bufp + gotlen - 2) > bufp && + isspace ((unsigned char) *cp)) { linespace = 1; checklinespace = 0; /* no need to keep checking */ } @@ -1444,18 +1455,20 @@ scan_content (CT ct, size_t maxunencoded) * Check if content contains a line that clashes * with our standard boundary for multipart messages. */ - if (checkboundary && buffer[0] == '-' && buffer[1] == '-') { - for (cp = buffer + strlen (buffer) - 1; cp >= buffer; cp--) + if (checkboundary && bufp[0] == '-' && bufp[1] == '-') { + for (cp = bufp + gotlen - 1; cp >= bufp; cp--) if (!isspace ((unsigned char) *cp)) break; *++cp = '\0'; - if (!strncmp(buffer + 2, prefix, len) && isdigit((unsigned char) buffer[2 + len])) { + if (!strncmp(bufp + 2, prefix, prefix_len) && + isdigit((unsigned char) bufp[2 + prefix_len])) { boundaryclash = 1; checkboundary = 0; /* no need to keep checking */ } } } fclose (in); + free(bufp); } /* @@ -1469,7 +1482,7 @@ scan_content (CT ct, size_t maxunencoded) CI ci = &ct->c_ctinfo; add_param(&ci->ci_first_pm, &ci->ci_last_pm, "charset", - contains8bit ? write_charset_8bit() : "us-ascii", 0); + contains8bit ? write_charset_8bit() : "us-ascii", 0); t->tx_charset = CHARSET_SPECIFIED; } } @@ -1479,25 +1492,31 @@ scan_content (CT ct, size_t maxunencoded) */ if (ct->c_reqencoding != CE_UNKNOWN) - ct->c_encoding = ct->c_reqencoding; - else + ct->c_encoding = ct->c_reqencoding; + else { + int wants_q_p = (containsnul || linelen || linespace || checksw); + switch (ct->c_type) { case CT_TEXT: - if (contains8bit && !linelen && !linespace && !checksw) - ct->c_encoding = CE_8BIT; - else if (contains8bit || linelen || linespace || checksw) - ct->c_encoding = CE_QUOTED; - else - ct->c_encoding = CE_7BIT; + if (wants_q_p) + ct->c_encoding = CE_QUOTED; + else if (contains8bit) + ct->c_encoding = CE_8BIT; + else + ct->c_encoding = CE_7BIT; + break; case CT_APPLICATION: /* For application type, use base64, except when postscript */ - if (contains8bit || linelen || linespace || checksw) - ct->c_encoding = (ct->c_subtype == APPLICATION_POSTSCRIPT) - ? CE_QUOTED : CE_BASE64; - else + if (wants_q_p || contains8bit) { + if (ct->c_subtype == APPLICATION_POSTSCRIPT) + ct->c_encoding = CE_QUOTED; /* historical */ + else + ct->c_encoding = CE_BASE64; + } else { ct->c_encoding = CE_7BIT; + } break; case CT_MESSAGE: @@ -1511,6 +1530,7 @@ scan_content (CT ct, size_t maxunencoded) ct->c_encoding = CE_BASE64; break; } + } return (boundaryclash ? NOTOK : OK); } @@ -1573,7 +1593,7 @@ build_headers (CT ct, int header_encoding) if (!s) adios(NULL, "Internal error: failed outputting Content-Type " - "parameters"); + "parameters"); vp = add (s, vp); free(s); @@ -1744,7 +1764,7 @@ static char * calculate_digest (CT ct, int asciiP) { int cc; - char buffer[BUFSIZ], *vp, *op; + char *vp, *op; unsigned char *dp; unsigned char digest[16]; unsigned char outbuf[25]; @@ -1762,20 +1782,24 @@ calculate_digest (CT ct, int asciiP) /* calculate md5 message digest */ if (asciiP) { - while (fgets (buffer, sizeof(buffer) - 1, in)) { + char *bufp = NULL; + size_t buflen; + ssize_t gotlen; + while ((gotlen = getline(&bufp, &buflen, in)) != -1) { char c, *cp; - cp = buffer + strlen (buffer) - 1; + cp = bufp + gotlen - 1; if ((c = *cp) == '\n') - *cp = '\0'; + gotlen--; - MD5Update (&mdContext, (unsigned char *) buffer, - (unsigned int) strlen (buffer)); + MD5Update (&mdContext, (unsigned char *) bufp, + (unsigned int) gotlen); if (c == '\n') MD5Update (&mdContext, (unsigned char *) "\r\n", 2); } } else { + char buffer[BUFSIZ]; while ((cc = fread (buffer, sizeof(*buffer), sizeof(buffer), in)) > 0) MD5Update (&mdContext, (unsigned char *) buffer, (unsigned int) cc); } @@ -1799,7 +1823,7 @@ calculate_digest (CT ct, int asciiP) /* encode the digest using base64 */ for (dp = digest, op = (char *) outbuf, - cc = sizeof(digest) / sizeof(digest[0]); + cc = sizeof(digest) / sizeof(digest[0]); cc > 0; cc -= 3, op += 4) { unsigned long bits; char *bp; @@ -1839,9 +1863,11 @@ setup_attach_content(CT ct, char *filename) char *type, *simplename = r1bindex(filename, '/'); struct str2init *s2i; PM pm; + char buffer[BUFSIZ], *cp; + int no_subtype = 0; if (! (type = mime_type(filename))) { - adios(NULL, "Unable to determine MIME type of \"%s\"", filename); + adios(NULL, "Unable to determine MIME type of \"%s\"", filename); } /* @@ -1852,12 +1878,12 @@ setup_attach_content(CT ct, char *filename) */ if (get_ctinfo(type, ct, 0) == NOTOK) - done(1); + done(1); free(type); for (s2i = str2cts; s2i->si_key; s2i++) - if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0) + if (strcasecmp(ct->c_ctinfo.ci_type, s2i->si_key) == 0) break; if (!s2i->si_key && !uprf(ct->c_ctinfo.ci_type, "X-")) s2i++; @@ -1868,23 +1894,23 @@ setup_attach_content(CT ct, char *filename) switch (ct->c_type = s2i->si_val) { case CT_MULTIPART: - adios (NULL, "multipart types must be specified by mhbuild directives"); + adios (NULL, "multipart types must be specified by mhbuild directives"); /* NOTREACHED */ case CT_MESSAGE: - if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0) + if (strcasecmp(ct->c_ctinfo.ci_subtype, "partial") == 0) adios(NULL, "Sorry, %s/%s isn't supported", ct->c_ctinfo.ci_type, - ct->c_ctinfo.ci_subtype); + ct->c_ctinfo.ci_subtype); if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0) adios(NULL, "external-body messages must be specified " - "by mhbuild directives"); + "by mhbuild directives"); /* Fall through */ default: - /* + /* * This sets the subtype, if it's significant */ - if ((ct->c_ctinitfnx = s2i->si_init)) + if ((ct->c_ctinitfnx = s2i->si_init)) (*ct->c_ctinitfnx)(ct); break; } @@ -1897,14 +1923,14 @@ setup_attach_content(CT ct, char *filename) for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) { if (strcasecmp(pm->pm_name, "name") == 0) { if (pm->pm_value) - free(pm->pm_value); + free(pm->pm_value); pm->pm_value = getcpy(simplename); break; } } if (pm == NULL) - add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm, + add_param(&ct->c_ctinfo.ci_first_pm, &ct->c_ctinfo.ci_last_pm, "name", simplename, 0); ct->c_descr = getcpy(simplename); @@ -1912,16 +1938,38 @@ setup_attach_content(CT ct, char *filename) ct->c_cefile.ce_file = getcpy(filename); /* - * If it's a text/calendar, we need to make sure it's an inline, - * otherwise it won't work with some calendar programs. Otherwise - * assume attachment + * Look for mhbuild-disposition-/ entry + * that specifies Content-Disposition type. Only + * 'attachment' and 'inline' are allowed. Default to + * 'attachment'. */ - if (strcasecmp(ct->c_ctinfo.ci_type, "text") == 0 && - strcasecmp(ct->c_ctinfo.ci_subtype, "calendar") == 0) { - ct->c_dispo_type = getcpy("inline"); + snprintf (buffer, sizeof(buffer), "%s-disposition-%s/%s", + invo_name, ct->c_ctinfo.ci_type, ct->c_ctinfo.ci_subtype); + cp = context_find (buffer); + if (cp == NULL || *cp == '\0') { + no_subtype = 1; + snprintf (buffer, sizeof(buffer), "%s-disposition-%s", invo_name, + ct->c_ctinfo.ci_type); + cp = context_find (buffer); + } + if (cp != NULL && *cp != '\0') { + if (strcasecmp (cp, "attachment") && + strcasecmp (cp, "inline")) { + admonish (NULL, "configuration problem: %s-disposition-%s%s%s " + "specifies '%s' but only 'attachment' and 'inline' are " + "allowed", invo_name, + ct->c_ctinfo.ci_type, + no_subtype ? "" : "/", + no_subtype ? "" : ct->c_ctinfo.ci_subtype, + cp); + } + } + + if (cp) { + ct->c_dispo_type = getcpy(cp); } else { - ct->c_dispo_type = getcpy("attachment"); + ct->c_dispo_type = getcpy("attachment"); } add_param(&ct->c_dispo_first, &ct->c_dispo_last, "filename", simplename, 0);