#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <ctype.h>
#include <string.h>
#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include <time.h>
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "user_ops.h"
#include "policy.h"
}
void imap_fetch_flags(int seq) {
+ int num_flags_printed = 0;
cprintf("FLAGS (");
- if (IMAP->flags[seq] & IMAP_DELETED) cprintf("\\Deleted ");
+ if (IMAP->flags[seq] & IMAP_DELETED) {
+ if (num_flags_printed > 0) cprintf(" ");
+ cprintf("\\Deleted");
+ ++num_flags_printed;
+ }
+ if (IMAP->flags[seq] & IMAP_SEEN) {
+ if (num_flags_printed > 0) cprintf(" ");
+ cprintf("\\Seen");
+ ++num_flags_printed;
+ }
+ if (IMAP->flags[seq] & IMAP_ANSWERED) {
+ if (num_flags_printed > 0) cprintf(" ");
+ cprintf("\\Answered");
+ ++num_flags_printed;
+ }
cprintf(")");
}
msgdate = time(NULL);
}
- datestring(buf, msgdate, DATESTRING_IMAP);
+ datestring(buf, sizeof buf, msgdate, DATESTRING_IMAP);
cprintf("INTERNALDATE \"%s\"", buf);
}
* "RFC822.TEXT" body only (without leading blank line)
*/
void imap_fetch_rfc822(int msgnum, char *whichfmt, struct CtdlMessage *msg) {
- FILE *tmp;
char buf[1024];
char *ptr;
long headers_size, text_size, total_size;
long bytes_remaining = 0;
long blocksize;
+ FILE *tmp;
tmp = tmpfile();
if (tmp == NULL) {
- lprintf(1, "Cannot open temp file: %s\n", strerror(errno));
+ lprintf(CTDL_CRIT, "Cannot open temp file: %s\n",
+ strerror(errno));
return;
}
/*
- * Load the message into a temp file for translation and measurement
- */
+ * Load the message into a temp file for translation
+ * and measurement
+ */
CtdlRedirectOutput(tmp, -1);
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+ HEADERS_ALL, 0, 1);
CtdlRedirectOutput(NULL, -1);
if (!is_valid_message(msg)) {
- lprintf(1, "WARNING: output clobbered the message!\n");
+ lprintf(CTDL_ERR, "WARNING: output clobbered the message!\n");
}
/*
ptr = fgets(buf, sizeof buf, tmp);
if (ptr != NULL) {
striplt(buf);
- if (strlen(buf) == 0) headers_size = ftell(tmp);
+ if (strlen(buf) == 0) {
+ headers_size = ftell(tmp);
+ }
}
} while ( (headers_size == 0L) && (ptr != NULL) );
fseek(tmp, 0L, SEEK_END);
fwrite(content, length, 1, imfp->output_fp);
}
- sprintf(mbuf2, "%s.MIME", partnum);
+ snprintf(mbuf2, sizeof mbuf2, "%s.MIME", partnum);
if (!strcasecmp(imfp->desired_section, mbuf2)) {
fprintf(imfp->output_fp, "Content-type: %s", cbtype);
}
fprintf(imfp->output_fp, "\r\n");
}
- fprintf(imfp->output_fp, "Content-Length: %d\r\n", length);
+ fprintf(imfp->output_fp, "Content-Length: %ld\r\n", (long)length);
fprintf(imfp->output_fp, "\r\n");
}
void imap_output_envelope_from(struct CtdlMessage *msg) {
char user[1024], node[1024], name[1024];
+ /* For anonymous messages, it's so easy! */
+ if (!is_room_aide() && (msg->cm_anon_type == MES_ANONONLY)) {
+ cprintf("((\"----\" NIL \"x\" \"x.org\")) ");
+ return;
+ }
+ if (!is_room_aide() && (msg->cm_anon_type == MES_ANONOPT)) {
+ cprintf("((\"anonymous\" NIL \"x\" \"x.org\")) ");
+ return;
+ }
+
+ /* For everything else, we do stuff. */
cprintf("(("); /* open double-parens */
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) */
}
+
+/*
+ * Output an envelope address (or set of addresses) in the official,
+ * Crispin-approved 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.
+ */
+void imap_output_envelope_addr(char *addr) {
+ char individual_addr[SIZ];
+ int num_addrs;
+ int i;
+ char user[SIZ];
+ char node[SIZ];
+ char name[SIZ];
+
+ if (addr == NULL) {
+ cprintf("NIL ");
+ return;
+ }
+
+ if (strlen(addr) == 0) {
+ cprintf("NIL ");
+ return;
+ }
+
+ cprintf("(");
+
+ /* How many addresses are listed here? */
+ num_addrs = num_tokens(addr, ',');
+
+ /* Output them one by one. */
+ for (i=0; i<num_addrs; ++i) {
+ extract_token(individual_addr, addr, i, ',');
+ striplt(individual_addr);
+ process_rfc822_addr(individual_addr, user, node, name);
+ cprintf("(");
+ imap_strout(name);
+ cprintf(" NIL ");
+ imap_strout(user);
+ cprintf(" ");
+ imap_strout(node);
+ cprintf(")");
+ if (i < (num_addrs-1)) cprintf(" ");
+ }
+
+ cprintf(") ");
+}
+
+
/*
* Implements the ENVELOPE fetch item
*
- * FIXME ... we only output some of the fields right now. Definitely need
- * to do all of them. Accurately, too.
- *
* 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.
*/
else {
msgdate = time(NULL);
}
- datestring(datestringbuf, msgdate, DATESTRING_IMAP);
+ 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
/* From */
imap_output_envelope_from(msg);
- /* Sender */
- if (0) {
- /* FIXME ... check for a *real* Sender: field */
+ /* Sender (default to same as 'From' if not present) */
+ fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Sender");
+ if (fieldptr != NULL) {
+ imap_output_envelope_addr(fieldptr);
+ phree(fieldptr);
}
else {
imap_output_envelope_from(msg);
}
/* Reply-to */
- if (0) {
- /* FIXME ... check for a *real* Reply-to: field */
+ fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Reply-to");
+ if (fieldptr != NULL) {
+ imap_output_envelope_addr(fieldptr);
+ phree(fieldptr);
}
else {
imap_output_envelope_from(msg);
}
- cprintf("NIL "); /* to */
+ /* To */
+ imap_output_envelope_addr(msg->cm_fields['R']);
- cprintf("NIL "); /* cc */
+ /* Cc */
+ fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Cc");
+ imap_output_envelope_addr(fieldptr);
+ if (fieldptr != NULL) phree(fieldptr);
- cprintf("NIL "); /* bcc */
+ /* Bcc */
+ fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "Bcc");
+ imap_output_envelope_addr(fieldptr);
+ if (fieldptr != NULL) phree(fieldptr);
/* In-reply-to */
fieldptr = rfc822_fetch_field(msg->cm_fields['M'], "In-reply-to");
/* message ID */
imap_strout(msg->cm_fields['I']);
- cprintf(") ");
+ cprintf(")");
}
if (buf[0]=='\n') done_headers = 1;
}
+ strcat(boiled_headers, "\r\n");
+
/* Now write it back */
rewind(fp);
fwrite(boiled_headers, strlen(boiled_headers), 1, fp);
fflush(fp);
ftruncate(fileno(fp), ftell(fp));
fflush(fp);
- fprintf(fp, "\r\n"); /* add the trailing newline */
rewind(fp);
phree(which_fields);
phree(boiled_headers);
for (i=0; i<strlen(section); ++i) {
if (section[i]==']') section[i] = 0;
}
- lprintf(9, "Section is %s\n", section);
+ lprintf(CTDL_DEBUG, "Section is %s\n", section);
/* extract partial */
strcpy(partial, item);
if (partial[i]=='>') partial[i] = 0;
}
if (is_partial == 0) strcpy(partial, "");
- if (strlen(partial) > 0) lprintf(9, "Partial is %s\n", partial);
+ if (strlen(partial) > 0) lprintf(CTDL_DEBUG, "Partial is %s\n", partial);
tmp = tmpfile();
if (tmp == NULL) {
- lprintf(1, "Cannot open temp file: %s\n", strerror(errno));
+ lprintf(CTDL_CRIT, "Cannot open temp file: %s\n", strerror(errno));
return;
}
/* Now figure out what the client wants, and get it */
- if (!strcmp(section, "")) { /* the whole thing */
+ if ( (!strcmp(section, "1")) && (msg->cm_format_type != 4) ) {
CtdlRedirectOutput(tmp, -1);
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 0, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+ HEADERS_NONE, 0, 1);
+ CtdlRedirectOutput(NULL, -1);
+ }
+
+ else if (!strcmp(section, "")) {
+ CtdlRedirectOutput(tmp, -1);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+ HEADERS_ALL, 0, 1);
CtdlRedirectOutput(NULL, -1);
}
*/
else if (!strncasecmp(section, "HEADER", 6)) {
CtdlRedirectOutput(tmp, -1);
- CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822, 1, 0, 1);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+ HEADERS_ONLY, 0, 1);
CtdlRedirectOutput(NULL, -1);
imap_strip_headers(tmp, section);
}
+ /*
+ * Strip it down if the client asked for everything _except_ headers.
+ */
+ else if (!strncasecmp(section, "TEXT", 4)) {
+ CtdlRedirectOutput(tmp, -1);
+ CtdlOutputPreLoadedMsg(msg, msgnum, MT_RFC822,
+ HEADERS_NONE, 0, 1);
+ CtdlRedirectOutput(NULL, -1);
+ }
+
/*
* Anything else must be a part specifier.
* (Note value of 1 passed as 'dont_decode' so client gets it encoded)
}
fseek(tmp, pstart, SEEK_SET);
bytes_remaining = pbytes;
- cprintf("BODY[%s] {%ld}<%ld>\r\n",
- section, bytes_remaining, pstart);
+ cprintf("BODY[%s]<%ld> {%ld}\r\n",
+ section, pstart, bytes_remaining);
}
blocksize = sizeof(buf);
fclose(tmp);
- if (is_peek) {
- /* FIXME set the last read pointer or something */
+ /* Mark this message as "seen" *unless* this is a "peek" operation */
+ if (is_peek == 0) {
+ CtdlSetSeen(msgnum, 1, ctdlsetseen_seen);
}
}
char subtype[SIZ];
+ cprintf(" ");
+
+ /* disposition */
extract_token(subtype, cbtype, 1, '/');
imap_strout(subtype);
+
+ /* body language */
+ cprintf(" NIL");
+
cprintf(")");
}
void *cbuserdata
) {
- char buf[SIZ];
int have_cbtype = 0;
int have_encoding = 0;
-
- cprintf("(");
+ int lines = 0;
+ size_t i;
+ char cbmaintype[SIZ];
+ char cbsubtype[SIZ];
if (cbtype != NULL) if (strlen(cbtype)>0) have_cbtype = 1;
-
if (have_cbtype) {
- extract_token(buf, cbtype, 0, '/');
- imap_strout(buf);
- cprintf(" ");
- extract_token(buf, cbtype, 1, '/');
- imap_strout(buf);
- cprintf(" ");
+ extract_token(cbmaintype, cbtype, 0, '/');
+ extract_token(cbsubtype, cbtype, 1, '/');
}
else {
- cprintf("\"TEXT\" \"PLAIN\" ");
+ strcpy(cbmaintype, "TEXT");
+ strcpy(cbsubtype, "PLAIN");
}
+ cprintf("(");
+ imap_strout(cbmaintype);
+ cprintf(" ");
+ imap_strout(cbsubtype);
+ cprintf(" ");
+
cprintf("(\"CHARSET\" \"US-ASCII\"");
if (name != NULL) if (strlen(name)>0) {
imap_strout(name);
}
- if (filename != NULL) if (strlen(filename)>0) {
- cprintf(" \"FILENAME\" ");
- imap_strout(name);
- }
-
cprintf(") ");
- cprintf("NIL NIL ");
+ cprintf("NIL "); /* Body ID */
+ cprintf("NIL "); /* Body description */
if (encoding != NULL) if (strlen(encoding) > 0) have_encoding = 1;
-
if (have_encoding) {
imap_strout(encoding);
}
}
cprintf(" ");
- cprintf("%ld ", length); /* bytes */
- cprintf("NIL) "); /* lines */
+ /* The next field is the size of the part in bytes. */
+ cprintf("%ld ", (long)length); /* bytes */
+
+ /* The next field is the number of lines in the part, if and only
+ * if the part is TEXT. Crispin is a fscking idiot.
+ */
+ if (!strcasecmp(cbmaintype, "TEXT")) {
+ if (length) for (i=0; i<length; ++i) {
+ if (((char *)content)[i] == '\n') ++lines;
+ }
+ cprintf("%d ", lines);
+ }
+
+ /* More of Crispin being a fscking idiot */
+ 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.
+ */
+ }
+
+ /* MD5 value of body part; we can get away with NIL'ing this */
+ cprintf("NIL ");
+
+ /* Disposition */
+ if (disp == NULL) {
+ cprintf("NIL");
+ }
+ else if (strlen(disp) == 0) {
+ cprintf("NIL");
+ }
+ else {
+ cprintf("(");
+ imap_strout(disp);
+ if (filename != NULL) if (strlen(filename)>0) {
+ cprintf(" (\"FILENAME\" ");
+ imap_strout(filename);
+ cprintf(")");
+ }
+ cprintf(")");
+ }
+
+ /* Body language (not defined yet) */
+ cprintf(" NIL)");
}
FILE *tmp;
char buf[1024];
long lines = 0L;
- long bytes = 0L;
+ long start_of_body = 0L;
+ long body_bytes = 0L;
/* For non-RFC822 (ordinary Citadel) messages, this is short and
* sweet...
CtdlRedirectOutput(NULL, -1);
rewind(tmp);
- while (fgets(buf, sizeof buf, tmp) != NULL) ++lines;
- bytes = ftell(tmp);
+ while (fgets(buf, sizeof buf, tmp) != NULL) {
+ ++lines;
+ if ((!strcmp(buf, "\r\n")) && (start_of_body == 0L)) {
+ start_of_body = ftell(tmp);
+ }
+ }
+ body_bytes = ftell(tmp) - start_of_body;
fclose(tmp);
cprintf("BODYSTRUCTURE (\"TEXT\" \"PLAIN\" "
"(\"CHARSET\" \"US-ASCII\") NIL NIL "
- "\"7BIT\" %ld %ld)", bytes, lines);
+ "\"7BIT\" %ld %ld)", body_bytes, lines);
return;
}
*imap_fetch_bodystructure_pre, /* pre-multi */
*imap_fetch_bodystructure_post, /* post-multi */
NULL,
- 0);
+ 1); /* don't decode -- we want it as-is */
}
/*
- * imap_do_fetch() calls imap_do_fetch_msg() to output the deta of an
+ * imap_do_fetch() calls imap_do_fetch_msg() to output the data of an
* individual message, once it has been successfully loaded from disk.
*/
void imap_do_fetch_msg(int seq, struct CtdlMessage *msg,
extract_token(lostr, setstr, 0, ':');
if (num_tokens(setstr, ':') >= 2) {
extract_token(histr, setstr, 1, ':');
- if (!strcmp(histr, "*")) sprintf(histr, "%d", INT_MAX);
+ if (!strcmp(histr, "*")) snprintf(histr, sizeof histr, "%d", INT_MAX);
}
else {
strcpy(histr, lostr);
projects / citadel.git / blobdiff