#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
char buf[SIZ];
time_t msgdate;
+ if (!msg) return;
if (msg->cm_fields['T'] != NULL) {
msgdate = atol(msg->cm_fields['T']);
}
*/
void imap_fetch_rfc822(long msgnum, char *whichfmt) {
char buf[SIZ];
- char *ptr;
+ char *ptr = NULL;
size_t headers_size, text_size, total_size;
size_t bytes_to_send = 0;
struct MetaData smi;
int need_to_rewrite_metadata = 0;
+ int need_body = 0;
+
+ /* Determine whether this particular fetch operation requires
+ * 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")) ) {
+ need_body = 1;
+ }
/* If this is an RFC822.SIZE fetch, first look in the message's
* metadata record to see if we've saved that information.
return;
}
need_to_rewrite_metadata = 1;
+ need_body = 1;
}
/* Cache the most recent RFC822 FETCH because some clients like to
* fetch in pieces, and we don't want to have to go back to the
- * message store for each piece.
+ * message store for each piece. We also burn the cache if the
+ * client requests something that involves reading the message
+ * body, but we haven't fetched the body yet.
*/
if ((IMAP->cached_rfc822_data != NULL)
- && (IMAP->cached_rfc822_msgnum == msgnum)) {
+ && (IMAP->cached_rfc822_msgnum == msgnum)
+ && (IMAP->cached_rfc822_withbody || (!need_body)) ) {
/* Good to go! */
}
else if (IMAP->cached_rfc822_data != NULL) {
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
- CtdlOutputMsg(msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
+ CtdlOutputMsg(msgnum, MT_RFC822,
+ (need_body ? HEADERS_ALL : HEADERS_ONLY),
+ 0, 1, NULL);
+ if (!need_body) cprintf("\r\n"); /* extra trailing newline */
IMAP->cached_rfc822_data = CC->redirect_buffer;
IMAP->cached_rfc822_len = CC->redirect_len;
IMAP->cached_rfc822_msgnum = msgnum;
+ IMAP->cached_rfc822_withbody = need_body;
CC->redirect_buffer = NULL;
CC->redirect_len = 0;
CC->redirect_alloc = 0;
- if (need_to_rewrite_metadata) {
+ if ( (need_to_rewrite_metadata) && (IMAP->cached_rfc822_len > 0) ) {
smi.meta_rfc822_length = (long)IMAP->cached_rfc822_len;
PutMetaData(&smi);
}
text_size = 0;
total_size = 0;
- ptr = IMAP->cached_rfc822_data;
- do {
- ptr = memreadline(ptr, buf, sizeof buf);
- if (*ptr != 0) {
- striplt(buf);
- if (strlen(buf) == 0) {
- headers_size = ptr - IMAP->cached_rfc822_data;
+ if (need_body) {
+ ptr = IMAP->cached_rfc822_data;
+ do {
+ ptr = memreadline(ptr, buf, sizeof buf);
+ if (*ptr != 0) {
+ striplt(buf);
+ if (strlen(buf) == 0) {
+ headers_size = ptr - IMAP->cached_rfc822_data;
+ }
}
- }
- } while ( (headers_size == 0) && (*ptr != 0) );
+ } while ( (headers_size == 0) && (*ptr != 0) );
- total_size = IMAP->cached_rfc822_len;
- text_size = total_size - headers_size;
+ total_size = IMAP->cached_rfc822_len;
+ text_size = total_size - headers_size;
+ }
+ else {
+ headers_size = IMAP->cached_rfc822_len;
+ total_size = IMAP->cached_rfc822_len;
+ text_size = 0;
+ }
lprintf(CTDL_DEBUG, "RFC822: headers=%d, text=%d, total=%d\n",
headers_size, text_size, total_size);
/*
* 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"
- * but we still can't handle "2.HEADER" (which might not be a problem, because
- * we currently don't have the ability to break out nested RFC822's anyway).
+ * but we still can't handle "2.HEADER" (which might not be a problem).
*
* Note: mime_parser() was called with dont_decode set to 1, so we have the
* luxury of simply spewing without having to re-encode.
*/
void imap_load_part(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length, char *encoding,
+ void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata)
{
char mbuf2[SIZ];
if (!strcasecmp(desired_section, mbuf2)) {
cprintf("Content-type: %s", cbtype);
+ if (strlen(cbcharset) > 0)
+ cprintf("; charset=\"%s\"", cbcharset);
if (strlen(name) > 0)
cprintf("; name=\"%s\"", name);
cprintf("\r\n");
void imap_output_envelope_from(struct CtdlMessage *msg) {
char user[SIZ], node[SIZ], name[SIZ];
+ if (!msg) return;
+
/* For anonymous messages, it's so easy! */
if (!is_room_aide() && (msg->cm_anon_type == MES_ANONONLY)) {
cprintf("((\"----\" NIL \"x\" \"x.org\")) ");
* Note that the imap_strout() function can cleverly output NULL fields as NIL,
* so we don't have to check for that condition like we do elsewhere.
*/
-void imap_fetch_envelope(long msgnum, struct CtdlMessage *msg) {
+void imap_fetch_envelope(struct CtdlMessage *msg) {
char datestringbuf[SIZ];
time_t msgdate;
char *fieldptr = NULL;
+ if (!msg) return;
+
/* Parse the message date into an IMAP-format date string */
if (msg->cm_fields['T'] != NULL) {
msgdate = atol(msg->cm_fields['T']);
/* To */
imap_output_envelope_addr(msg->cm_fields['R']);
- /* Cc */
- fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
- imap_output_envelope_addr(fieldptr);
- if (fieldptr != NULL) free(fieldptr);
+ /* Cc (we do it this way because there might be a legacy non-Citadel Cc: field present) */
+ fieldptr = msg->cm_fields['Y'];
+ if (fieldptr != NULL) {
+ imap_output_envelope_addr(fieldptr);
+ }
+ else {
+ fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
+ imap_output_envelope_addr(fieldptr);
+ if (fieldptr != NULL) free(fieldptr);
+ }
/* Bcc */
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Bcc");
cprintf(")");
}
-
/*
* 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
int is_partial = 0;
size_t pstart, pbytes;
int loading_body_now = 0;
+ int need_body = 1;
+ int burn_the_cache = 0;
/* extract section */
safestrncpy(section, item, sizeof section);
if (strchr(section, '[') != NULL) {
stripallbut(section, '[', ']');
}
- /* lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((strlen(section)==0) ? "(empty)" : "") ); */
+ lprintf(CTDL_DEBUG, "Section is: %s%s\n", section, ((strlen(section)==0) ? "(empty)" : "") );
+ if (!strncasecmp(section, "HEADER", 6)) {
+ need_body = 0;
+ }
/* Burn the cache if we don't have the same section of the
* same message again.
*/
if (IMAP->cached_body != NULL) {
- if ((IMAP->cached_bodymsgnum != msgnum)
- || (strcasecmp(IMAP->cached_bodypart, section)) ) {
+ if (IMAP->cached_bodymsgnum != msgnum) {
+ burn_the_cache = 1;
+ }
+ else if ( (!IMAP->cached_body_withbody) && (need_body) ) {
+ burn_the_cache = 1;
+ }
+ else if (strcasecmp(IMAP->cached_bodypart, section)) {
+ burn_the_cache = 1;
+ }
+ if (burn_the_cache) {
+ /* Yup, go ahead and burn the cache. */
free(IMAP->cached_body);
IMAP->cached_body_len = 0;
IMAP->cached_body = NULL;
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
loading_body_now = 1;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, (need_body ? 1 : 0));
}
/* Now figure out what the client wants, and get it */
}
else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_NONE, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
}
else if (!strcmp(section, "")) {
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ALL, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
}
/*
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_ONLY, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1);
imap_strip_headers(section);
}
* Strip it down if the client asked for everything _except_ headers.
*/
else if (!strncasecmp(section, "TEXT", 4)) {
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, HEADERS_NONE, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
}
/*
IMAP->cached_body = CC->redirect_buffer;
IMAP->cached_body_len = CC->redirect_len;
IMAP->cached_bodymsgnum = msgnum;
+ IMAP->cached_body_withbody = need_body;
strcpy(IMAP->cached_bodypart, section);
CC->redirect_buffer = NULL;
CC->redirect_len = 0;
/* Mark this message as "seen" *unless* this is a "peek" operation */
if (is_peek == 0) {
- CtdlSetSeen(msgnum, 1, ctdlsetseen_seen);
+ CtdlSetSeen(&msgnum, 1, 1, ctdlsetseen_seen, NULL, NULL);
}
}
*/
void imap_fetch_bodystructure_pre(
char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length, char *encoding,
+ void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata
) {
*/
void imap_fetch_bodystructure_post(
char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length, char *encoding,
+ void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata
) {
*/
void imap_fetch_bodystructure_part(
char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length, char *encoding,
+ void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
void *cbuserdata
) {
imap_strout(cbsubtype);
cprintf(" ");
- cprintf("(\"CHARSET\" \"US-ASCII\"");
+ if (cbcharset == NULL) {
+ cprintf("(\"CHARSET\" \"US-ASCII\"");
+ }
+ else if (strlen(cbcharset) == 0) {
+ cprintf("(\"CHARSET\" \"US-ASCII\"");
+ }
+ else {
+ cprintf("(\"CHARSET\" ");
+ imap_strout(cbcharset);
+ }
if (name != NULL) if (strlen(name)>0) {
cprintf(" \"NAME\" ");
char buf[SIZ];
int lines = 0;
+ /* Handle NULL message gracefully */
+ if (msg == NULL) {
+ cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
+ "(\"CHARSET\" \"US-ASCII\") NIL NIL "
+ "\"7BIT\" 0 0)");
+ return;
+ }
+
/* For non-RFC822 (ordinary Citadel) messages, this is short and
* sweet...
*/
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, 0, 0, 1);
rfc822 = CC->redirect_buffer;
rfc822_len = CC->redirect_len;
CC->redirect_buffer = NULL;
void imap_do_fetch_msg(int seq, int num_items, char **itemlist) {
int i;
struct CtdlMessage *msg = NULL;
+ int body_loaded = 0;
+
+ /* Don't attempt to fetch bogus messages or UID's */
+ if (seq < 1) return;
+ if (IMAP->msgids[seq-1] < 1L) return;
+ buffer_output();
cprintf("* %d FETCH (", seq);
for (i=0; i<num_items; ++i) {
/* Otherwise, load the message into memory.
*/
else if (!strcasecmp(itemlist[i], "BODYSTRUCTURE")) {
- if (msg == NULL) msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
+ if ((msg != NULL) && (!body_loaded)) {
+ CtdlFreeMessage(msg); /* need the whole thing */
+ msg = NULL;
+ }
+ if (msg == NULL) {
+ msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
+ body_loaded = 1;
+ }
imap_fetch_bodystructure(IMAP->msgids[seq-1],
itemlist[i], msg);
}
else if (!strcasecmp(itemlist[i], "ENVELOPE")) {
- if (msg == NULL) msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
- imap_fetch_envelope(IMAP->msgids[seq-1], msg);
+ if (msg == NULL) {
+ msg = CtdlFetchMessage(IMAP->msgids[seq-1], 0);
+ body_loaded = 0;
+ }
+ imap_fetch_envelope(msg);
}
else if (!strcasecmp(itemlist[i], "INTERNALDATE")) {
- if (msg == NULL) msg = CtdlFetchMessage(IMAP->msgids[seq-1], 1);
+ if (msg == NULL) {
+ msg = CtdlFetchMessage(IMAP->msgids[seq-1], 0);
+ body_loaded = 0;
+ }
imap_fetch_internaldate(msg);
}
}
cprintf(")\r\n");
+ unbuffer_output();
if (msg != NULL) {
CtdlFreeMessage(msg);
}
if (IMAP->num_msgs > 0) {
for (i = 0; i < IMAP->num_msgs; ++i) {
+
+ /* Abort the fetch loop if the session breaks.
+ * This is important for users who keep mailboxes
+ * that are too big *and* are too impatient to
+ * let them finish loading. :)
+ */
+ if (CC->kill_me) return;
+
+ /* Get any message marked for fetch. */
if (IMAP->flags[i] & IMAP_SELECTED) {
imap_do_fetch_msg(i+1, num_items, itemlist);
}
if (is_uid) { /* fetch by sequence number */
if ( (IMAP->msgids[i-1]>=lo)
&& (IMAP->msgids[i-1]<=hi)) {
- IMAP->flags[i-1] =
- IMAP->flags[i-1] | IMAP_SELECTED;
+ IMAP->flags[i-1] |= IMAP_SELECTED;
}
}
else { /* fetch by uid */
if ( (i>=lo) && (i<=hi)) {
- IMAP->flags[i-1] =
- IMAP->flags[i-1] | IMAP_SELECTED;
+ IMAP->flags[i-1] |= IMAP_SELECTED;
}
}
}
*/
void imap_fetch(int num_parms, char *parms[]) {
char items[SIZ];
- char *itemlist[SIZ];
+ char *itemlist[512];
int num_items;
int i;
*/
void imap_uidfetch(int num_parms, char *parms[]) {
char items[SIZ];
- char *itemlist[SIZ];
+ char *itemlist[512];
int num_items;
int i;
int have_uid_item = 0;
}
/* If the "UID" item was not included, we include it implicitly
- * because this is a UID FETCH command
+ * (at the beginning) because this is a UID FETCH command
*/
for (i=0; i<num_items; ++i) {
if (!strcasecmp(itemlist[i], "UID")) ++have_uid_item;
}
- if (have_uid_item == 0) itemlist[num_items++] = "UID";
+ if (have_uid_item == 0) {
+ memmove(&itemlist[1], &itemlist[0], (sizeof(itemlist[0]) * num_items));
+ ++num_items;
+ itemlist[0] = "UID";
+ }
imap_do_fetch(num_items, itemlist);
cprintf("%s OK UID FETCH completed\r\n", parms[0]);
projects / citadel.git / blobdiff