* Implements the FETCH command in IMAP.
* This is a good example of the protocol's gratuitous complexity.
*
+ * Copyright (c) 2001-2009 by the citadel.org team
+ *
+ * This program is free 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
*/
#include <ctype.h>
#include <string.h>
#include <limits.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
#include "database.h"
#include "msgbase.h"
-#include "tools.h"
#include "internet_addressing.h"
-#include "mime_parser.h"
-#include "serv_imap.h"
#include "imap_tools.h"
+#include "serv_imap.h"
#include "imap_fetch.h"
#include "genstamp.h"
+#include "ctdl_module.h"
cprintf(")");
}
+
void imap_fetch_internaldate(struct CtdlMessage *msg) {
char buf[SIZ];
time_t msgdate;
*/
void imap_fetch_rfc822(long msgnum, char *whichfmt) {
char buf[SIZ];
- char *ptr = NULL;
+ const char *ptr = NULL;
size_t headers_size, text_size, total_size;
size_t bytes_to_send = 0;
struct MetaData smi;
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
CtdlOutputMsg(msgnum, MT_RFC822,
- (need_body ? HEADERS_ALL : HEADERS_ONLY),
- 0, 1, NULL);
+ (need_body ? HEADERS_ALL : HEADERS_FAST),
+ 0, 1, NULL, SUPPRESS_ENV_TO
+ );
if (!need_body) cprintf("\r\n"); /* extra trailing newline */
IMAP->cached_rfc822_data = CC->redirect_buffer;
IMAP->cached_rfc822_len = CC->redirect_len;
text_size = 0;
}
- lprintf(CTDL_DEBUG, "RFC822: headers=%d, text=%d, total=%d\n",
+ CtdlLogPrintf(CTDL_DEBUG,
+ "RFC822: headers=" SIZE_T_FMT
+ ", text=" SIZE_T_FMT
+ ", total=" SIZE_T_FMT "\n",
headers_size, text_size, total_size);
if (!strcasecmp(whichfmt, "RFC822.SIZE")) {
- cprintf("RFC822.SIZE %d", total_size);
+ cprintf("RFC822.SIZE " SIZE_T_FMT, total_size);
return;
}
bytes_to_send = text_size;
}
- cprintf("%s {%d}\r\n", whichfmt, bytes_to_send);
+ cprintf("%s {" SIZE_T_FMT "}\r\n", whichfmt, bytes_to_send);
client_write(ptr, bytes_to_send);
}
*/
void imap_load_part(char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ char *cbid, void *cbuserdata)
{
char mbuf2[SIZ];
char *desired_section;
/* For everything else, we do stuff. */
cprintf("(("); /* open double-parens */
- imap_strout(msg->cm_fields['A']); /* personal name */
+ plain_imap_strout(msg->cm_fields['A']); /* personal name */
cprintf(" NIL "); /* source route (not used) */
if (msg->cm_fields['F'] != NULL) {
process_rfc822_addr(msg->cm_fields['F'], user, node, name);
- imap_strout(user); /* mailbox name (user id) */
+ plain_imap_strout(user); /* mailbox name (user id) */
cprintf(" ");
if (!strcasecmp(node, config.c_nodename)) {
- imap_strout(config.c_fqdn);
+ plain_imap_strout(config.c_fqdn);
}
else {
- imap_strout(node); /* host name */
+ plain_imap_strout(node); /* host name */
}
}
else {
- imap_strout(msg->cm_fields['A']); /* mailbox name (user id) */
+ plain_imap_strout(msg->cm_fields['A']); /* mailbox name (user id) */
cprintf(" ");
- imap_strout(msg->cm_fields['N']); /* host name */
+ plain_imap_strout(msg->cm_fields['N']); /* host name */
}
cprintf(")) "); /* close double-parens */
/*
* Output an envelope address (or set of addresses) in the official,
- * convuluted, braindead format. (Note that we can't use this for
+ * convoluted, braindead format. (Note that we can't use this for
* the "From" address because its data may come from a number of different
* fields. But we can use it for "To" and possibly others.
*/
striplt(individual_addr);
process_rfc822_addr(individual_addr, user, node, name);
cprintf("(");
- imap_strout(name);
+ plain_imap_strout(name);
cprintf(" NIL ");
- imap_strout(user);
+ plain_imap_strout(user);
cprintf(" ");
- imap_strout(node);
+ plain_imap_strout(node);
cprintf(")");
if (i < (num_addrs-1)) cprintf(" ");
}
cprintf("ENVELOPE (");
/* Date */
- imap_strout(datestringbuf);
+ plain_imap_strout(datestringbuf);
cprintf(" ");
/* Subject */
- imap_strout(msg->cm_fields['U']);
+ plain_imap_strout(msg->cm_fields['U']);
cprintf(" ");
/* From */
/* In-reply-to */
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "In-reply-to");
- imap_strout(fieldptr);
+ plain_imap_strout(fieldptr);
cprintf(" ");
if (fieldptr != NULL) free(fieldptr);
/* message ID */
- imap_strout(msg->cm_fields['I']);
+ plain_imap_strout(msg->cm_fields['I']);
cprintf(")");
}
char *boiled_headers = NULL;
int ok = 0;
int done_headers = 0;
- char *ptr = NULL;
+ const char *ptr = NULL;
if (CC->redirect_buffer == NULL) return;
break;
}
}
- num_parms = imap_parameterize(parms, which_fields);
+ num_parms = old_imap_parameterize(parms, which_fields);
boiled_headers = malloc(CC->redirect_alloc);
strcpy(boiled_headers, "");
ptr = CC->redirect_buffer;
ok = 0;
- while ( (done_headers == 0) && (ptr = memreadline(ptr, buf, sizeof buf), *ptr != 0) ) {
+ do {
+ ptr = memreadline(ptr, buf, sizeof buf);
if (!isspace(buf[0])) {
ok = 0;
if (doing_headers == 0) ok = 1;
if (IsEmptyStr(buf)) done_headers = 1;
if (buf[0]=='\r') done_headers = 1;
if (buf[0]=='\n') done_headers = 1;
- }
+ if (*ptr == 0) done_headers = 1;
+ } while (!done_headers);
strcat(boiled_headers, "\r\n");
if (strchr(section, '[') != NULL) {
stripallbut(section, '[', ']');
}
- lprintf(CTDL_DEBUG, "Section is: %s%s\n",
+ CtdlLogPrintf(CTDL_DEBUG, "Section is: %s%s\n",
section,
- IsEmptyStr(section) ? "(empty)" : "");
-
- /*
- * We used to have this great optimization in place that would avoid
- * fetching the entire RFC822 message from disk if the client was only
- * asking for the headers. Unfortunately, fetching only the Citadel
- * headers omits "Content-type:" and this behavior breaks the iPhone
- * email client. So we have to fetch the whole message from disk. The
- *
- * if (!strncasecmp(section, "HEADER", 6)) {
- * need_body = 0;
- * }
- *
- */
+ IsEmptyStr(section) ? "(empty)" : ""
+ );
/* Burn the cache if we don't have the same section of the
* same message again.
is_partial = 1;
}
if (is_partial == 0) strcpy(partial, "");
- /* if (!IsEmptyStr(partial)) lprintf(CTDL_DEBUG, "Partial is %s\n", partial); */
+ /* if (!IsEmptyStr(partial)) CtdlLogPrintf(CTDL_DEBUG, "Partial is %s\n", partial); */
if (IMAP->cached_body == NULL) {
CC->redirect_buffer = malloc(SIZ);
}
else if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1, SUPPRESS_ENV_TO);
}
else if (!strcmp(section, "")) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, SUPPRESS_ENV_TO);
}
/*
* fields, strip it down.
*/
else if (!strncasecmp(section, "HEADER", 6)) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1);
+ /* This used to work with HEADERS_FAST, but then Apple got stupid with their
+ * IMAP library and this broke Mail.App and iPhone Mail, so we had to change it
+ * to HEADERS_ONLY so the trendy hipsters with their iPhones can read mail.
+ */
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ONLY, 0, 1, SUPPRESS_ENV_TO);
imap_strip_headers(section);
}
* Strip it down if the client asked for everything _except_ headers.
*/
else if (!strncasecmp(section, "TEXT", 4)) {
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_NONE, 0, 1, SUPPRESS_ENV_TO);
}
/*
}
if (is_partial == 0) {
- cprintf("BODY[%s] {%d}\r\n", section, IMAP->cached_body_len);
+ cprintf("BODY[%s] {" SIZE_T_FMT "}\r\n", section, IMAP->cached_body_len);
pstart = 0;
pbytes = IMAP->cached_body_len;
}
else {
- sscanf(partial, "%d.%d", &pstart, &pbytes);
+ sscanf(partial, SIZE_T_FMT "." SIZE_T_FMT, &pstart, &pbytes);
if (pbytes > (IMAP->cached_body_len - pstart)) {
pbytes = IMAP->cached_body_len - pstart;
}
- cprintf("BODY[%s]<%d> {%d}\r\n", section, pstart, pbytes);
+ cprintf("BODY[%s]<" SIZE_T_FMT "> {" SIZE_T_FMT "}\r\n", section, pstart, pbytes);
}
/* Here we go -- output it */
void imap_fetch_bodystructure_pre(
char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata
+ char *cbid, void *cbuserdata
) {
cprintf("(");
void imap_fetch_bodystructure_post(
char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata
+ char *cbid, void *cbuserdata
) {
char subtype[128];
/* disposition */
extract_token(subtype, cbtype, 1, '/', sizeof subtype);
- imap_strout(subtype);
+ plain_imap_strout(subtype);
/* body language */
/* cprintf(" NIL"); We thought we needed this at one point, but maybe we don't... */
void imap_fetch_bodystructure_part(
char *name, char *filename, char *partnum, char *disp,
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata
+ char *cbid, void *cbuserdata
) {
int have_cbtype = 0;
}
cprintf("(");
- imap_strout(cbmaintype); /* body type */
+ plain_imap_strout(cbmaintype); /* body type */
cprintf(" ");
- imap_strout(cbsubtype); /* body subtype */
+ plain_imap_strout(cbsubtype); /* body subtype */
cprintf(" ");
cprintf("("); /* begin body parameter list */
*/
if (name != NULL) if (!IsEmptyStr(name)) {
cprintf("\"NAME\" ");
- imap_strout(name);
+ plain_imap_strout(name);
cprintf(" ");
}
cprintf("\"CHARSET\" ");
if (cbcharset == NULL) {
- imap_strout("US-ASCII");
+ plain_imap_strout("US-ASCII");
}
else if (cbcharset[0] == 0) {
- imap_strout("US-ASCII");
+ plain_imap_strout("US-ASCII");
}
else {
- imap_strout(cbcharset);
+ plain_imap_strout(cbcharset);
}
cprintf(") "); /* end body parameter list */
if (encoding != NULL) if (encoding[0] != 0) have_encoding = 1;
if (have_encoding) {
- imap_strout(encoding);
+ plain_imap_strout(encoding);
}
else {
- imap_strout("7BIT");
+ plain_imap_strout("7BIT");
}
cprintf(" ");
/* More gratuitous complexity */
if ((!strcasecmp(cbmaintype, "MESSAGE"))
&& (!strcasecmp(cbsubtype, "RFC822"))) {
- /* FIXME
- A body type of type MESSAGE and subtype RFC822
- contains, immediately after the basic fields, the
- envelope structure, body structure, and size in
- text lines of the encapsulated message.
- */
+ /* FIXME: message/rfc822 also needs to output the envelope structure,
+ * body structure, and line count of the encapsulated message. Fortunately
+ * there are not yet any clients depending on this, so we can get away
+ * with not implementing it for now.
+ */
}
/* MD5 value of body part; we can get away with NIL'ing this */
}
else {
cprintf("(");
- imap_strout(disp);
+ plain_imap_strout(disp);
if (filename != NULL) if (!IsEmptyStr(filename)) {
cprintf(" (\"FILENAME\" ");
- imap_strout(filename);
+ plain_imap_strout(filename);
cprintf(")");
}
cprintf(")");
*/
void imap_fetch_bodystructure (long msgnum, char *item,
struct CtdlMessage *msg) {
- char *rfc822 = NULL;
- char *rfc822_body = NULL;
+ const char *rfc822 = NULL;
+ const char *rfc822_body = NULL;
size_t rfc822_len;
size_t rfc822_headers_len;
size_t rfc822_body_len;
- char *ptr = NULL;
+ const char *ptr = NULL;
+ char *pch;
char buf[SIZ];
int lines = 0;
CC->redirect_buffer = malloc(SIZ);
CC->redirect_len = 0;
CC->redirect_alloc = SIZ;
- CtdlOutputPreLoadedMsg(msg, MT_RFC822, 0, 0, 1);
- rfc822 = CC->redirect_buffer;
+ CtdlOutputPreLoadedMsg(msg, MT_RFC822, 0, 0, 1, SUPPRESS_ENV_TO);
+ rfc822 = pch = CC->redirect_buffer;
rfc822_len = CC->redirect_len;
CC->redirect_buffer = NULL;
CC->redirect_len = 0;
CC->redirect_alloc = 0;
ptr = rfc822;
- while (ptr = memreadline(ptr, buf, sizeof buf), *ptr != 0) {
+ do {
+ ptr = memreadline(ptr, buf, sizeof buf);
++lines;
if ((IsEmptyStr(buf)) && (rfc822_body == NULL)) {
rfc822_body = ptr;
}
- }
+ } while (*ptr != 0);
rfc822_headers_len = rfc822_body - rfc822;
rfc822_body_len = rfc822_len - rfc822_headers_len;
- free(rfc822);
+ free(pch);
cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
"(\"CHARSET\" \"US-ASCII\") NIL NIL "
- "\"7BIT\" %d %d)", rfc822_body_len, lines);
+ "\"7BIT\" " SIZE_T_FMT " %d)", rfc822_body_len, lines);
return;
}
*/
void imap_macro_replace(char *str, char *find, char *replace) {
char holdbuf[SIZ];
+ int findlen;
- if (!strncasecmp(str, find, strlen(find))) {
- if (str[strlen(find)]==' ') {
- strcpy(holdbuf, &str[strlen(find)+1]);
+ findlen = strlen(find);
+
+ if (!strncasecmp(str, find, findlen)) {
+ if (str[findlen]==' ') {
+ strcpy(holdbuf, &str[findlen+1]);
strcpy(str, replace);
strcat(str, " ");
strcat(str, holdbuf);
}
- if (str[strlen(find)]==0) {
- strcpy(holdbuf, &str[strlen(find)+1]);
+ if (str[findlen]==0) {
+ strcpy(holdbuf, &str[findlen+1]);
strcpy(str, replace);
}
}
*
* Set is_uid to 1 to fetch by UID instead of sequence number.
*/
-void imap_pick_range(char *supplied_range, int is_uid) {
+void imap_pick_range(const char *supplied_range, int is_uid) {
int i;
int num_sets;
int s;
char setstr[SIZ], lostr[SIZ], histr[SIZ];
long lo, hi;
char actual_range[SIZ];
+ citimap *Imap;
/*
* Handle the "ALL" macro
safestrncpy(actual_range, supplied_range, sizeof actual_range);
}
+ Imap = IMAP;
/*
* Clear out the IMAP_SELECTED flags for all messages.
*/
- for (i = 0; i < IMAP->num_msgs; ++i) {
- IMAP->flags[i] = IMAP->flags[i] & ~IMAP_SELECTED;
+ for (i = 0; i < Imap->num_msgs; ++i) {
+ Imap->flags[i] = Imap->flags[i] & ~IMAP_SELECTED;
}
/*
hi = atol(histr);
/* Loop through the array, flipping bits where appropriate */
- for (i = 1; i <= IMAP->num_msgs; ++i) {
+ for (i = 1; i <= Imap->num_msgs; ++i) {
if (is_uid) { /* fetch by sequence number */
- if ( (IMAP->msgids[i-1]>=lo)
- && (IMAP->msgids[i-1]<=hi)) {
- IMAP->flags[i-1] |= IMAP_SELECTED;
+ if ( (Imap->msgids[i-1]>=lo)
+ && (Imap->msgids[i-1]<=hi)) {
+ Imap->flags[i-1] |= IMAP_SELECTED;
}
}
else { /* fetch by uid */
if ( (i>=lo) && (i<=hi)) {
- IMAP->flags[i-1] |= IMAP_SELECTED;
+ Imap->flags[i-1] |= IMAP_SELECTED;
}
}
}
}
-
}
/*
* This function is called by the main command loop.
*/
-void imap_fetch(int num_parms, char *parms[]) {
+void imap_fetch(int num_parms, ConstStr *Params) {
char items[SIZ];
char *itemlist[512];
int num_items;
int i;
if (num_parms < 4) {
- cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ cprintf("%s BAD invalid parameters\r\n", Params[0].Key);
return;
}
- imap_pick_range(parms[2], 0);
+ imap_pick_range(Params[2].Key, 0);
strcpy(items, "");
for (i=3; i<num_parms; ++i) {
- strcat(items, parms[i]);
+ strcat(items, Params[i].Key);
if (i < (num_parms-1)) strcat(items, " ");
}
num_items = imap_extract_data_items(itemlist, items);
if (num_items < 1) {
- cprintf("%s BAD invalid data item list\r\n", parms[0]);
+ cprintf("%s BAD invalid data item list\r\n", Params[0].Key);
return;
}
imap_do_fetch(num_items, itemlist);
- cprintf("%s OK FETCH completed\r\n", parms[0]);
+ cprintf("%s OK FETCH completed\r\n", Params[0].Key);
}
/*
* This function is called by the main command loop.
*/
-void imap_uidfetch(int num_parms, char *parms[]) {
+void imap_uidfetch(int num_parms, ConstStr *Params) {
char items[SIZ];
char *itemlist[512];
int num_items;
int have_uid_item = 0;
if (num_parms < 5) {
- cprintf("%s BAD invalid parameters\r\n", parms[0]);
+ cprintf("%s BAD invalid parameters\r\n", Params[0].Key);
return;
}
- imap_pick_range(parms[3], 1);
+ imap_pick_range(Params[3].Key, 1);
strcpy(items, "");
for (i=4; i<num_parms; ++i) {
- strcat(items, parms[i]);
+ strcat(items, Params[i].Key);
if (i < (num_parms-1)) strcat(items, " ");
}
num_items = imap_extract_data_items(itemlist, items);
if (num_items < 1) {
- cprintf("%s BAD invalid data item list\r\n", parms[0]);
+ cprintf("%s BAD invalid data item list\r\n", Params[0].Key);
return;
}
}
imap_do_fetch(num_items, itemlist);
- cprintf("%s OK UID FETCH completed\r\n", parms[0]);
+ cprintf("%s OK UID FETCH completed\r\n", Params[0].Key);
}
projects / citadel.git / blobdiff