X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fimap%2Fimap_fetch.c;h=1e33fabf21f15e6d502f1214d7bb364706b07039;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=b9319610c8f0ed1e19ee07c8cdd8e14f45beeb3e;hpb=951fbe7c1ee0b3554af22d6ae0d1d51c1642ae0f;p=citadel.git diff --git a/citadel/modules/imap/imap_fetch.c b/citadel/modules/imap/imap_fetch.c index b9319610c..1e33fabf2 100644 --- a/citadel/modules/imap/imap_fetch.c +++ b/citadel/modules/imap/imap_fetch.c @@ -2,21 +2,17 @@ * Implements the FETCH command in IMAP. * This is a good example of the protocol's gratuitous complexity. * - * Copyright (c) 2001-2011 by the citadel.org team + * Copyright (c) 2001-2020 by the citadel.org team * - * This program is open source software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. */ @@ -29,18 +25,7 @@ #include #include #include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include #include #include #include @@ -110,7 +95,7 @@ void imap_fetch_internaldate(struct CtdlMessage *msg) { time_t msgdate; if (!msg) return; - if (msg->cm_fields[eTimestamp] != NULL) { + if (!CM_IsEmpty(msg, eTimestamp)) { msgdate = atol(msg->cm_fields[eTimestamp]); } else { @@ -145,8 +130,7 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { * us to fetch the message body from disk. If not, we can save * on some disk operations... */ - if ( (!strcasecmp(whichfmt, "RFC822")) - || (!strcasecmp(whichfmt, "RFC822.TEXT")) ) { + if ( (!strcasecmp(whichfmt, "RFC822")) || (!strcasecmp(whichfmt, "RFC822.TEXT")) ) { need_body = 1; } @@ -190,9 +174,11 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputMsg(msgnum, MT_RFC822, (need_body ? HEADERS_ALL : HEADERS_FAST), - 0, 1, NULL, SUPPRESS_ENV_TO, NULL, NULL + 0, 1, NULL, SUPPRESS_ENV_TO, NULL, NULL, NULL ); - if (!need_body) IAPuts("\r\n"); /* extra trailing newline */ + if (!need_body) { + client_write(HKEY("\r\n")); // extra trailing newline -- to the redirect_buffer, *not* to the client + } Imap->cached_rfc822 = CCC->redirect_buffer; CCC->redirect_buffer = NULL; Imap->cached_rfc822_msgnum = msgnum; @@ -233,16 +219,11 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { FreeStrBuf(&Line); } else { - headers_size = - total_size = StrLength(Imap->cached_rfc822); + headers_size = total_size = StrLength(Imap->cached_rfc822); text_size = 0; } - IMAP_syslog(LOG_DEBUG, - "RFC822: headers=" SIZE_T_FMT - ", text=" SIZE_T_FMT - ", total=" SIZE_T_FMT, - headers_size, text_size, total_size); + syslog(LOG_DEBUG, "imap: RFC822 headers=" SIZE_T_FMT ", text=" SIZE_T_FMT ", total=" SIZE_T_FMT, headers_size, text_size, total_size); if (!strcasecmp(whichfmt, "RFC822.SIZE")) { IAPrintf("RFC822.SIZE " SIZE_T_FMT, total_size); @@ -269,7 +250,6 @@ void imap_fetch_rfc822(long msgnum, const char *whichfmt) { } - /* * Load a specific part of a message into the temp file to be output to a * client. FIXME we can handle parts like "2" and "2.1" and even "2.MIME" @@ -282,15 +262,11 @@ void imap_load_part(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata) { - struct CitContext *CCC = CC; char mimebuf2[SIZ]; StrBuf *desired_section; desired_section = (StrBuf *)cbuserdata; - IMAP_syslog(LOG_DEBUG, "imap_load_part() looking for %s, found %s", - ChrPtr(desired_section), - partnum - ); + syslog(LOG_DEBUG, "imap: imap_load_part() looking for %s, found %s", ChrPtr(desired_section), partnum); if (!strcasecmp(partnum, ChrPtr(desired_section))) { client_write(content, length); @@ -354,33 +330,26 @@ void imap_output_envelope_from(struct CtdlMessage *msg) { } /* For everything else, we do stuff. */ - IAPuts("(("); /* open double-parens */ - plain_imap_strout(msg->cm_fields[eAuthor]); /* personal name */ - IAPuts(" NIL "); /* source route (not used) */ - + IAPuts("(("); // open double-parens + IPutMsgField(eAuthor); // display name + IAPuts(" NIL "); // source route (not used) - if (msg->cm_fields[erFc822Addr] != NULL) { + if (!CM_IsEmpty(msg, erFc822Addr)) { process_rfc822_addr(msg->cm_fields[erFc822Addr], user, node, name); - plain_imap_strout(user); /* mailbox name (user id) */ + IPutStr(user, strlen(user)); /* mailbox name (user id) */ IAPuts(" "); - if (!strcasecmp(node, config.c_nodename)) { - plain_imap_strout(config.c_fqdn); - } - else { - plain_imap_strout(node); /* host name */ - } + IPutStr(node, strlen(node)); /* host name */ } else { - plain_imap_strout(msg->cm_fields[eAuthor]); /* mailbox name (user id) */ + IPutMsgField(eAuthor); /* Make up a synthetic address */ IAPuts(" "); - plain_imap_strout(msg->cm_fields[eNodeName]); /* host name */ + IPutStr(CtdlGetConfigStr("c_fqdn"), strlen(CtdlGetConfigStr("c_fqdn"))); } IAPuts(")) "); /* close double-parens */ } - /* * Output an envelope address (or set of addresses) in the official, * convoluted, braindead format. (Note that we can't use this for @@ -416,11 +385,11 @@ void imap_output_envelope_addr(char *addr) { striplt(individual_addr); process_rfc822_addr(individual_addr, user, node, name); IAPuts("("); - plain_imap_strout(name); + IPutStr(name, strlen(name)); IAPuts(" NIL "); - plain_imap_strout(user); + IPutStr(user, strlen(user)); IAPuts(" "); - plain_imap_strout(node); + IPutStr(node, strlen(node)); IAPuts(")"); if (i < (num_addrs-1)) IAPuts(" "); @@ -445,14 +414,13 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { if (!msg) return; /* Parse the message date into an IMAP-format date string */ - if (msg->cm_fields[eTimestamp] != NULL) { + if (!CM_IsEmpty(msg, eTimestamp)) { msgdate = atol(msg->cm_fields[eTimestamp]); } else { msgdate = time(NULL); } - datestring(datestringbuf, sizeof datestringbuf, - msgdate, DATESTRING_IMAP); + len = datestring(datestringbuf, sizeof datestringbuf, msgdate, DATESTRING_IMAP); /* Now start spewing data fields. The order is important, as it is * defined by the protocol specification. Nonexistent fields must @@ -462,11 +430,11 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { IAPuts("ENVELOPE ("); /* Date */ - plain_imap_strout(datestringbuf); + IPutStr(datestringbuf, len); IAPuts(" "); /* Subject */ - plain_imap_strout(msg->cm_fields[eMsgSubject]); + IPutMsgField(eMsgSubject); IAPuts(" "); /* From */ @@ -513,19 +481,18 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { /* In-reply-to */ fieldptr = rfc822_fetch_field(msg->cm_fields[eMesageText], "In-reply-to"); - plain_imap_strout(fieldptr); + IPutStr(fieldptr, (fieldptr)?strlen(fieldptr):0); IAPuts(" "); if (fieldptr != NULL) free(fieldptr); /* message ID */ - len = strlen(msg->cm_fields[emessageId]); + len = msg->cm_lengths[emessageId]; if ((len == 0) || ( - (msg->cm_fields[emessageId][0] == '<') && - (msg->cm_fields[emessageId][len - 1] == '>')) - ) - { - plain_imap_strout(msg->cm_fields[emessageId]); + (msg->cm_fields[emessageId][0] == '<') && + (msg->cm_fields[emessageId][len - 1] == '>')) + ) { + IPutMsgField(emessageId); } else { @@ -551,6 +518,7 @@ void imap_fetch_envelope(struct CtdlMessage *msg) { IAPuts(")"); } + /* * This function is called only when CC->redirect_buffer contains a set of * RFC822 headers with no body attached. Its job is to strip that set of @@ -670,9 +638,7 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { if (strchr(ChrPtr(section), '[') != NULL) { StrBufStripAllBut(section, '[', ']'); } - IMAP_syslog(LOG_DEBUG, "Section is: [%s]", - (StrLength(section) == 0) ? "(empty)" : ChrPtr(section) - ); + syslog(LOG_DEBUG, "imap: selected section is [%s]", (StrLength(section) == 0) ? "(empty)" : ChrPtr(section)); /* Burn the cache if we don't have the same section of the * same message again. @@ -704,7 +670,7 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { is_partial = 1; } if ( (is_partial == 1) && (StrLength(partial) > 0) ) { - IMAP_syslog(LOG_DEBUG, "Partial is <%s>", ChrPtr(partial)); + syslog(LOG_DEBUG, "imap: selected partial is <%s>", ChrPtr(partial)); } if (Imap->cached_body == NULL) { @@ -752,7 +718,7 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { * (Note value of 1 passed as 'dont_decode' so client gets it encoded) */ else { - mime_parser(msg->cm_fields[eMesageText], NULL, + mime_parser(CM_RANGE(msg, eMesageText), *imap_load_part, NULL, NULL, section, 1 @@ -790,7 +756,7 @@ void imap_fetch_body(long msgnum, ConstStr item, int is_peek) { iaputs(&Imap->cached_body[pstart], pbytes); if (msg != NULL) { - CtdlFreeMessage(msg); + CM_Free(msg); } /* Mark this message as "seen" *unless* this is a "peek" operation */ @@ -822,14 +788,14 @@ void imap_fetch_bodystructure_post( void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata ) { - + long len; char subtype[128]; IAPuts(" "); /* disposition */ - extract_token(subtype, cbtype, 1, '/', sizeof subtype); - plain_imap_strout(subtype); + len = extract_token(subtype, cbtype, 1, '/', sizeof subtype); + IPutStr(subtype, len); /* body language */ /* IAPuts(" NIL"); We thought we needed this at one point, but maybe we don't... */ @@ -855,56 +821,57 @@ void imap_fetch_bodystructure_part( size_t i; char cbmaintype[128]; char cbsubtype[128]; + long cbmaintype_len; + long cbsubtype_len; if (cbtype != NULL) if (!IsEmptyStr(cbtype)) have_cbtype = 1; if (have_cbtype) { - extract_token(cbmaintype, cbtype, 0, '/', sizeof cbmaintype); - extract_token(cbsubtype, cbtype, 1, '/', sizeof cbsubtype); + cbmaintype_len = extract_token(cbmaintype, cbtype, 0, '/', sizeof cbmaintype); + cbsubtype_len = extract_token(cbsubtype, cbtype, 1, '/', sizeof cbsubtype); } else { strcpy(cbmaintype, "TEXT"); + cbmaintype_len = 4; strcpy(cbsubtype, "PLAIN"); + cbsubtype_len = 5; } IAPuts("("); - plain_imap_strout(cbmaintype); /* body type */ + IPutStr(cbmaintype, cbmaintype_len); /* body type */ IAPuts(" "); - plain_imap_strout(cbsubtype); /* body subtype */ + IPutStr(cbsubtype, cbsubtype_len); /* body subtype */ IAPuts(" "); - IAPuts("("); /* begin body parameter list */ + IAPuts("("); /* begin body parameter list */ /* "NAME" must appear as the first parameter. This is not required by IMAP, * but the Asterisk voicemail application blindly assumes that NAME will be in * the first position. If it isn't, it rejects the message. */ - if (name != NULL) if (!IsEmptyStr(name)) { + if ((name != NULL) && (!IsEmptyStr(name))) { IAPuts("\"NAME\" "); - plain_imap_strout(name); + IPutStr(name, strlen(name)); IAPuts(" "); } IAPuts("\"CHARSET\" "); - if (cbcharset == NULL) { - plain_imap_strout("US-ASCII"); - } - else if (cbcharset[0] == 0) { - plain_imap_strout("US-ASCII"); + if ((cbcharset == NULL) || (cbcharset[0] == 0)){ + IPutStr(HKEY("US-ASCII")); } else { - plain_imap_strout(cbcharset); + IPutStr(cbcharset, strlen(cbcharset)); } - IAPuts(") "); /* end body parameter list */ + IAPuts(") "); /* end body parameter list */ IAPuts("NIL "); /* Body ID */ IAPuts("NIL "); /* Body description */ - if (encoding != NULL) if (encoding[0] != 0) have_encoding = 1; + if ((encoding != NULL) && (encoding[0] != 0)) have_encoding = 1; if (have_encoding) { - plain_imap_strout(encoding); + IPutStr(encoding, strlen(encoding)); } else { - plain_imap_strout("7BIT"); + IPutStr(HKEY("7BIT")); } IAPuts(" "); @@ -935,18 +902,15 @@ void imap_fetch_bodystructure_part( IAPuts("NIL "); /* Disposition */ - if (disp == NULL) { - IAPuts("NIL"); - } - else if (IsEmptyStr(disp)) { + if ((disp == NULL) || IsEmptyStr(disp)) { IAPuts("NIL"); } else { IAPuts("("); - plain_imap_strout(disp); - if (filename != NULL) if (!IsEmptyStr(filename)) { + IPutStr(disp, strlen(disp)); + if ((filename != NULL) && (!IsEmptyStr(filename))) { IAPuts(" (\"FILENAME\" "); - plain_imap_strout(filename); + IPutStr(filename, strlen(filename)); IAPuts(")"); } IAPuts(")"); @@ -1019,13 +983,12 @@ void imap_fetch_bodystructure (long msgnum, const char *item, /* For messages already stored in RFC822 format, we have to parse. */ IAPuts("BODYSTRUCTURE "); - mime_parser(msg->cm_fields[eMesageText], - NULL, - *imap_fetch_bodystructure_part, /* part */ - *imap_fetch_bodystructure_pre, /* pre-multi */ - *imap_fetch_bodystructure_post, /* post-multi */ - NULL, - 1); /* don't decode -- we want it as-is */ + mime_parser(CM_RANGE(msg, eMesageText), + *imap_fetch_bodystructure_part, /* part */ + *imap_fetch_bodystructure_pre, /* pre-multi */ + *imap_fetch_bodystructure_post, /* post-multi */ + NULL, + 1); /* don't decode -- we want it as-is */ } @@ -1084,7 +1047,7 @@ void imap_do_fetch_msg(int seq, citimap_command *Cmd) { */ else if (!strcasecmp(Cmd->Params[i].Key, "BODYSTRUCTURE")) { if ((msg != NULL) && (!body_loaded)) { - CtdlFreeMessage(msg); /* need the whole thing */ + CM_Free(msg); /* need the whole thing */ msg = NULL; } if (msg == NULL) { @@ -1115,7 +1078,7 @@ void imap_do_fetch_msg(int seq, citimap_command *Cmd) { IAPuts(")\r\n"); unbuffer_output(); if (msg != NULL) { - CtdlFreeMessage(msg); + CM_Free(msg); } } @@ -1132,16 +1095,16 @@ void imap_do_fetch(citimap_command *Cmd) { /* debug output the parsed vector */ { int i; - IMAP_syslog(LOG_DEBUG, "----- %ld params", Cmd->num_parms); + syslog(LOG_DEBUG, "imap: ----- %ld params", Cmd->num_parms); for (i=0; i < Cmd->num_parms; i++) { if (Cmd->Params[i].len != strlen(Cmd->Params[i].Key)) - IMAP_syslog(LOG_DEBUG, "*********** %ld != %ld : %s", + syslog(LOG_DEBUG, "imap: *********** %ld != %ld : %s", Cmd->Params[i].len, strlen(Cmd->Params[i].Key), Cmd->Params[i].Key); else - IMAP_syslog(LOG_DEBUG, "%ld : %s", + syslog(LOG_DEBUG, "imap: %ld : %s", Cmd->Params[i].len, Cmd->Params[i].Key); }} @@ -1464,7 +1427,7 @@ void imap_uidfetch(int num_parms, ConstStr *Params) { MakeStringOf(Cmd.CmdBuf, 4); #if 0 - IMAP_syslog(LOG_DEBUG, "-------%s--------", ChrPtr(Cmd.CmdBuf)); + syslog(LOG_DEBUG, "imap: -------%s--------", ChrPtr(Cmd.CmdBuf)); #endif num_items = imap_extract_data_items(&Cmd); if (num_items < 1) {