X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=69d7d2621049ac1d42deb37f782636e9902d4a0a;hb=ff2776640a4e85e1ffac9270800a11409c721d5d;hp=98dbafc2714bd5275acc4754d20c546036254e6d;hpb=29a51c8f1017be11c4d0c9e63104ae7300459eea;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 98dbafc27..69d7d2621 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -5,10 +5,6 @@ * */ -#ifdef DLL_EXPORT -#define IN_LIBCIT -#endif - #include "sysdep.h" #include #include @@ -44,20 +40,20 @@ #include "room_ops.h" #include "user_ops.h" #include "file_ops.h" +#include "config.h" #include "control.h" #include "tools.h" #include "mime_parser.h" #include "html.h" #include "genstamp.h" #include "internet_addressing.h" +#include "serv_fulltext.h" +#include "vcard.h" +#include "euidindex.h" +#include "journaling.h" -#define desired_section ((char *)CtdlGetUserData(SYM_DESIRED_SECTION)) -#define ma ((struct ma_info *)CtdlGetUserData(SYM_MA_INFO)) -#define msg_repl ((struct repl *)CtdlGetUserData(SYM_REPL)) - -extern struct config config; long config_msgnum; - +struct addresses_to_be_filed *atbf = NULL; /* * This really belongs in serv_network.c, but I don't know how to export @@ -87,7 +83,8 @@ char *msgkeys[] = { NULL, "hnod", "msgn", - NULL, NULL, NULL, + "jrnl", + NULL, NULL, "text", "node", "room", @@ -100,7 +97,7 @@ char *msgkeys[] = { NULL, NULL, NULL, - NULL, + "cccc", NULL }; @@ -138,14 +135,21 @@ int alias(char *name) char *ignetcfg = NULL; char *ignetmap = NULL; int at = 0; - char node[SIZ]; - char testnode[SIZ]; + char node[64]; + char testnode[64]; char buf[SIZ]; striplt(name); remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); + stripallbut(name, '<', '>'); - fp = fopen("network/mail.aliases", "r"); + fp = fopen( +#ifndef HAVE_ETG_DIR + "network/" +#else + ETC_DIR +#endif + "mail.aliases", "r"); if (fp == NULL) { fp = fopen("/dev/null", "r"); } @@ -171,7 +175,7 @@ int alias(char *name) fclose(fp); /* Hit the Global Address Book */ - if (CtdlDirectoryLookup(aaa, name) == 0) { + if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) { strcpy(name, aaa); } @@ -194,7 +198,7 @@ int alias(char *name) remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); /* figure out the delivery mode */ - extract_token(node, name, 1, '@'); + extract_token(node, name, 1, '@', sizeof node); /* If there are one or more dots in the nodename, we assume that it * is an FQDN and will attempt SMTP delivery to the Internet. @@ -208,8 +212,8 @@ int alias(char *name) */ ignetcfg = CtdlGetSysConfig(IGNETCFG); for (i=0; icm_fields['T'] ? msg->cm_fields['T'] : "0"), + (msg->cm_fields['A'] ? msg->cm_fields['A'] : ""), + (msg->cm_fields['N'] ? msg->cm_fields['N'] : ""), + (msg->cm_fields['F'] ? msg->cm_fields['F'] : ""), + (msg->cm_fields['U'] ? msg->cm_fields['U'] : "") + ); + CtdlFreeMessage(msg); +} + + + /* Determine if a given message matches the fields in a message template. * Return 0 for a successful match. */ @@ -309,78 +347,140 @@ void CtdlGetSeen(char *buf, int which_set) { /* * Manipulate the "seen msgs" string (or other message set strings) */ -void CtdlSetSeen(long target_msgnum, int target_setting, int which_set) { - char newseen[SIZ]; +void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, + int target_setting, int which_set, + struct ctdluser *which_user, struct ctdlroom *which_room) { struct cdbdata *cdbfr; - int i; + int i, j, k; int is_seen = 0; - int was_seen = 1; + int was_seen = 0; long lo = (-1L); long hi = (-1L); + long t = (-1L); + int trimming = 0; struct visit vbuf; long *msglist; int num_msgs = 0; char vset[SIZ]; + char *is_set; /* actually an array of booleans */ + int num_sets; + int s; + char setstr[SIZ], lostr[SIZ], histr[SIZ]; + size_t tmp; - lprintf(CTDL_DEBUG, "CtdlSetSeen(%ld, %d, %d)\n", - target_msgnum, target_setting, which_set); + lprintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %d, %d)\n", + num_target_msgnums, target_msgnums[0], + target_setting, which_set); /* Learn about the user and room in question */ - CtdlGetRelationship(&vbuf, &CC->user, &CC->room); + CtdlGetRelationship(&vbuf, + ((which_user != NULL) ? which_user : &CC->user), + ((which_room != NULL) ? which_room : &CC->room) + ); /* Load the message list */ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); if (cdbfr != NULL) { - msglist = malloc(cdbfr->len); - memcpy(msglist, cdbfr->ptr, cdbfr->len); + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlSetSeen() now owns this memory */ num_msgs = cdbfr->len / sizeof(long); cdb_free(cdbfr); } else { return; /* No messages at all? No further action. */ } + is_set = malloc(num_msgs * sizeof(char)); + memset(is_set, 0, (num_msgs * sizeof(char)) ); + /* Decide which message set we're manipulating */ - if (which_set == ctdlsetseen_seen) strcpy(vset, vbuf.v_seen); - if (which_set == ctdlsetseen_answered) strcpy(vset, vbuf.v_answered); + switch(which_set) { + case ctdlsetseen_seen: + safestrncpy(vset, vbuf.v_seen, sizeof vset); + break; + case ctdlsetseen_answered: + safestrncpy(vset, vbuf.v_answered, sizeof vset); + break; + } - lprintf(CTDL_DEBUG, "before optimize: %s\n", vset); - strcpy(newseen, ""); + /* lprintf(CTDL_DEBUG, "before optimize: %s\n", vset); */ - for (i=0; i= 2) { + extract_token(histr, setstr, 1, ':', sizeof histr); + if (!strcmp(histr, "*")) { + snprintf(histr, sizeof histr, "%ld", LONG_MAX); + } } else { - if (is_msg_in_mset(vset, msglist[i])) { - is_seen = 1; + strcpy(histr, lostr); + } + lo = atol(lostr); + hi = atol(histr); + + for (i = 0; i < num_msgs; ++i) { + if ((msglist[i] >= lo) && (msglist[i] <= hi)) { + is_set[i] = 1; + } + } + } + + /* Now translate the array of booleans back into a sequence set */ + strcpy(vset, ""); + lo = (-1L); + hi = (-1L); + + for (i=0; i SIZ) { - strcpy(newseen, &newseen[20]); - newseen[0] = '*'; + /* begin trim-o-matic code */ + j=9; + trimming = 0; + while ( (strlen(vset) + 20) > sizeof vset) { + remove_token(vset, 0, ','); + trimming = 1; + if (j--) break; /* loop no more than 9 times */ + } + if ( (trimming) && (which_set == ctdlsetseen_seen) ) { + t = atol(vset); + if (t<2) t=2; + --t; + snprintf(lostr, sizeof lostr, + "1:%ld,%s", t, vset); + safestrncpy(vset, lostr, sizeof vset); } - tmp = strlen(newseen); + /* end trim-o-matic code */ + + tmp = strlen(vset); if (tmp > 0) { - strcat(newseen, ","); - tmp++; + strcat(vset, ","); + ++tmp; } if (lo == hi) { - snprintf(&newseen[tmp], sizeof newseen - tmp, + snprintf(&vset[tmp], (sizeof vset) - tmp, "%ld", lo); } else { - snprintf(&newseen[tmp], sizeof newseen - tmp, + snprintf(&vset[tmp], (sizeof vset) - tmp, "%ld:%ld", lo, hi); } lo = (-1L); @@ -390,12 +490,23 @@ void CtdlSetSeen(long target_msgnum, int target_setting, int which_set) { } /* Decide which message set we're manipulating */ - if (which_set == ctdlsetseen_seen) strcpy(vbuf.v_seen, newseen); - if (which_set == ctdlsetseen_answered) strcpy(vbuf.v_answered, newseen); + switch (which_set) { + case ctdlsetseen_seen: + safestrncpy(vbuf.v_seen, vset, sizeof vbuf.v_seen); + break; + case ctdlsetseen_answered: + safestrncpy(vbuf.v_answered, vset, + sizeof vbuf.v_answered); + break; + } + free(is_set); - lprintf(CTDL_DEBUG, " after optimize: %s\n", newseen); + /* lprintf(CTDL_DEBUG, " after optimize: %s\n", vset); */ free(msglist); - CtdlSetRelationship(&vbuf, &CC->user, &CC->room); + CtdlSetRelationship(&vbuf, + ((which_user != NULL) ? which_user : &CC->user), + ((which_room != NULL) ? which_room : &CC->room) + ); } @@ -419,7 +530,7 @@ int CtdlForEachMessage(int mode, long ref, long thismsg; struct MetaData smi; struct CtdlMessage *msg; - int is_seen; + int is_seen = 0; long lastold = 0L; int printed_lastold = 0; @@ -431,8 +542,8 @@ int CtdlForEachMessage(int mode, long ref, /* Load the message list */ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); if (cdbfr != NULL) { - msglist = malloc(cdbfr->len); - memcpy(msglist, cdbfr->ptr, cdbfr->len); + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlForEachMessage() now owns this memory */ num_msgs = cdbfr->len / sizeof(long); cdb_free(cdbfr); } else { @@ -494,8 +605,14 @@ int CtdlForEachMessage(int mode, long ref, if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) { thismsg = msglist[a]; - is_seen = is_msg_in_mset(vbuf.v_seen, thismsg); - if (is_seen) lastold = thismsg; + if (mode == MSGS_ALL) { + is_seen = 0; + } + else { + is_seen = is_msg_in_sequence_set( + vbuf.v_seen, thismsg); + if (is_seen) lastold = thismsg; + } if ((thismsg > 0L) && ( @@ -526,23 +643,25 @@ int CtdlForEachMessage(int mode, long ref, /* * cmd_msgs() - get list of message #'s in this room - * implements the MSGS server command using CtdlForEachMessage() + * implements the MSGS server command using CtdlForEachMessage() */ void cmd_msgs(char *cmdbuf) { int mode = 0; - char which[SIZ]; - char buf[SIZ]; - char tfield[SIZ]; - char tvalue[SIZ]; + char which[16]; + char buf[256]; + char tfield[256]; + char tvalue[256]; int cm_ref = 0; int i; int with_template = 0; struct CtdlMessage *template = NULL; + int with_headers = 0; - extract(which, cmdbuf, 0); + extract_token(which, cmdbuf, 0, '|', sizeof which); cm_ref = extract_int(cmdbuf, 1); with_template = extract_int(cmdbuf, 2); + with_headers = extract_int(cmdbuf, 3); mode = MSGS_ALL; strcat(which, " "); @@ -569,9 +688,9 @@ void cmd_msgs(char *cmdbuf) template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); memset(template, 0, sizeof(struct CtdlMessage)); - while(client_gets(buf), strcmp(buf,"000")) { - extract(tfield, buf, 0); - extract(tvalue, buf, 1); + while(client_getln(buf, sizeof buf), strcmp(buf,"000")) { + extract_token(tfield, buf, 0, '|', sizeof tfield); + extract_token(tvalue, buf, 1, '|', sizeof tvalue); for (i='A'; i<='Z'; ++i) if (msgkeys[i]!=NULL) { if (!strcasecmp(tfield, msgkeys[i])) { template->cm_fields[i] = @@ -582,11 +701,16 @@ void cmd_msgs(char *cmdbuf) buffer_output(); } else { - cprintf("%d Message list...\n", LISTING_FOLLOWS); + cprintf("%d \n", LISTING_FOLLOWS); } - CtdlForEachMessage(mode, cm_ref, - NULL, template, simple_listing, NULL); + CtdlForEachMessage(mode, + cm_ref, + NULL, + template, + (with_headers ? headers_listing : simple_listing), + NULL + ); if (template != NULL) CtdlFreeMessage(template); cprintf("000\n"); } @@ -624,17 +748,17 @@ void do_help_subst(char *buffer) help_subst(buffer, "^variantname", CITADEL); snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions); help_subst(buffer, "^maxsessions", buf2); - help_subst(buffer, "^bbsdir", BBSDIR); + help_subst(buffer, "^bbsdir", CTDLDIR); } /* * memfmout() - Citadel text formatter and paginator. - * Although the original purpose of this routine was to format - * text to the reader's screen width, all we're really using it - * for here is to format text out to 80 columns before sending it - * to the client. The client software may reformat it again. + * Although the original purpose of this routine was to format + * text to the reader's screen width, all we're really using it + * for here is to format text out to 80 columns before sending it + * to the client. The client software may reformat it again. */ void memfmout( int width, /* screen width to use */ @@ -721,32 +845,53 @@ void memfmout( * Callback function for mime parser that simply lists the part */ void list_this_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) { - - cprintf("part=%s|%s|%s|%s|%s|%ld\n", - name, filename, partnum, disp, cbtype, (long)length); + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; + if (ma->is_ma == 0) { + cprintf("part=%s|%s|%s|%s|%s|%ld\n", + name, filename, partnum, disp, cbtype, (long)length); + } } /* * Callback function for multipart prefix */ void list_this_pref(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) { - cprintf("pref=%s|%s\n", partnum, cbtype); + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; + if (!strcasecmp(cbtype, "multipart/alternative")) { + ++ma->is_ma; + } + + if (ma->is_ma == 0) { + cprintf("pref=%s|%s\n", partnum, cbtype); + } } /* * Callback function for multipart sufffix */ void list_this_suff(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) { - cprintf("suff=%s|%s\n", partnum, cbtype); + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; + if (ma->is_ma == 0) { + cprintf("suff=%s|%s\n", partnum, cbtype); + } + if (!strcasecmp(cbtype, "multipart/alternative")) { + --ma->is_ma; + } } @@ -754,8 +899,8 @@ void list_this_suff(char *name, char *filename, char *partnum, char *disp, * Callback function for mime parser that opens a section for downloading */ void mime_download(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { /* Silently go away if there's already a download open... */ @@ -763,7 +908,7 @@ void mime_download(char *name, char *filename, char *partnum, char *disp, return; /* ...or if this is not the desired section */ - if (strcasecmp(desired_section, partnum)) + if (strcasecmp(CC->download_desired_section, partnum)) return; CC->download_fp = tmpfile(); @@ -791,9 +936,9 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) struct cdbdata *dmsgtext; struct CtdlMessage *ret = NULL; char *mptr; + char *upper_bound; cit_uint8_t ch; cit_uint8_t field_header; - size_t field_length; lprintf(CTDL_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); @@ -802,6 +947,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) return NULL; } mptr = dmsgtext->ptr; + upper_bound = mptr + dmsgtext->len; /* Parse the three bytes that begin EVERY message on disk. * The first is always 0xFF, the on-disk magic number. @@ -829,16 +975,15 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) * have just processed the 'M' (message text) field. */ do { - field_length = strlen(mptr); - if (field_length == 0) + if (mptr >= upper_bound) { break; + } field_header = *mptr++; - ret->cm_fields[field_header] = malloc(field_length + 1); - strcpy(ret->cm_fields[field_header], mptr); + ret->cm_fields[field_header] = strdup(mptr); while (*mptr++ != 0); /* advance to next field */ - } while ((field_length > 0) && (field_header != 'M')); + } while ((mptr < upper_bound) && (field_header != 'M')); cdb_free(dmsgtext); @@ -913,79 +1058,98 @@ void CtdlFreeMessage(struct CtdlMessage *msg) * */ void fixed_output_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) { - lprintf(CTDL_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype); - if (!strcasecmp(cbtype, "multipart/alternative")) { - ++ma->is_ma; - ma->did_print = 0; - return; - } + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; + lprintf(CTDL_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype); + if (!strcasecmp(cbtype, "multipart/alternative")) { + ++ma->is_ma; + ma->did_print = 0; + } + if (!strcasecmp(cbtype, "message/rfc822")) { + ++ma->freeze; + } } /* * Post callback function for multipart/alternative */ void fixed_output_post(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { - lprintf(CTDL_DEBUG, "fixed_output_post() type=<%s>\n", cbtype); - if (!strcasecmp(cbtype, "multipart/alternative")) { - --ma->is_ma; - ma->did_print = 0; - return; - } + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; + lprintf(CTDL_DEBUG, "fixed_output_post() type=<%s>\n", cbtype); + if (!strcasecmp(cbtype, "multipart/alternative")) { + --ma->is_ma; + ma->did_print = 0; + } + if (!strcasecmp(cbtype, "message/rfc822")) { + --ma->freeze; + } } /* * Inline callback function for mime parser that wants to display text */ void fixed_output(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, size_t length, char *encoding, - void *cbuserdata) - { - char *ptr; - char *wptr; - size_t wlen; - - lprintf(CTDL_DEBUG, "fixed_output() type=<%s>\n", cbtype); - - /* - * If we're in the middle of a multipart/alternative scope and - * we've already printed another section, skip this one. - */ - if ( (ma->is_ma == 1) && (ma->did_print == 1) ) { - lprintf(CTDL_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype); - return; - } - ma->did_print = 1; - - if ( (!strcasecmp(cbtype, "text/plain")) - || (strlen(cbtype)==0) ) { - wptr = content; - if (length > 0) { - client_write(wptr, length); - if (wptr[length-1] != '\n') { - cprintf("\n"); - } - } - } - else if (!strcasecmp(cbtype, "text/html")) { - ptr = html_to_ascii(content, 80, 0); - wlen = strlen(ptr); - client_write(ptr, wlen); - if (ptr[wlen-1] != '\n') { + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) +{ + char *ptr; + char *wptr; + size_t wlen; + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; + + lprintf(CTDL_DEBUG, + "fixed_output() part %s: %s (%s) (%ld bytes)\n", + partnum, filename, cbtype, (long)length); + + /* + * If we're in the middle of a multipart/alternative scope and + * we've already printed another section, skip this one. + */ + if ( (ma->is_ma) && (ma->did_print) ) { + lprintf(CTDL_DEBUG, "Skipping part %s (%s)\n", + partnum, cbtype); + return; + } + ma->did_print = 1; + + if ( (!strcasecmp(cbtype, "text/plain")) + || (strlen(cbtype)==0) ) { + wptr = content; + if (length > 0) { + client_write(wptr, length); + if (wptr[length-1] != '\n') { cprintf("\n"); } - free(ptr); } - else if (strncasecmp(cbtype, "multipart/", 10)) { - cprintf("Part %s: %s (%s) (%ld bytes)\r\n", - partnum, filename, cbtype, (long)length); + } + else if (!strcasecmp(cbtype, "text/html")) { + ptr = html_to_ascii(content, length, 80, 0); + wlen = strlen(ptr); + client_write(ptr, wlen); + if (ptr[wlen-1] != '\n') { + cprintf("\n"); } + free(ptr); + } + else if (PerformFixedOutputHooks(cbtype, content, length)) { + /* above function returns nonzero if it handled the part */ + } + else if (strncasecmp(cbtype, "multipart/", 10)) { + cprintf("Part %s: %s (%s) (%ld bytes)\r\n", + partnum, filename, cbtype, (long)length); } +} /* * The client is elegant and sophisticated and wants to be choosy about @@ -993,17 +1157,20 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp, * we're going to send. */ void choose_preferred(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { - char buf[SIZ]; + char buf[1024]; int i; + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; if (ma->is_ma > 0) { for (i=0; ipreferred_formats, '|'); ++i) { - extract(buf, CC->preferred_formats, i); - if (!strcasecmp(buf, cbtype)) { - strcpy(ma->chosen_part, partnum); + extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); + if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) { + safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part); } } } @@ -1013,13 +1180,16 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, * Now that we've chosen our preferred part, output it. */ void output_preferred(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { int i; - char buf[SIZ]; + char buf[128]; int add_newline = 0; char *text_content; + struct ma_info *ma; + + ma = (struct ma_info *)cbuserdata; /* This is not the MIME part you're looking for... */ if (strcasecmp(partnum, ma->chosen_part)) return; @@ -1028,7 +1198,7 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, * list, we can simply output it verbatim. */ for (i=0; ipreferred_formats, '|'); ++i) { - extract(buf, CC->preferred_formats, i); + extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); if (!strcasecmp(buf, cbtype)) { /* Yeah! Go! W00t!! */ @@ -1037,8 +1207,11 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, ++add_newline; } - cprintf("Content-type: %s\n", cbtype); - cprintf("Content-length: %d\n", + cprintf("Content-type: %s", cbtype); + if (strlen(cbcharset) > 0) { + cprintf("; charset=%s", cbcharset); + } + cprintf("\nContent-length: %d\n", (int)(length + add_newline) ); if (strlen(encoding) > 0) { cprintf("Content-transfer-encoding: %s\n", encoding); @@ -1055,11 +1228,42 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, /* No translations required or possible: output as text/plain */ cprintf("Content-type: text/plain\n\n"); - fixed_output(name, filename, partnum, disp, content, cbtype, + fixed_output(name, filename, partnum, disp, content, cbtype, cbcharset, length, encoding, cbuserdata); } +struct encapmsg { + char desired_section[64]; + char *msg; + size_t msglen; +}; + + +/* + * Callback function for + */ +void extract_encapsulated_message(char *name, char *filename, char *partnum, char *disp, + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) +{ + struct encapmsg *encap; + + encap = (struct encapmsg *)cbuserdata; + + /* Only proceed if this is the desired section... */ + if (!strcasecmp(encap->desired_section, partnum)) { + encap->msglen = length; + encap->msg = malloc(length + 2); + memcpy(encap->msg, content, length); + return; + } + +} + + + + /* * Get a message off disk. (returns om_* values found in msgbase.h) * @@ -1068,13 +1272,17 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ int mode, /* how would you like that message? */ int headers_only, /* eschew the message body? */ int do_proto, /* do Citadel protocol responses? */ - int crlf /* Use CRLF newlines instead of LF? */ + int crlf, /* Use CRLF newlines instead of LF? */ + char *section /* NULL or a message/rfc822 section */ ) { struct CtdlMessage *TheMessage = NULL; int retcode = om_no_such_msg; + struct encapmsg encap; - lprintf(CTDL_DEBUG, "CtdlOutputMsg() msgnum=%ld, mode=%d\n", - msg_num, mode); + lprintf(CTDL_DEBUG, "CtdlOutputMsg() msgnum=%ld, mode=%d, section=%s\n", + msg_num, mode, + (section ? section : "<>") + ); if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { if (do_proto) cprintf("%d Not logged in.\n", @@ -1085,11 +1293,11 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ /* FIXME: check message id against msglist for this room */ /* - * Fetch the message from disk. If we're in sooper-fast headers + * Fetch the message from disk. If we're in any sort of headers * only mode, request that we don't even bother loading the body * into memory. */ - if (headers_only == HEADERS_FAST) { + if ( (headers_only == HEADERS_FAST) || (headers_only == HEADERS_ONLY) ) { TheMessage = CtdlFetchMessage(msg_num, 0); } else { @@ -1101,11 +1309,45 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ ERROR + MESSAGE_NOT_FOUND, msg_num); return(om_no_such_msg); } - - retcode = CtdlOutputPreLoadedMsg( - TheMessage, msg_num, mode, - headers_only, do_proto, crlf); + /* Here is the weird form of this command, to process only an + * encapsulated message/rfc822 section. + */ + if (section) if (strlen(section)>0) if (strcmp(section, "0")) { + memset(&encap, 0, sizeof encap); + safestrncpy(encap.desired_section, section, sizeof encap.desired_section); + mime_parser(TheMessage->cm_fields['M'], + NULL, + *extract_encapsulated_message, + NULL, NULL, (void *)&encap, 0 + ); + CtdlFreeMessage(TheMessage); + TheMessage = NULL; + + if (encap.msg) { + encap.msg[encap.msglen] = 0; + TheMessage = convert_internet_message(encap.msg); + encap.msg = NULL; /* no free() here, TheMessage owns it now */ + + /* Now we let it fall through to the bottom of this + * function, because TheMessage now contains the + * encapsulated message instead of the top-level + * message. Isn't that neat? + */ + + } + else { + if (do_proto) cprintf("%d msg %ld has no part %s\n", + ERROR + MESSAGE_NOT_FOUND, msg_num, section); + retcode = om_no_such_msg; + } + + } + + /* Ok, output the message now */ + retcode = CtdlOutputPreLoadedMsg( + TheMessage, mode, + headers_only, do_proto, crlf); CtdlFreeMessage(TheMessage); return(retcode); @@ -1118,7 +1360,6 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ */ int CtdlOutputPreLoadedMsg( struct CtdlMessage *TheMessage, - long msg_num, int mode, /* how would you like that message? */ int headers_only, /* eschew the message body? */ int do_proto, /* do Citadel protocol responses? */ @@ -1127,29 +1368,31 @@ int CtdlOutputPreLoadedMsg( int i, k; char buf[SIZ]; cit_uint8_t ch; - char allkeys[SIZ]; - char display_name[SIZ]; + char allkeys[30]; + char display_name[256]; char *mptr; char *nl; /* newline string */ int suppress_f = 0; int subject_found = 0; + struct ma_info ma; - /* buffers needed for RFC822 translation */ - char suser[SIZ]; - char luser[SIZ]; - char fuser[SIZ]; - char snode[SIZ]; - char lnode[SIZ]; - char mid[SIZ]; - char datestamp[SIZ]; - /* */ - - lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %ld, %d, %d, %d, %d\n", + /* Buffers needed for RFC822 translation. These are all filled + * using functions that are bounds-checked, and therefore we can + * make them substantially smaller than SIZ. + */ + char suser[100]; + char luser[100]; + char fuser[100]; + char snode[100]; + char lnode[100]; + char mid[100]; + char datestamp[100]; + + lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n", ((TheMessage == NULL) ? "NULL" : "not null"), - msg_num, mode, headers_only, do_proto, crlf); - snprintf(mid, sizeof mid, "%ld", msg_num); + strcpy(mid, "unknown"); nl = (crlf ? "\r\n" : "\n"); if (!is_valid_message(TheMessage)) { @@ -1171,9 +1414,7 @@ int CtdlOutputPreLoadedMsg( } else { /* Parse the message text component */ mptr = TheMessage->cm_fields['M']; - mime_parser(mptr, NULL, - *mime_download, NULL, NULL, - NULL, 0); + mime_parser(mptr, NULL, *mime_download, NULL, NULL, NULL, 0); /* If there's no file open by this time, the requested * section wasn't found, so print an error */ @@ -1181,14 +1422,14 @@ int CtdlOutputPreLoadedMsg( if (do_proto) cprintf( "%d Section %s not found.\n", ERROR + FILE_NOT_FOUND, - desired_section); + CC->download_desired_section); } } return((CC->download_fp != NULL) ? om_ok : om_mime_error); } /* now for the user-mode message reading loops */ - if (do_proto) cprintf("%d Message %ld:\n", LISTING_FOLLOWS, msg_num); + if (do_proto) cprintf("%d msg:\n", LISTING_FOLLOWS); /* Does the caller want to skip the headers? */ if (headers_only == HEADERS_NONE) goto START_TEXT; @@ -1200,7 +1441,7 @@ int CtdlOutputPreLoadedMsg( /* nhdr=yes means that we're only displaying headers, no body */ if ( (TheMessage->cm_anon_type == MES_ANONONLY) - && (mode == MT_CITADEL) + && (mode == MT_CITADEL) && (do_proto) ) { cprintf("nhdr=yes\n"); @@ -1210,17 +1451,17 @@ int CtdlOutputPreLoadedMsg( if ((mode == MT_CITADEL) || (mode == MT_MIME)) { - strcpy(display_name, ""); + safestrncpy(display_name, "", sizeof display_name); if (TheMessage->cm_fields['A']) { strcpy(buf, TheMessage->cm_fields['A']); if (TheMessage->cm_anon_type == MES_ANONONLY) { - strcpy(display_name, "****"); + safestrncpy(display_name, "****", sizeof display_name); } else if (TheMessage->cm_anon_type == MES_ANONOPT) { - strcpy(display_name, "anonymous"); + safestrncpy(display_name, "anonymous", sizeof display_name); } else { - strcpy(display_name, buf); + safestrncpy(display_name, buf, sizeof display_name); } if ((is_room_aide()) && ((TheMessage->cm_anon_type == MES_ANONONLY) @@ -1243,7 +1484,7 @@ int CtdlOutputPreLoadedMsg( } /* Now spew the header fields in the order we like them. */ - strcpy(allkeys, FORDER); + safestrncpy(allkeys, FORDER, sizeof allkeys); for (i=0; i%s", nl); if (!is_room_aide() && (TheMessage->cm_anon_type == MES_ANONONLY)) { - cprintf("From: x@x.org (----)%s", nl); + cprintf("From: \"----\" %s", nl); } else if (!is_room_aide() && (TheMessage->cm_anon_type == MES_ANONOPT)) { - cprintf("From: x@x.org (anonymous)%s", nl); + cprintf("From: \"anonymous\" %s", nl); } else if (strlen(fuser) > 0) { - cprintf("From: %s (%s)%s", fuser, luser, nl); + cprintf("From: \"%s\" <%s>%s", luser, fuser, nl); } else { - cprintf("From: %s@%s (%s)%s", suser, snode, luser, nl); + cprintf("From: \"%s\" <%s@%s>%s", luser, suser, snode, nl); } cprintf("Organization: %s%s", lnode, nl); @@ -1361,53 +1605,44 @@ START_TEXT: /* Tell the client about the MIME parts in this message */ if (TheMessage->cm_format_type == FMT_RFC822) { if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) { + memset(&ma, 0, sizeof(struct ma_info)); mime_parser(mptr, NULL, - *list_this_part, - *list_this_pref, - *list_this_suff, - NULL, 0); + (do_proto ? *list_this_part : NULL), + (do_proto ? *list_this_pref : NULL), + (do_proto ? *list_this_suff : NULL), + (void *)&ma, 0); } else if (mode == MT_RFC822) { /* unparsed RFC822 dump */ - /* FIXME ... we have to put some code in here to avoid - * printing duplicate header information when both - * Citadel and RFC822 headers exist. Preference should - * probably be given to the RFC822 headers. - */ - int done_rfc822_hdrs = 0; - while (ch=*(mptr++), ch!=0) { + char *start_of_text = NULL; + start_of_text = strstr(mptr, "\n\r\n"); + if (start_of_text == NULL) start_of_text = strstr(mptr, "\n\n"); + if (start_of_text == NULL) start_of_text = mptr; + ++start_of_text; + start_of_text = strstr(start_of_text, "\n"); + ++start_of_text; + while (ch=*mptr, ch!=0) { if (ch==13) { /* do nothing */ } - else if (ch==10) { - if (!done_rfc822_hdrs) { - if (headers_only != HEADERS_NONE) { - cprintf("%s", nl); + else switch(headers_only) { + case HEADERS_NONE: + if (mptr >= start_of_text) { + if (ch == 10) cprintf("%s", nl); + else cprintf("%c", ch); } - } - else { - if (headers_only != HEADERS_ONLY) { - cprintf("%s", nl); + break; + case HEADERS_ONLY: + if (mptr < start_of_text) { + if (ch == 10) cprintf("%s", nl); + else cprintf("%c", ch); } - } - if ((*(mptr) == 13) || (*(mptr) == 10)) { - done_rfc822_hdrs = 1; - } - } - else { - if (done_rfc822_hdrs) { - if (headers_only != HEADERS_NONE) { - cprintf("%c", ch); - } - } - else { - if (headers_only != HEADERS_ONLY) { - cprintf("%c", ch); - } - } - if ((*mptr == 13) || (*mptr == 10)) { - done_rfc822_hdrs = 1; - } + break; + default: + if (ch == 10) cprintf("%s", nl); + else cprintf("%c", ch); + break; } + ++mptr; } goto DONE; } @@ -1466,22 +1701,22 @@ START_TEXT: * we use will display those parts as-is. */ if (TheMessage->cm_format_type == FMT_RFC822) { - CtdlAllocUserData(SYM_MA_INFO, sizeof(struct ma_info)); - memset(ma, 0, sizeof(struct ma_info)); + memset(&ma, 0, sizeof(struct ma_info)); if (mode == MT_MIME) { - strcpy(ma->chosen_part, "1"); + strcpy(ma.chosen_part, "1"); mime_parser(mptr, NULL, *choose_preferred, *fixed_output_pre, - *fixed_output_post, NULL, 0); + *fixed_output_post, (void *)&ma, 0); mime_parser(mptr, NULL, - *output_preferred, NULL, NULL, NULL, 0); + *output_preferred, NULL, NULL, (void *)&ma, 0); } else { mime_parser(mptr, NULL, *fixed_output, *fixed_output_pre, - *fixed_output_post, NULL, 0); + *fixed_output_post, (void *)&ma, 0); } + } DONE: /* now we're done */ @@ -1502,7 +1737,7 @@ void cmd_msg0(char *cmdbuf) msgid = extract_long(cmdbuf, 0); headers_only = extract_int(cmdbuf, 1); - CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0); + CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0, NULL); return; } @@ -1518,7 +1753,7 @@ void cmd_msg2(char *cmdbuf) msgid = extract_long(cmdbuf, 0); headers_only = extract_int(cmdbuf, 1); - CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1); + CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL); } @@ -1568,9 +1803,11 @@ void cmd_msg3(char *cmdbuf) void cmd_msg4(char *cmdbuf) { long msgid; + char section[64]; msgid = extract_long(cmdbuf, 0); - CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0); + extract_token(section, cmdbuf, 1, '|', sizeof section); + CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0, (section[0] ? section : NULL) ); } @@ -1592,13 +1829,13 @@ void cmd_msgp(char *cmdbuf) void cmd_opna(char *cmdbuf) { long msgid; - - CtdlAllocUserData(SYM_DESIRED_SECTION, SIZ); + char desired_section[128]; msgid = extract_long(cmdbuf, 0); - extract(desired_section, cmdbuf, 1); - - CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1); + extract_token(desired_section, cmdbuf, 1, '|', sizeof desired_section); + safestrncpy(CC->download_desired_section, desired_section, + sizeof CC->download_desired_section); + CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1, NULL); } @@ -1606,121 +1843,122 @@ void cmd_opna(char *cmdbuf) * Save a message pointer into a specified room * (Returns 0 for success, nonzero for failure) * roomname may be NULL to use the current room + * + * Note that the 'supplied_msg' field may be set to NULL, in which case + * the message will be fetched from disk, by number, if we need to perform + * replication checks. This adds an additional database read, so if the + * caller already has the message in memory then it should be supplied. */ -int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) { +int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int do_repl_check, + struct CtdlMessage *supplied_msg) { int i; char hold_rm[ROOMNAMELEN]; - struct cdbdata *cdbfr; - int num_msgs; - long *msglist; - long highest_msg = 0L; + struct cdbdata *cdbfr; + int num_msgs; + long *msglist; + long highest_msg = 0L; struct CtdlMessage *msg = NULL; - lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom(%s, %ld, %d)\n", - roomname, msgid, flags); + /*lprintf(CTDL_DEBUG, + "CtdlSaveMsgPointerInRoom(room=%s, msgid=%ld, repl=%d)\n", + roomname, msgid, do_repl_check);*/ strcpy(hold_rm, CC->room.QRname); - /* We may need to check to see if this message is real */ - if ( (flags & SM_VERIFY_GOODNESS) - || (flags & SM_DO_REPL_CHECK) - ) { - msg = CtdlFetchMessage(msgid, 1); - if (msg == NULL) return(ERROR + ILLEGAL_VALUE); - } - - /* Perform replication checks if necessary */ - if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) { - - if (getroom(&CC->room, - ((roomname != NULL) ? roomname : CC->room.QRname) ) - != 0) { - lprintf(CTDL_ERR, "No such room <%s>\n", roomname); - if (msg != NULL) CtdlFreeMessage(msg); - return(ERROR + ROOM_NOT_FOUND); - } - - if (ReplicationChecks(msg) != 0) { - getroom(&CC->room, hold_rm); - if (msg != NULL) CtdlFreeMessage(msg); - lprintf(CTDL_DEBUG, - "Did replication, and newer exists\n"); - return(0); - } - } - /* Now the regular stuff */ if (lgetroom(&CC->room, ((roomname != NULL) ? roomname : CC->room.QRname) ) != 0) { lprintf(CTDL_ERR, "No such room <%s>\n", roomname); - if (msg != NULL) CtdlFreeMessage(msg); return(ERROR + ROOM_NOT_FOUND); } - cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); - if (cdbfr == NULL) { - msglist = NULL; - num_msgs = 0; - } else { - msglist = malloc(cdbfr->len); - if (msglist == NULL) - lprintf(CTDL_ALERT, "ERROR malloc msglist!\n"); - num_msgs = cdbfr->len / sizeof(long); - memcpy(msglist, cdbfr->ptr, cdbfr->len); - cdb_free(cdbfr); - } - + cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); + if (cdbfr == NULL) { + msglist = NULL; + num_msgs = 0; + } else { + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlSaveMsgPointerInRoom() now owns this memory */ + num_msgs = cdbfr->len / sizeof(long); + cdb_free(cdbfr); + } /* Make sure the message doesn't already exist in this room. It * is absolutely taboo to have more than one reference to the same * message in a room. */ - if (num_msgs > 0) for (i=0; i 0) for (i=0; iroom); /* unlock the room */ getroom(&CC->room, hold_rm); - if (msg != NULL) CtdlFreeMessage(msg); free(msglist); return(ERROR + ALREADY_EXISTS); } } - /* Now add the new message */ - ++num_msgs; - msglist = realloc(msglist, (num_msgs * sizeof(long))); + /* Now add the new message */ + ++num_msgs; + msglist = realloc(msglist, (num_msgs * sizeof(long))); - if (msglist == NULL) { - lprintf(CTDL_ALERT, "ERROR: can't realloc message list!\n"); - } - msglist[num_msgs - 1] = msgid; + if (msglist == NULL) { + lprintf(CTDL_ALERT, "ERROR: can't realloc message list!\n"); + } + msglist[num_msgs - 1] = msgid; - /* Sort the message list, so all the msgid's are in order */ - num_msgs = sort_msglist(msglist, num_msgs); + /* Sort the message list, so all the msgid's are in order */ + num_msgs = sort_msglist(msglist, num_msgs); - /* Determine the highest message number */ - highest_msg = msglist[num_msgs - 1]; + /* Determine the highest message number */ + highest_msg = msglist[num_msgs - 1]; - /* Write it back to disk. */ - cdb_store(CDB_MSGLISTS, &CC->room.QRnumber, (int)sizeof(long), - msglist, (int)(num_msgs * sizeof(long))); + /* Write it back to disk. */ + cdb_store(CDB_MSGLISTS, &CC->room.QRnumber, (int)sizeof(long), + msglist, (int)(num_msgs * sizeof(long))); - /* Free up the memory we used. */ - free(msglist); + /* Free up the memory we used. */ + free(msglist); /* Update the highest-message pointer and unlock the room. */ CC->room.QRhighest = highest_msg; lputroom(&CC->room); + + /* Perform replication checks if necessary */ + if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) { + if (supplied_msg != NULL) { + msg = supplied_msg; + } + else { + msg = CtdlFetchMessage(msgid, 0); + } + + if (msg != NULL) { + ReplicationChecks(msg); + } + + } + + /* If the message has an Exclusive ID, index that... */ + if (msg != NULL) { + if (msg->cm_fields['E'] != NULL) { + index_message_by_euid(msg->cm_fields['E'], + &CC->room, msgid); + } + } + + /* Free up the memory we may have allocated */ + if ( (msg != NULL) && (msg != supplied_msg) ) { + CtdlFreeMessage(msg); + } + + /* Go back to the room we were in before we wandered here... */ getroom(&CC->room, hold_rm); /* Bump the reference count for this message. */ - if ((flags & SM_DONT_BUMP_REF)==0) { - AdjRefCount(msgid, +1); - } + AdjRefCount(msgid, +1); /* Return success. */ - if (msg != NULL) CtdlFreeMessage(msg); - return (0); + return (0); } @@ -1736,8 +1974,8 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) { long send_message(struct CtdlMessage *msg) { long newmsgid; long retval; - char msgidbuf[SIZ]; - struct ser_ret smr; + char msgidbuf[256]; + struct ser_ret smr; int is_bigmsg = 0; char *holdM = NULL; @@ -1760,17 +1998,17 @@ long send_message(struct CtdlMessage *msg) { } /* Serialize our data structure for storage in the database */ - serialize_message(&smr, msg); + serialize_message(&smr, msg); if (is_bigmsg) { msg->cm_fields['M'] = holdM; } - if (smr.len == 0) { - cprintf("%d Unable to serialize message\n", - ERROR + INTERNAL_ERROR); - return (-1L); - } + if (smr.len == 0) { + cprintf("%d Unable to serialize message\n", + ERROR + INTERNAL_ERROR); + return (-1L); + } /* Write our little bundle of joy into the message base */ if (cdb_store(CDB_MSGMAIN, &newmsgid, (int)sizeof(long), @@ -1790,7 +2028,7 @@ long send_message(struct CtdlMessage *msg) { } /* Free the memory we used for the serialized message */ - free(smr.ser); + free(smr.ser); /* Return the *local* message ID to the caller * (even if we're storing an incoming network message) @@ -1847,75 +2085,33 @@ void serialize_message(struct ser_ret *ret, /* return values */ /* - * Back end for the ReplicationChecks() function + * Check to see if any messages already exist in the current room which + * carry the same Exclusive ID as this one. If any are found, delete them. */ -void check_repl(long msgnum, void *userdata) { - struct CtdlMessage *msg; - time_t timestamp = (-1L); +void ReplicationChecks(struct CtdlMessage *msg) { + long old_msgnum = (-1L); - lprintf(CTDL_DEBUG, "check_repl() found message %ld\n", msgnum); - msg = CtdlFetchMessage(msgnum, 1); - if (msg == NULL) return; - if (msg->cm_fields['T'] != NULL) { - timestamp = atol(msg->cm_fields['T']); - } - CtdlFreeMessage(msg); - - if (timestamp > msg_repl->highest) { - msg_repl->highest = timestamp; /* newer! */ - lprintf(CTDL_DEBUG, "newer!\n"); - return; - } - lprintf(CTDL_DEBUG, "older!\n"); - - /* Existing isn't newer? Then delete the old one(s). */ - CtdlDeleteMessages(CC->room.QRname, msgnum, ""); -} + if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return; + lprintf(CTDL_DEBUG, "Performing replication checks in <%s>\n", + CC->room.QRname); -/* - * Check to see if any messages already exist which carry the same Exclusive ID - * as this one. - * - * If any are found: - * -> With older timestamps: delete them and return 0. Message will be saved. - * -> With newer timestamps: return 1. Message save will be aborted. - */ -int ReplicationChecks(struct CtdlMessage *msg) { - struct CtdlMessage *template; - int abort_this = 0; - - lprintf(CTDL_DEBUG, "ReplicationChecks() started\n"); /* No exclusive id? Don't do anything. */ - if (msg->cm_fields['E'] == NULL) return 0; - if (strlen(msg->cm_fields['E']) == 0) return 0; - lprintf(CTDL_DEBUG, "Exclusive ID: <%s>\n", msg->cm_fields['E']); - - CtdlAllocUserData(SYM_REPL, sizeof(struct repl)); - strcpy(msg_repl->exclusive_id, msg->cm_fields['E']); - msg_repl->highest = atol(msg->cm_fields['T']); - - template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); - memset(template, 0, sizeof(struct CtdlMessage)); - template->cm_fields['E'] = strdup(msg->cm_fields['E']); - - CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl, NULL); - - /* If a newer message exists with the same Exclusive ID, abort - * this save. - */ - if (msg_repl->highest > atol(msg->cm_fields['T']) ) { - abort_this = 1; - } + if (msg == NULL) return; + if (msg->cm_fields['E'] == NULL) return; + if (strlen(msg->cm_fields['E']) == 0) return; + /*lprintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n", + msg->cm_fields['E'], CC->room.QRname);*/ - CtdlFreeMessage(template); - lprintf(CTDL_DEBUG, "ReplicationChecks() returning %d\n", abort_this); - return(abort_this); + old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CC->room); + if (old_msgnum > 0L) { + lprintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); + CtdlDeleteMessages(CC->room.QRname, old_msgnum, "", 0); + } } - /* * Save a message to disk and submit it into the delivery system. */ @@ -1923,7 +2119,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ struct recptypes *recps, /* recipients (if mail) */ char *force /* force a particular room? */ ) { - char aaa[SIZ]; + char submit_filename[128]; + char generated_timestamp[32]; char hold_rm[ROOMNAMELEN]; char actual_rm[ROOMNAMELEN]; char force_room[ROOMNAMELEN]; @@ -1940,6 +2137,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ char *instr; struct ser_ret smr; char *hold_R, *hold_D; + char *collected_addresses = NULL; + struct addresses_to_be_filed *aptr = NULL; + char *saved_rfc822_version = NULL; + int qualified_for_journaling = 0; lprintf(CTDL_DEBUG, "CtdlSubmitMsg() called\n"); if (is_valid_message(msg) == 0) return(-1); /* self check */ @@ -1948,15 +2149,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * giving it one, right now. */ if (msg->cm_fields['T'] == NULL) { - lprintf(CTDL_DEBUG, "Generating timestamp\n"); - snprintf(aaa, sizeof aaa, "%ld", (long)time(NULL)); - msg->cm_fields['T'] = strdup(aaa); + snprintf(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL)); + msg->cm_fields['T'] = strdup(generated_timestamp); } /* If this message has no path, we generate one. */ if (msg->cm_fields['P'] == NULL) { - lprintf(CTDL_DEBUG, "Generating path\n"); if (msg->cm_fields['A'] != NULL) { msg->cm_fields['P'] = strdup(msg->cm_fields['A']); for (a=0; acm_fields['P']); ++a) { @@ -1978,10 +2177,9 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Learn about what's inside, because it's what's inside that counts */ - lprintf(CTDL_DEBUG, "Learning what's inside\n"); if (msg->cm_fields['M'] == NULL) { lprintf(CTDL_ERR, "ERROR: attempt to save message with NULL body\n"); - return(-1); + return(-2); } switch (msg->cm_format_type) { @@ -1993,23 +2191,18 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ break; case 4: strcpy(content_type, "text/plain"); - /* advance past header fields */ - mptr = msg->cm_fields['M']; - a = strlen(mptr); - while ((--a) > 0) { - if (!strncasecmp(mptr, "Content-type: ", 14)) { - safestrncpy(content_type, mptr, - sizeof(content_type)); - strcpy(content_type, &content_type[14]); - for (a = 0; a < strlen(content_type); ++a) - if ((content_type[a] == ';') - || (content_type[a] == ' ') - || (content_type[a] == 13) - || (content_type[a] == 10)) - content_type[a] = 0; - break; + mptr = bmstrcasestr(msg->cm_fields['M'], "Content-type: "); + if (mptr != NULL) { + safestrncpy(content_type, &mptr[14], + sizeof content_type); + for (a = 0; a < strlen(content_type); ++a) { + if ((content_type[a] == ';') + || (content_type[a] == ' ') + || (content_type[a] == 13) + || (content_type[a] == 10)) { + content_type[a] = 0; + } } - ++mptr; } } @@ -2022,12 +2215,11 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* If the user is a twit, move to the twit room for posting */ - lprintf(CTDL_DEBUG, "Handling twit stuff: %s\n", - (CC->user.axlevel == 2) ? config.c_twitroom : "OK"); if (TWITDETECT) { if (CC->user.axlevel == 2) { strcpy(hold_rm, actual_rm); strcpy(actual_rm, config.c_twitroom); + lprintf(CTDL_DEBUG, "Diverting to twit room\n"); } } @@ -2038,7 +2230,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ lprintf(CTDL_DEBUG, "Final selection: %s\n", actual_rm); if (strcasecmp(actual_rm, CC->room.QRname)) { - getroom(&CC->room, actual_rm); + /* getroom(&CC->room, actual_rm); */ + usergoto(actual_rm, 0, 1, NULL, NULL); } /* @@ -2050,16 +2243,20 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Perform "before save" hooks (aborting if any return nonzero) */ lprintf(CTDL_DEBUG, "Performing before-save hooks\n"); - if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-1); + if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3); - /* If this message has an Exclusive ID, perform replication checks */ - lprintf(CTDL_DEBUG, "Performing replication checks\n"); - if (ReplicationChecks(msg) > 0) return(-1); + /* + * If this message has an Exclusive ID, and the room is replication + * checking enabled, then do replication checks. + */ + if (DoesThisRoomNeedEuidIndexing(&CC->room)) { + ReplicationChecks(msg); + } /* Save it to disk */ lprintf(CTDL_DEBUG, "Saving to disk\n"); newmsgid = send_message(msg); - if (newmsgid <= 0L) return(-1); + if (newmsgid <= 0L) return(-5); /* Write a supplemental message info record. This doesn't have to * be a critical section because nobody else knows about this message @@ -2069,7 +2266,33 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ memset(&smi, 0, sizeof(struct MetaData)); smi.meta_msgnum = newmsgid; smi.meta_refcount = 0; - safestrncpy(smi.meta_content_type, content_type, sizeof smi.meta_content_type); + safestrncpy(smi.meta_content_type, content_type, + sizeof smi.meta_content_type); + + /* + * Measure how big this message will be when rendered as RFC822. + * We do this for two reasons: + * 1. We need the RFC822 length for the new metadata record, so the + * POP and IMAP services don't have to calculate message lengths + * while the user is waiting (multiplied by potentially hundreds + * or thousands of messages). + * 2. If journaling is enabled, we will need an RFC822 version of the + * message to attach to the journalized copy. + */ + if (CC->redirect_buffer != NULL) { + lprintf(CTDL_ALERT, "CC->redirect_buffer is not NULL during message submission!\n"); + abort(); + } + CC->redirect_buffer = malloc(SIZ); + CC->redirect_len = 0; + CC->redirect_alloc = SIZ; + CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1); + smi.meta_rfc822_length = CC->redirect_len; + saved_rfc822_version = CC->redirect_buffer; + CC->redirect_buffer = NULL; + CC->redirect_len = 0; + CC->redirect_alloc = 0; + PutMetaData(&smi); /* Now figure out where to store the pointers */ @@ -2080,25 +2303,26 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * is no local sender; it would otherwise go to the Trashcan). */ if ((!CC->internal_pgm) || (recps == NULL)) { - if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) { + if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) { lprintf(CTDL_ERR, "ERROR saving message pointer!\n"); - CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0); + CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); } } /* For internet mail, drop a copy in the outbound queue room */ if (recps != NULL) if (recps->num_internet > 0) { - CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0); + CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0, msg); } /* If other rooms are specified, drop them there too. */ if (recps != NULL) if (recps->num_room > 0) for (i=0; irecp_room, '|'); ++i) { - extract(recipient, recps->recp_room, i); - lprintf(CTDL_DEBUG, "Delivering to local room <%s>\n", recipient); - CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0); + extract_token(recipient, recps->recp_room, i, + '|', sizeof recipient); + lprintf(CTDL_DEBUG, "Delivering to room <%s>\n", recipient); + CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg); } /* Bump this user's messages posted counter. */ @@ -2113,17 +2337,20 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (recps != NULL) if (recps->num_local > 0) for (i=0; irecp_local, '|'); ++i) { - extract(recipient, recps->recp_local, i); + extract_token(recipient, recps->recp_local, i, + '|', sizeof recipient); lprintf(CTDL_DEBUG, "Delivering private local mail to <%s>\n", recipient); if (getuser(&userbuf, recipient) == 0) { - MailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); - CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0); + MailboxName(actual_rm, sizeof actual_rm, + &userbuf, MAILROOM); + CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg); BumpNewMailCounter(userbuf.usernum); } else { lprintf(CTDL_DEBUG, "No user <%s>\n", recipient); - CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0); + CtdlSaveMsgPointerInRoom(config.c_aideroom, + newmsgid, 0, msg); } } @@ -2142,21 +2369,27 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (recps != NULL) if (recps->num_ignet > 0) for (i=0; irecp_ignet, '|'); ++i) { - extract(recipient, recps->recp_ignet, i); + extract_token(recipient, recps->recp_ignet, i, + '|', sizeof recipient); hold_R = msg->cm_fields['R']; hold_D = msg->cm_fields['D']; msg->cm_fields['R'] = malloc(SIZ); - msg->cm_fields['D'] = malloc(SIZ); - extract_token(msg->cm_fields['R'], recipient, 0, '@'); - extract_token(msg->cm_fields['D'], recipient, 1, '@'); + msg->cm_fields['D'] = malloc(128); + extract_token(msg->cm_fields['R'], recipient, 0, '@', SIZ); + extract_token(msg->cm_fields['D'], recipient, 1, '@', 128); serialize_message(&smr, msg); if (smr.len > 0) { - snprintf(aaa, sizeof aaa, - "./network/spoolin/netmail.%04lx.%04x.%04x", - (long) getpid(), CC->cs_pid, ++seqnum); - network_fp = fopen(aaa, "wb+"); + snprintf(submit_filename, sizeof submit_filename, +#ifndef HAVE_SPOOL_DIR + "." +#else + SPOOL_DIR +#endif + "/network/spoolin/netmail.%04lx.%04x.%04x", + (long) getpid(), CC->cs_pid, ++seqnum); + network_fp = fopen(submit_filename, "wb+"); if (network_fp != NULL) { fwrite(smr.ser, smr.len, 1, network_fp); fclose(network_fp); @@ -2173,7 +2406,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Go back to the room we started from */ lprintf(CTDL_DEBUG, "Returning to original room %s\n", hold_rm); if (strcasecmp(hold_rm, CC->room.QRname)) - getroom(&CC->room, hold_rm); + /* getroom(&CC->room, hold_rm); */ + usergoto(hold_rm, 0, 1, NULL, NULL); /* For internet mail, generate delivery instructions. * Yes, this is recursive. Deal with it. Infinite recursion does @@ -2193,27 +2427,84 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_internet, '|'); ++i) { size_t tmp = strlen(instr); - extract(recipient, recps->recp_internet, i); + extract_token(recipient, recps->recp_internet, + i, '|', sizeof recipient); snprintf(&instr[tmp], SIZ * 2 - tmp, "remote|%s|0||\n", recipient); } - imsg = malloc(sizeof(struct CtdlMessage)); + imsg = malloc(sizeof(struct CtdlMessage)); memset(imsg, 0, sizeof(struct CtdlMessage)); imsg->cm_magic = CTDLMESSAGE_MAGIC; imsg->cm_anon_type = MES_NORMAL; imsg->cm_format_type = FMT_RFC822; imsg->cm_fields['A'] = strdup("Citadel"); + imsg->cm_fields['J'] = strdup("do not journal"); imsg->cm_fields['M'] = instr; CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM); CtdlFreeMessage(imsg); } + /* + * Any addresses to harvest for someone's address book? + */ + if ( (CC->logged_in) && (recps != NULL) ) { + collected_addresses = harvest_collected_addresses(msg); + } + + if (collected_addresses != NULL) { + begin_critical_section(S_ATBF); + aptr = (struct addresses_to_be_filed *) + malloc(sizeof(struct addresses_to_be_filed)); + aptr->next = atbf; + MailboxName(actual_rm, sizeof actual_rm, + &CC->user, USERCONTACTSROOM); + aptr->roomname = strdup(actual_rm); + aptr->collected_addresses = collected_addresses; + atbf = aptr; + end_critical_section(S_ATBF); + } + + /* + * Determine whether this message qualifies for journaling. + */ + if (msg->cm_fields['J'] != NULL) { + qualified_for_journaling = 0; + } + else { + if (recps == NULL) { + qualified_for_journaling = config.c_journal_pubmsgs; + } + else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) { + qualified_for_journaling = config.c_journal_email; + } + else { + qualified_for_journaling = config.c_journal_pubmsgs; + } + } + + /* + * Do we have to perform journaling? If so, hand off the saved + * RFC822 version will be handed off to the journaler for background + * submit. Otherwise, we have to free the memory ourselves. + */ + if (saved_rfc822_version != NULL) { + if (qualified_for_journaling) { + JournalBackgroundSubmit(msg, saved_rfc822_version, recps); + } + else { + free(saved_rfc822_version); + } + } + + /* Done. */ return(newmsgid); } + + /* * Convenience function for generating small administrative messages. */ @@ -2256,7 +2547,7 @@ char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ exist is ALWAYS freed */ int crlf /* CRLF newlines instead of LF */ ) { - char buf[SIZ]; + char buf[1024]; int linelen; size_t message_len = 0; size_t buffer_len = 0; @@ -2288,7 +2579,7 @@ char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ /* read in the lines of message text one by one */ do { - if (client_gets(buf) < 1) finished = 1; + if (client_getln(buf, (sizeof buf - 3)) < 1) finished = 1; if (!strcmp(buf, terminator)) finished = 1; if (crlf) { strcat(buf, "\r\n"); @@ -2343,6 +2634,7 @@ char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ struct CtdlMessage *CtdlMakeMessage( struct ctdluser *author, /* author's user structure */ char *recipient, /* NULL if it's not mail */ + char *recp_cc, /* NULL if it's not mail */ char *room, /* room where it's going */ int type, /* see MES_ types in header file */ int format_type, /* variformat, plain text, MIME... */ @@ -2364,6 +2656,7 @@ struct CtdlMessage *CtdlMakeMessage( strcpy(dest_node, ""); striplt(recipient); + striplt(recp_cc); snprintf(buf, sizeof buf, "cit%ld", author->usernum); /* Path */ msg->cm_fields['P'] = strdup(buf); @@ -2389,6 +2682,9 @@ struct CtdlMessage *CtdlMakeMessage( if (recipient[0] != 0) { msg->cm_fields['R'] = strdup(recipient); } + if (recp_cc[0] != 0) { + msg->cm_fields['Y'] = strdup(recp_cc); + } if (dest_node[0] != 0) { msg->cm_fields['D'] = strdup(dest_node); } @@ -2475,22 +2771,25 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) { } - /* * Validate recipients, count delivery types and errors, and handle aliasing * FIXME check for dupes!!!!! + * Returns 0 if all addresses are ok, -1 if no addresses were specified, + * or the number of addresses found invalid. */ -struct recptypes *validate_recipients(char *recipients) { +struct recptypes *validate_recipients(char *supplied_recipients) { struct recptypes *ret; - char this_recp[SIZ]; - char this_recp_cooked[SIZ]; + char recipients[SIZ]; + char this_recp[256]; + char this_recp_cooked[256]; char append[SIZ]; - int num_recps; + int num_recps = 0; int i, j; int mailtype; int invalid; struct ctdluser tempUS; struct ctdlroom tempQR; + int in_quotes = 0; /* Initialize */ ret = (struct recptypes *) malloc(sizeof(struct recptypes)); @@ -2503,28 +2802,42 @@ struct recptypes *validate_recipients(char *recipients) { ret->num_error = 0; ret->num_room = 0; - if (recipients == NULL) { - num_recps = 0; - } - else if (strlen(recipients) == 0) { - num_recps = 0; + if (supplied_recipients == NULL) { + strcpy(recipients, ""); } else { - /* Change all valid separator characters to commas */ - for (i=0; i 0) for (i=0; i 0) { + + for (i=0; i<=strlen(recipients); ++i) { + if (recipients[i] == '\"') in_quotes = 1 - in_quotes; + if ( ( (recipients[i] == ',') && (!in_quotes) ) || (recipients[i] == 0) ) { + safestrncpy(this_recp, recipients, i+1); + this_recp[i] = 0; + if (recipients[i] == ',') { + strcpy(recipients, &recipients[i+1]); + } + else { + strcpy(recipients, ""); + } + break; + } + } + striplt(this_recp); - lprintf(CTDL_DEBUG, "Evaluating recipient #%d <%s>\n", i, this_recp); + lprintf(CTDL_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); + ++num_recps; mailtype = alias(this_recp); mailtype = alias(this_recp); mailtype = alias(this_recp); @@ -2637,7 +2950,7 @@ struct recptypes *validate_recipients(char *recipients) { if ((ret->num_local + ret->num_internet + ret->num_ignet + ret->num_room + ret->num_error) == 0) { - ++ret->num_error; + ret->num_error = (-1); strcpy(ret->errormsg, "No recipients specified."); } @@ -2660,6 +2973,8 @@ void cmd_ent0(char *entargs) { int post = 0; char recp[SIZ]; + char cc[SIZ]; + char bcc[SIZ]; char masquerade_as[SIZ]; int anon_flag = 0; int format_type = 0; @@ -2669,15 +2984,23 @@ void cmd_ent0(char *entargs) char errmsg[SIZ]; int err = 0; struct recptypes *valid = NULL; + struct recptypes *valid_to = NULL; + struct recptypes *valid_cc = NULL; + struct recptypes *valid_bcc = NULL; char subject[SIZ]; + int do_confirm = 0; + long msgnum; unbuffer_output(); post = extract_int(entargs, 0); - extract(recp, entargs, 1); + extract_token(recp, entargs, 1, '|', sizeof recp); anon_flag = extract_int(entargs, 2); format_type = extract_int(entargs, 3); - extract(subject, entargs, 4); + extract_token(subject, entargs, 4, '|', sizeof subject); + do_confirm = extract_int(entargs, 6); + extract_token(cc, entargs, 7, '|', sizeof cc); + extract_token(bcc, entargs, 8, '|', sizeof bcc); /* first check to make sure the request is valid. */ @@ -2695,7 +3018,7 @@ void cmd_ent0(char *entargs) ERROR + HIGHER_ACCESS_REQUIRED); return; } - extract(newusername, entargs, 5); + extract_token(newusername, entargs, 5, '|', sizeof newusername); memset(CC->fake_postname, 0, sizeof(CC->fake_postname) ); safestrncpy(CC->fake_postname, newusername, sizeof(CC->fake_postname) ); @@ -2713,39 +3036,74 @@ void cmd_ent0(char *entargs) if (CC->user.axlevel < 2) { strcpy(recp, "sysop"); + strcpy(cc, ""); + strcpy(bcc, ""); + } + + valid_to = validate_recipients(recp); + if (valid_to->num_error > 0) { + cprintf("%d Invalid recipient (To)\n", ERROR + NO_SUCH_USER); + free(valid_to); + return; + } + + valid_cc = validate_recipients(cc); + if (valid_cc->num_error > 0) { + cprintf("%d Invalid recipient (CC)\n", ERROR + NO_SUCH_USER); + free(valid_to); + free(valid_cc); + return; + } + + valid_bcc = validate_recipients(bcc); + if (valid_bcc->num_error > 0) { + cprintf("%d Invalid recipient (BCC)\n", ERROR + NO_SUCH_USER); + free(valid_to); + free(valid_cc); + free(valid_bcc); + return; } - valid = validate_recipients(recp); - if (valid->num_error > 0) { - cprintf("%d %s\n", - ERROR + NO_SUCH_USER, valid->errormsg); - free(valid); + /* Recipient required, but none were specified */ + if ( (valid_to->num_error < 0) && (valid_cc->num_error < 0) && (valid_bcc->num_error < 0) ) { + free(valid_to); + free(valid_cc); + free(valid_bcc); + cprintf("%d At least one recipient is required.\n", ERROR + NO_SUCH_USER); return; } - if (valid->num_internet > 0) { + + if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) { if (CtdlCheckInternetMailPermission(&CC->user)==0) { cprintf("%d You do not have permission " "to send Internet mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); - free(valid); + free(valid_to); + free(valid_cc); + free(valid_bcc); return; } } - if ( ( (valid->num_internet + valid->num_ignet) > 0) + if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0) && (CC->user.axlevel < 4) ) { cprintf("%d Higher access required for network mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); - free(valid); + free(valid_to); + free(valid_cc); + free(valid_bcc); return; } - if ((RESTRICT_INTERNET == 1) && (valid->num_internet > 0) + if ((RESTRICT_INTERNET == 1) + && (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) && ((CC->user.flags & US_INTERNET) == 0) && (!CC->internal_pgm)) { cprintf("%d You don't have access to Internet mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); - free(valid); + free(valid_to); + free(valid_cc); + free(valid_bcc); return; } @@ -2771,11 +3129,18 @@ void cmd_ent0(char *entargs) */ if (post == 0) { cprintf("%d %s\n", CIT_OK, - ((valid != NULL) ? valid->display_recp : "") ); - free(valid); + ((valid_to != NULL) ? valid_to->display_recp : "") ); + free(valid_to); + free(valid_cc); + free(valid_bcc); return; } + /* We don't need these anymore because we'll do it differently below */ + free(valid_to); + free(valid_cc); + free(valid_bcc); + /* Handle author masquerading */ if (CC->fake_postname[0]) { strcpy(masquerade_as, CC->fake_postname); @@ -2788,17 +3153,66 @@ void cmd_ent0(char *entargs) } /* Read in the message from the client. */ - cprintf("%d send message\n", SEND_LISTING); - msg = CtdlMakeMessage(&CC->user, recp, + if (do_confirm) { + cprintf("%d send message\n", START_CHAT_MODE); + } else { + cprintf("%d send message\n", SEND_LISTING); + } + + msg = CtdlMakeMessage(&CC->user, recp, cc, CC->room.QRname, anonymous, format_type, masquerade_as, subject, NULL); + /* Put together one big recipients struct containing to/cc/bcc all in + * one. This is for the envelope. + */ + char *all_recps = malloc(SIZ * 3); + strcpy(all_recps, recp); + if (strlen(cc) > 0) { + if (strlen(all_recps) > 0) { + strcat(all_recps, ","); + } + strcat(all_recps, cc); + } + if (strlen(bcc) > 0) { + if (strlen(all_recps) > 0) { + strcat(all_recps, ","); + } + strcat(all_recps, bcc); + } + if (strlen(all_recps) > 0) { + valid = validate_recipients(all_recps); + } + else { + valid = NULL; + } + free(all_recps); + if (msg != NULL) { - CtdlSubmitMsg(msg, valid, ""); + msgnum = CtdlSubmitMsg(msg, valid, ""); + + if (do_confirm) { + cprintf("%ld\n", msgnum); + if (msgnum >= 0L) { + cprintf("Message accepted.\n"); + } + else { + cprintf("Internal error.\n"); + } + if (msg->cm_fields['E'] != NULL) { + cprintf("%s\n", msg->cm_fields['E']); + } else { + cprintf("\n"); + } + cprintf("000\n"); + } + CtdlFreeMessage(msg); } CC->fake_postname[0] = '\0'; - free(valid); + if (valid != NULL) { + free(valid); + } return; } @@ -2809,8 +3223,9 @@ void cmd_ent0(char *entargs) * (returns the actual number of messages deleted) */ int CtdlDeleteMessages(char *room_name, /* which room */ - long dmsgnum, /* or "0" for any */ - char *content_type /* or "" for any */ + long dmsgnum, /* or "0" for any */ + char *content_type, /* or "" for any */ + int deferred /* let TDAP sweep it later */ ) { @@ -2824,8 +3239,8 @@ int CtdlDeleteMessages(char *room_name, /* which room */ int delete_this; struct MetaData smi; - lprintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %ld, %s)\n", - room_name, dmsgnum, content_type); + lprintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %ld, %s, %d)\n", + room_name, dmsgnum, content_type, deferred); /* get room record, obtaining a lock... */ if (lgetroom(&qrbuf, room_name) != 0) { @@ -2836,9 +3251,9 @@ int CtdlDeleteMessages(char *room_name, /* which room */ cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long)); if (cdbfr != NULL) { - msglist = malloc(cdbfr->len); dellist = malloc(cdbfr->len); - memcpy(msglist, cdbfr->ptr, cdbfr->len); + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlDeleteMessages() now owns this memory */ num_msgs = cdbfr->len / sizeof(long); cdb_free(cdbfr); } @@ -2876,6 +3291,20 @@ int CtdlDeleteMessages(char *room_name, /* which room */ } lputroom(&qrbuf); + /* + * If the delete operation is "deferred" (and technically, any delete + * operation not performed by THE DREADED AUTO-PURGER ought to be + * a deferred delete) then we save a pointer to the message in the + * DELETED_MSGS_ROOM. This will cause the reference count to remain + * at least 1, which will save the user from having to synchronously + * wait for various disk-intensive operations to complete. + */ + if ( (deferred) && (num_deleted) ) { + for (i=0; iroom.QRname, delnum, ""); + num_deleted = CtdlDeleteMessages(CC->room.QRname, delnum, "", 1); if (num_deleted) { cprintf("%d %d message%s deleted.\n", CIT_OK, @@ -2947,8 +3376,7 @@ void cmd_dele(char *delstr) int CtdlCopyMsgToRoom(long msgnum, char *dest) { int err; - err = CtdlSaveMsgPointerInRoom(dest, msgnum, - (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) ); + err = CtdlSaveMsgPointerInRoom(dest, msgnum, 1, NULL); if (err != 0) return(err); return(0); @@ -2962,7 +3390,7 @@ int CtdlCopyMsgToRoom(long msgnum, char *dest) { void cmd_move(char *args) { long num; - char targ[SIZ]; + char targ[ROOMNAMELEN]; struct ctdlroom qtemp; int err; int is_copy = 0; @@ -2970,7 +3398,8 @@ void cmd_move(char *args) int permit = 0; num = extract_long(args, 0); - extract(targ, args, 1); + extract_token(targ, args, 1, '|', sizeof targ); + convert_room_name_macros(targ, sizeof targ); targ[ROOMNAMELEN - 1] = 0; is_copy = extract_int(args, 2); @@ -2981,7 +3410,7 @@ void cmd_move(char *args) } getuser(&CC->user, CC->curr_user); - ra = CtdlRoomAccess(&qtemp, &CC->user); + CtdlRoomAccess(&qtemp, &CC->user, &ra, NULL); /* Check for permission to perform this operation. * Remember: "CC->room" is source, "qtemp" is target. @@ -3023,7 +3452,7 @@ void cmd_move(char *args) * if this is a 'move' rather than a 'copy' operation. */ if (is_copy == 0) { - CtdlDeleteMessages(CC->room.QRname, num, ""); + CtdlDeleteMessages(CC->room.QRname, num, "", 0); } cprintf("%d Message %s.\n", CIT_OK, (is_copy ? "copied" : "moved") ); @@ -3080,7 +3509,7 @@ void PutMetaData(struct MetaData *smibuf) /* * AdjRefCount - change the reference count for a message; - * delete the message if it reaches zero + * delete the message if it reaches zero */ void AdjRefCount(long msgnum, int incr) { @@ -3094,24 +3523,29 @@ void AdjRefCount(long msgnum, int incr) */ begin_critical_section(S_SUPPMSGMAIN); GetMetaData(&smi, msgnum); - lprintf(CTDL_DEBUG, "Ref count for message <%ld> before write is <%d>\n", - msgnum, smi.meta_refcount); smi.meta_refcount += incr; PutMetaData(&smi); end_critical_section(S_SUPPMSGMAIN); - lprintf(CTDL_DEBUG, "Ref count for message <%ld> after write is <%d>\n", - msgnum, smi.meta_refcount); + lprintf(CTDL_DEBUG, "msg %ld ref count incr %d, is now %d\n", + msgnum, incr, smi.meta_refcount); /* If the reference count is now zero, delete the message * (and its supplementary record as well). */ if (smi.meta_refcount == 0) { lprintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum); + + /* Remove from fulltext index */ + if (config.c_enable_fulltext) { + ft_index_message(msgnum, 0); + } + + /* Remove from message base */ delnum = msgnum; cdb_delete(CDB_MSGMAIN, &delnum, (int)sizeof(long)); cdb_delete(CDB_BIGMSGS, &delnum, (int)sizeof(long)); - /* We have to delete the metadata record too! */ + /* Remove metadata record */ delnum = (0L - msgnum); cdb_delete(CDB_MSGMAIN, &delnum, (int)sizeof(long)); } @@ -3142,12 +3576,12 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ char *encoded_message = NULL; off_t raw_length = 0; - if (is_mailbox != NULL) + if (is_mailbox != NULL) { MailboxName(roomname, sizeof roomname, is_mailbox, req_room); - else + } + else { safestrncpy(roomname, req_room, sizeof(roomname)); - lprintf(CTDL_DEBUG, "CtdlWriteObject() to <%s> (flags=%d)\n", roomname, flags); - + } fp = fopen(tempfilename, "rb"); if (fp == NULL) { @@ -3228,7 +3662,8 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ */ if (is_unique) { lprintf(CTDL_DEBUG, "Deleted %d other msgs of this type\n", - CtdlDeleteMessages(roomname, 0L, content_type)); + CtdlDeleteMessages(roomname, 0L, content_type, 0) + ); } /* Now write the data */ CtdlSubmitMsg(msg, NULL, roomname); @@ -3271,10 +3706,10 @@ char *CtdlGetSysConfig(char *sysconfname) { conf = NULL; } else { - msg = CtdlFetchMessage(msgnum, 1); - if (msg != NULL) { - conf = strdup(msg->cm_fields['M']); - CtdlFreeMessage(msg); + msg = CtdlFetchMessage(msgnum, 1); + if (msg != NULL) { + conf = strdup(msg->cm_fields['M']); + CtdlFreeMessage(msg); } else { conf = NULL; @@ -3284,7 +3719,7 @@ char *CtdlGetSysConfig(char *sysconfname) { getroom(&CC->room, hold_rm); if (conf != NULL) do { - extract_token(buf, conf, 0, '\n'); + extract_token(buf, conf, 0, '\n', sizeof buf); strcpy(conf, &conf[strlen(buf)+1]); } while ( (strlen(conf)>0) && (strlen(buf)>0) ); @@ -3295,7 +3730,7 @@ void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) { char temp[PATH_MAX]; FILE *fp; - strcpy(temp, tmpnam(NULL)); + CtdlMakeTempFileName(temp, sizeof temp); fp = fopen(temp, "w"); if (fp == NULL) return; @@ -3311,7 +3746,8 @@ void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) { /* * Determine whether a given Internet address belongs to the current user */ -int CtdlIsMe(char *addr) { +int CtdlIsMe(char *addr, int addr_buf_len) +{ struct recptypes *recp; int i; @@ -3324,7 +3760,7 @@ int CtdlIsMe(char *addr) { } for (i=0; inum_local; ++i) { - extract(addr, recp->recp_local, i); + extract_token(addr, recp->recp_local, i, '|', addr_buf_len); if (!strcasecmp(addr, CC->user.fullname)) { free(recp); return(1); @@ -3340,12 +3776,12 @@ int CtdlIsMe(char *addr) { * Citadel protocol command to do the same */ void cmd_isme(char *argbuf) { - char addr[SIZ]; + char addr[256]; if (CtdlAccessCheck(ac_logged_in)) return; - extract(addr, argbuf, 0); + extract_token(addr, argbuf, 0, '|', sizeof addr); - if (CtdlIsMe(addr)) { + if (CtdlIsMe(addr, sizeof addr)) { cprintf("%d %s\n", CIT_OK, addr); } else {