X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=a95ecd450ff8c4807de54f61dd76eb8541076d96;hb=ea1849b79ff5c285db6c12eb7e410934c2ac2a05;hp=941af80b4701ee72df29d73e42543e9cabf94feb;hpb=cb3c0982d624946545cdb8ee49d29a2a0232f980;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 941af80b4..a95ecd450 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 @@ -52,9 +48,13 @@ #include "genstamp.h" #include "internet_addressing.h" #include "serv_fulltext.h" +#include "vcard.h" +#include "euidindex.h" +#include "journaling.h" +#include "citadel_dirs.h" 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 @@ -84,7 +84,8 @@ char *msgkeys[] = { NULL, "hnod", "msgn", - NULL, NULL, NULL, + "jrnl", + NULL, NULL, "text", "node", "room", @@ -97,7 +98,7 @@ char *msgkeys[] = { NULL, NULL, NULL, - NULL, + "cccc", NULL }; @@ -141,14 +142,9 @@ int alias(char *name) striplt(name); remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); + stripallbut(name, '<', '>'); - fp = fopen( -#ifndef HAVE_ETG_DIR - "network/" -#else - ETC_DIR -#endif - "mail.aliases", "r"); + fp = fopen(file_mail_aliases, "r"); if (fp == NULL) { fp = fopen("/dev/null", "r"); } @@ -174,7 +170,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); } @@ -243,16 +239,11 @@ void get_mm(void) { FILE *fp; - fp = fopen( -#ifndef HAVE_RUN_DIR - "." -#else - RUN_DIR -#endif - "/citadel.control", "r"); + fp = fopen(file_citadel_control, "r"); if (fp == NULL) { - lprintf(CTDL_CRIT, "Cannot open citadel.control: %s\n", - strerror(errno)); + lprintf(CTDL_CRIT, "Cannot open %s: %s\n", + file_citadel_control, + strerror(errno)); exit(errno); } fread((char *) &CitControl, sizeof(struct CitControl), 1, fp); @@ -278,7 +269,7 @@ void headers_listing(long msgnum, void *userdata) struct CtdlMessage *msg; msg = CtdlFetchMessage(msgnum, 0); - if (msg < 0L) { + if (msg == NULL) { cprintf("%ld|0|||||\n", msgnum); return; } @@ -346,10 +337,11 @@ 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, +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, j; + int i, j, k; int is_seen = 0; int was_seen = 0; long lo = (-1L); @@ -366,8 +358,9 @@ void CtdlSetSeen(long target_msgnum, int target_setting, int which_set, 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, @@ -378,8 +371,8 @@ void CtdlSetSeen(long target_msgnum, int target_setting, int which_set, /* 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 { @@ -432,13 +425,13 @@ void CtdlSetSeen(long target_msgnum, int target_setting, int which_set, hi = (-1L); for (i=0; iroom.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 { @@ -745,7 +738,7 @@ 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", CTDLDIR); + help_subst(buffer, "^bbsdir", ctdl_bbsbase_dir); } @@ -758,7 +751,6 @@ void do_help_subst(char *buffer) * to the client. The client software may reformat it again. */ void memfmout( - int width, /* screen width to use */ char *mptr, /* where are we going to get our text from? */ char subst, /* nonzero if we should do substitutions */ char *nl) /* string to terminate lines with */ @@ -769,6 +761,7 @@ void memfmout( cit_uint8_t ch; char aaa[140]; char buffer[SIZ]; + static int width = 80; strcpy(aaa, ""); old = 255; @@ -796,15 +789,13 @@ void memfmout( old = real; real = ch; - if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10)) + if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10)) { ch = 32; + } if (((old == 13) || (old == 10)) && (isspace(real))) { cprintf("%s", nl); c = 1; } - if (ch > 126) - continue; - if (ch > 32) { if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) { cprintf("%s%s", nl, aaa); @@ -845,9 +836,13 @@ void list_this_part(char *name, char *filename, char *partnum, char *disp, 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); + } } /* @@ -857,7 +852,16 @@ void list_this_pref(char *name, char *filename, char *partnum, char *disp, 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); + } } /* @@ -867,7 +871,15 @@ void list_this_suff(char *name, char *filename, char *partnum, char *disp, 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; + } } @@ -976,7 +988,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) } } if (ret->cm_fields['M'] == NULL) { - ret->cm_fields['M'] = strdup("\n"); + ret->cm_fields['M'] = strdup("\r\n\r\n (no text)\r\n"); } /* Perform "before read" hooks (aborting if any return nonzero) */ @@ -1044,7 +1056,9 @@ void fixed_output_pre(char *name, char *filename, char *partnum, char *disp, if (!strcasecmp(cbtype, "multipart/alternative")) { ++ma->is_ma; ma->did_print = 0; - return; + } + if (!strcasecmp(cbtype, "message/rfc822")) { + ++ma->freeze; } } @@ -1052,8 +1066,8 @@ void fixed_output_pre(char *name, char *filename, char *partnum, char *disp, * Post callback function for multipart/alternative */ void fixed_output_post(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { struct ma_info *ma; @@ -1062,7 +1076,9 @@ void fixed_output_post(char *name, char *filename, char *partnum, char *disp, if (!strcasecmp(cbtype, "multipart/alternative")) { --ma->is_ma; ma->did_print = 0; - return; + } + if (!strcasecmp(cbtype, "message/rfc822")) { + --ma->freeze; } } @@ -1070,61 +1086,76 @@ void fixed_output_post(char *name, char *filename, char *partnum, char *disp, * 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, 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; + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) +{ + char *ptr; + char *wptr; + size_t wlen; + struct ma_info *ma; - lprintf(CTDL_DEBUG, "fixed_output() type=<%s>\n", cbtype); + ma = (struct ma_info *)cbuserdata; - /* - * 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') { + 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); + return; + } + + 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); + return; + } + + if (ma->use_fo_hooks) { + if (PerformFixedOutputHooks(cbtype, content, length)) { + /* above function returns nonzero if it handled the part */ + return; } } + if (strncasecmp(cbtype, "multipart/", 10)) { + cprintf("Part %s: %s (%s) (%ld bytes)\r\n", + partnum, filename, cbtype, (long)length); + return; + } +} + /* * The client is elegant and sophisticated and wants to be choosy about * MIME content types, so figure out which multipart/alternative part * we're going to send. */ void choose_preferred(char *name, char *filename, char *partnum, char *disp, - void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { char buf[1024]; int i; @@ -1135,8 +1166,8 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, if (ma->is_ma > 0) { for (i=0; ipreferred_formats, '|'); ++i) { extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); - if (!strcasecmp(buf, cbtype)) { - strcpy(ma->chosen_part, partnum); + if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) { + safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part); } } } @@ -1146,8 +1177,8 @@ 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, char *cbcharset, size_t length, char *encoding, - void *cbuserdata) + void *content, char *cbtype, char *cbcharset, size_t length, + char *encoding, void *cbuserdata) { int i; char buf[128]; @@ -1199,6 +1230,37 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, } +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) * @@ -1207,13 +1269,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", @@ -1240,11 +1306,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); @@ -1257,7 +1357,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? */ @@ -1272,7 +1371,7 @@ int CtdlOutputPreLoadedMsg( char *nl; /* newline string */ int suppress_f = 0; int subject_found = 0; - struct ma_info *ma; + struct ma_info ma; /* Buffers needed for RFC822 translation. These are all filled * using functions that are bounds-checked, and therefore we can @@ -1286,12 +1385,11 @@ int CtdlOutputPreLoadedMsg( char mid[100]; char datestamp[100]; - lprintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %ld, %d, %d, %d, %d\n", + 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)) { @@ -1313,10 +1411,7 @@ int CtdlOutputPreLoadedMsg( } else { /* Parse the message text component */ mptr = TheMessage->cm_fields['M']; - ma = malloc(sizeof(struct ma_info)); - memset(ma, 0, sizeof(struct ma_info)); - mime_parser(mptr, NULL, *mime_download, NULL, NULL, (void *)ma, 0); - free(ma); + 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 */ @@ -1331,7 +1426,7 @@ int CtdlOutputPreLoadedMsg( } /* 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; @@ -1429,6 +1524,9 @@ int CtdlOutputPreLoadedMsg( safestrncpy(luser, mptr, sizeof luser); safestrncpy(suser, mptr, sizeof suser); } + else if (i == 'Y') { + cprintf("CC: %s%s", mptr, nl); + } else if (i == 'U') { cprintf("Subject: %s%s", mptr, nl); subject_found = 1; @@ -1476,19 +1574,15 @@ int CtdlOutputPreLoadedMsg( cprintf(">%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); } @@ -1508,53 +1602,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, (do_proto ? *list_this_part : NULL), (do_proto ? *list_this_pref : NULL), (do_proto ? *list_this_suff : NULL), - NULL, 0); + (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 { - if (headers_only != HEADERS_ONLY) { - cprintf("%s", nl); - } - } - if ((*(mptr) == 13) || (*(mptr) == 10)) { - done_rfc822_hdrs = 1; - } - } - else { - if (done_rfc822_hdrs) { - if (headers_only != HEADERS_NONE) { - cprintf("%c", ch); + 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("%c", ch); + 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; - } + break; + default: + if (ch == 10) cprintf("%s", nl); + else cprintf("%c", ch); + break; } + ++mptr; } goto DONE; } @@ -1604,7 +1689,7 @@ START_TEXT: if (mode == MT_MIME) { cprintf("Content-type: text/x-citadel-variformat\n\n"); } - memfmout(80, mptr, 0, nl); + memfmout(mptr, 0, nl); } /* If the message on disk is format 4 (MIME), we've gotta hand it @@ -1613,24 +1698,24 @@ START_TEXT: * we use will display those parts as-is. */ if (TheMessage->cm_format_type == FMT_RFC822) { - ma = malloc(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"); + ma.use_fo_hooks = 0; + strcpy(ma.chosen_part, "1"); mime_parser(mptr, NULL, *choose_preferred, *fixed_output_pre, - *fixed_output_post, (void *)ma, 0); + *fixed_output_post, (void *)&ma, 0); mime_parser(mptr, NULL, - *output_preferred, NULL, NULL, (void *)ma, 0); + *output_preferred, NULL, NULL, (void *)&ma, 0); } else { + ma.use_fo_hooks = 1; mime_parser(mptr, NULL, *fixed_output, *fixed_output_pre, - *fixed_output_post, (void *)ma, 0); + *fixed_output_post, (void *)&ma, 0); } - free(ma); } DONE: /* now we're done */ @@ -1651,7 +1736,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; } @@ -1667,7 +1752,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); } @@ -1717,9 +1802,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) ); } @@ -1745,103 +1832,101 @@ void cmd_opna(char *cmdbuf) msgid = extract_long(cmdbuf, 0); 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); + safestrncpy(CC->download_desired_section, desired_section, + sizeof CC->download_desired_section); + CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1, NULL); } - /* - * Save a message pointer into a specified room + * Save one or more message pointers 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. (Obviously + * this mode of operation only works if we're saving a single message.) */ -int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) { - int i; +int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs, + int do_repl_check, struct CtdlMessage *supplied_msg) +{ + int i, j, unique; char hold_rm[ROOMNAMELEN]; 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); - - strcpy(hold_rm, CC->room.QRname); + long msgid = 0; + struct CtdlMessage *msg = NULL; - /* 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); - } + long *msgs_to_be_merged = NULL; + int num_msgs_to_be_merged = 0; - /* Perform replication checks if necessary */ - if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) { + lprintf(CTDL_DEBUG, + "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d)\n", + roomname, num_newmsgs, do_repl_check); - 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); - } + strcpy(hold_rm, CC->room.QRname); - 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); - } - } + /* Sanity checks */ + if (newmsgidlist == NULL) return(ERROR + INTERNAL_ERROR); + if (num_newmsgs < 1) return(ERROR + INTERNAL_ERROR); + if (num_newmsgs > 1) supplied_msg = NULL; /* 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); } + + msgs_to_be_merged = malloc(sizeof(long) * num_newmsgs); + num_msgs_to_be_merged = 0; + + 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"); + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlSaveMsgPointerInRoom() now owns this memory */ num_msgs = cdbfr->len / sizeof(long); - memcpy(msglist, cdbfr->ptr, cdbfr->len); 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. + /* Create a list of msgid's which were supplied by the caller, but do + * not already exist in the target 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; iroom); /* unlock the room */ - getroom(&CC->room, hold_rm); - if (msg != NULL) CtdlFreeMessage(msg); - free(msglist); - return(ERROR + ALREADY_EXISTS); + for (i=0; i 0) for (j=0; jroom.QRhighest = highest_msg; lputroom(&CC->room); + + /* Perform replication checks if necessary */ + if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) { + lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n"); + + for (i=0; icm_fields['E'] != NULL) { + index_message_by_euid(msg->cm_fields['E'], &CC->room, msgid); + } + + /* Free up the memory we may have allocated */ + if (msg != supplied_msg) { + CtdlFreeMessage(msg); + } + } + + } + } + + else { + lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n"); + } + + /* 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); + /* Bump the reference count for all messages which were merged */ + for (i=0; icm_fields['I']==NULL) { @@ -1958,21 +2096,31 @@ long send_message(struct CtdlMessage *msg) { void serialize_message(struct ser_ret *ret, /* return values */ struct CtdlMessage *msg) /* unserialized msg */ { - size_t wlen; + size_t wlen, fieldlen; int i; static char *forder = FORDER; - if (is_valid_message(msg) == 0) return; /* self check */ + /* + * Check for valid message format + */ + if (is_valid_message(msg) == 0) { + lprintf(CTDL_ERR, "serialize_message() aborting due to invalid message\n"); + ret->len = 0; + ret->ser = NULL; + return; + } ret->len = 3; for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) ret->len = ret->len + strlen(msg->cm_fields[(int)forder[i]]) + 2; - lprintf(CTDL_DEBUG, "serialize_message() calling malloc(%ld)\n", (long)ret->len); ret->ser = malloc(ret->len); if (ret->ser == NULL) { + lprintf(CTDL_ERR, "serialize_message() malloc(%ld) failed: %s\n", + (long)ret->len, strerror(errno)); ret->len = 0; + ret->ser = NULL; return; } @@ -1982,9 +2130,10 @@ void serialize_message(struct ser_ret *ret, /* return values */ wlen = 3; for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) { + fieldlen = strlen(msg->cm_fields[(int)forder[i]]); ret->ser[wlen++] = (char)forder[i]; - strcpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]]); - wlen = wlen + strlen(msg->cm_fields[(int)forder[i]]) + 1; + safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1); + wlen = wlen + fieldlen + 1; } if (ret->len != wlen) lprintf(CTDL_ERR, "ERROR: len=%ld wlen=%ld\n", (long)ret->len, (long)wlen); @@ -1995,42 +2144,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) { - lprintf(CTDL_DEBUG, "check_repl() replacing message %ld\n", msgnum); - CtdlDeleteMessages(CC->room.QRname, msgnum, "", 0); -} +void ReplicationChecks(struct CtdlMessage *msg) { + long old_msgnum = (-1L); + if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return; -/* - * Check to see if any messages already exist which carry the same Exclusive ID - * as this one. If any are found, delete them. - * - */ -int ReplicationChecks(struct CtdlMessage *msg) { - struct CtdlMessage *template; - int abort_this = 0; + lprintf(CTDL_DEBUG, "Performing replication checks in <%s>\n", + CC->room.QRname); /* 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']); - - template = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); - memset(template, 0, sizeof(struct CtdlMessage)); - template->cm_fields['E'] = strdup(msg->cm_fields['E']); + 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);*/ - CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl, NULL); - - 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, 1, "", 0); + } } - /* * Save a message to disk and submit it into the delivery system. */ @@ -2056,6 +2196,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 */ @@ -2064,7 +2208,6 @@ 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(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL)); msg->cm_fields['T'] = strdup(generated_timestamp); } @@ -2072,7 +2215,6 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* 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) { @@ -2094,7 +2236,6 @@ 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(-2); @@ -2109,8 +2250,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ break; case 4: strcpy(content_type, "text/plain"); - mptr = bmstrstr(msg->cm_fields['M'], - "Content-type: ", strncasecmp); + mptr = bmstrcasestr(msg->cm_fields['M'], "Content-type: "); if (mptr != NULL) { safestrncpy(content_type, &mptr[14], sizeof content_type); @@ -2126,8 +2266,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Goto the correct room */ - lprintf(CTDL_DEBUG, "Selected room %s\n", - (recps) ? CC->room.QRname : SENTITEMS); + lprintf(CTDL_DEBUG, "Selected room %s\n", (recps) ? CC->room.QRname : SENTITEMS); strcpy(hold_rm, CC->room.QRname); strcpy(actual_rm, CC->room.QRname); if (recps != NULL) { @@ -2135,12 +2274,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"); } } @@ -2166,9 +2304,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ lprintf(CTDL_DEBUG, "Performing before-save hooks\n"); 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(-4); + /* + * 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"); @@ -2186,13 +2328,16 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ safestrncpy(smi.meta_content_type, content_type, sizeof smi.meta_content_type); - /* As part of the new metadata record, measure how - * big this message will be when displayed as RFC822. - * Both POP and IMAP use this, and it's best to just take the hit now - * instead of having to potentially measure thousands of messages when - * a mailbox is opened later. + /* + * 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(); @@ -2200,9 +2345,9 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ CC->redirect_buffer = malloc(SIZ); CC->redirect_len = 0; CC->redirect_alloc = SIZ; - CtdlOutputPreLoadedMsg(msg, 0L, MT_RFC822, HEADERS_ALL, 0, 1); + CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1); smi.meta_rfc822_length = CC->redirect_len; - free(CC->redirect_buffer); + saved_rfc822_version = CC->redirect_buffer; CC->redirect_buffer = NULL; CC->redirect_len = 0; CC->redirect_alloc = 0; @@ -2217,17 +2362,16 @@ 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. */ @@ -2237,7 +2381,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ extract_token(recipient, recps->recp_room, i, '|', sizeof recipient); lprintf(CTDL_DEBUG, "Delivering to room <%s>\n", recipient); - CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0); + CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg); } /* Bump this user's messages posted counter. */ @@ -2259,13 +2403,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (getuser(&userbuf, recipient) == 0) { MailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); - CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0); + CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg); BumpNewMailCounter(userbuf.usernum); } else { lprintf(CTDL_DEBUG, "No user <%s>\n", recipient); CtdlSaveMsgPointerInRoom(config.c_aideroom, - newmsgid, 0); + newmsgid, 0, msg); } } @@ -2297,12 +2441,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ serialize_message(&smr, msg); if (smr.len > 0) { snprintf(submit_filename, sizeof submit_filename, -#ifndef HAVE_SPOOL_DIR - "." -#else - SPOOL_DIR -#endif - "/network/spoolin/netmail.%04lx.%04x.%04x", + "%s/netmail.%04lx.%04x.%04x", + ctdl_netin_dir, (long) getpid(), CC->cs_pid, ++seqnum); network_fp = fopen(submit_filename, "wb+"); if (network_fp != NULL) { @@ -2342,7 +2482,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_internet, '|'); ++i) { size_t tmp = strlen(instr); - extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient); + extract_token(recipient, recps->recp_internet, + i, '|', sizeof recipient); snprintf(&instr[tmp], SIZ * 2 - tmp, "remote|%s|0||\n", recipient); } @@ -2353,16 +2494,72 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ 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. */ @@ -2492,11 +2689,13 @@ 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... */ char *fake_name, /* who we're masquerading as */ char *subject, /* Subject (optional) */ + char *supplied_euid, /* ...or NULL if this is irrelevant */ char *preformatted_text /* ...or NULL to read text from client */ ) { char dest_node[SIZ]; @@ -2513,6 +2712,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); @@ -2538,6 +2738,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); } @@ -2553,6 +2756,10 @@ struct CtdlMessage *CtdlMakeMessage( } } + if (supplied_euid != NULL) { + msg->cm_fields['E'] = strdup(supplied_euid); + } + if (preformatted_text != NULL) { msg->cm_fields['M'] = preformatted_text; } @@ -2624,22 +2831,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)); @@ -2652,28 +2862,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); @@ -2786,7 +3010,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."); } @@ -2809,6 +3033,9 @@ void cmd_ent0(char *entargs) { int post = 0; char recp[SIZ]; + char cc[SIZ]; + char bcc[SIZ]; + char supplied_euid[128]; char masquerade_as[SIZ]; int anon_flag = 0; int format_type = 0; @@ -2818,6 +3045,9 @@ 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; @@ -2830,6 +3060,17 @@ void cmd_ent0(char *entargs) format_type = extract_int(entargs, 3); 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); + switch(CC->room.QRdefaultview) { + case VIEW_NOTES: + case VIEW_WIKI: + extract_token(supplied_euid, entargs, 9, '|', sizeof supplied_euid); + break; + default: + supplied_euid[0] = 0; + break; + } /* first check to make sure the request is valid. */ @@ -2865,39 +3106,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; } @@ -2923,11 +3199,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); @@ -2945,9 +3228,37 @@ void cmd_ent0(char *entargs) } else { cprintf("%d send message\n", SEND_LISTING); } - msg = CtdlMakeMessage(&CC->user, recp, + + msg = CtdlMakeMessage(&CC->user, recp, cc, CC->room.QRname, anonymous, format_type, - masquerade_as, subject, NULL); + masquerade_as, subject, + ((strlen(supplied_euid) > 0) ? supplied_euid : NULL), + 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) { msgnum = CtdlSubmitMsg(msg, valid, ""); @@ -2971,7 +3282,9 @@ void cmd_ent0(char *entargs) CtdlFreeMessage(msg); } CC->fake_postname[0] = '\0'; - free(valid); + if (valid != NULL) { + free(valid); + } return; } @@ -2982,7 +3295,8 @@ 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 */ + long *dmsgnums, /* array of msg numbers to be deleted */ + int num_dmsgnums, /* number of msgs to be deleted, or 0 for "any" */ char *content_type, /* or "" for any */ int deferred /* let TDAP sweep it later */ ) @@ -2993,13 +3307,13 @@ int CtdlDeleteMessages(char *room_name, /* which room */ long *msglist = NULL; long *dellist = NULL; int num_msgs = 0; - int i; + int i, j; int num_deleted = 0; int delete_this; struct MetaData smi; - lprintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %ld, %s, %d)\n", - room_name, dmsgnum, content_type, deferred); + lprintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s, %d)\n", + room_name, num_dmsgnums, content_type, deferred); /* get room record, obtaining a lock... */ if (lgetroom(&qrbuf, room_name) != 0) { @@ -3010,9 +3324,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); } @@ -3022,9 +3336,20 @@ int CtdlDeleteMessages(char *room_name, /* which room */ /* Set/clear a bit for each criterion */ - if ((dmsgnum == 0L) || (msglist[i] == dmsgnum)) { + /* 0 messages in the list or a null list means that we are + * interested in deleting any messages which meet the other criteria. + */ + if ((num_dmsgnums == 0) || (dmsgnums == NULL)) { delete_this |= 0x01; } + else { + for (j=0; jroom.QRname, delnum, "", 1); + num_deleted = CtdlDeleteMessages(CC->room.QRname, &delnum, 1, "", 1); if (num_deleted) { cprintf("%d %d message%s deleted.\n", CIT_OK, @@ -3130,19 +3455,26 @@ void cmd_dele(char *delstr) /* - * Back end API function for moves and deletes + * Back end API function for moves and deletes (multiple messages) */ -int CtdlCopyMsgToRoom(long msgnum, char *dest) { +int CtdlCopyMsgsToRoom(long *msgnums, int num_msgs, char *dest) { int err; - err = CtdlSaveMsgPointerInRoom(dest, msgnum, - (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) ); + err = CtdlSaveMsgPointersInRoom(dest, msgnums, num_msgs, 1, NULL); if (err != 0) return(err); return(0); } +/* + * Back end API function for moves and deletes (single message) + */ +int CtdlCopyMsgToRoom(long msgnum, char *dest) { + return CtdlCopyMsgsToRoom(&msgnum, 1, dest); +} + + /* * move or copy a message to another room @@ -3159,6 +3491,7 @@ void cmd_move(char *args) num = extract_long(args, 0); extract_token(targ, args, 1, '|', sizeof targ); + convert_room_name_macros(targ, sizeof targ); targ[ROOMNAMELEN - 1] = 0; is_copy = extract_int(args, 2); @@ -3211,7 +3544,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, "", 0); + CtdlDeleteMessages(CC->room.QRname, &num, 1, "", 0); } cprintf("%d Message %s.\n", CIT_OK, (is_copy ? "copied" : "moved") ); @@ -3290,7 +3623,6 @@ void AdjRefCount(long msgnum, int incr) /* If the reference count is now zero, delete the message * (and its supplementary record as well). - * FIXME ... defer this so it doesn't keep the user waiting. */ if (smi.meta_refcount == 0) { lprintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum); @@ -3336,12 +3668,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) { @@ -3422,7 +3754,7 @@ 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, 0) + CtdlDeleteMessages(roomname, NULL, 0, content_type, 0) ); } /* Now write the data */ @@ -3490,7 +3822,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;