X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=c65eef1a664a32918a30912e280b2a74fb7277a4;hb=00159d60a19a36105161c420aeb6a4d33dbd6b5f;hp=39c79d3d73326477ccca86b568fd8888203c51b8;hpb=2735841869b264ba98805f1679731cf86942c90b;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 39c79d3d7..c65eef1a6 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -1,7 +1,7 @@ /* * Implements the message store. * - * Copyright (c) 1987-2012 by the citadel.org team + * Copyright (c) 1987-2015 by the citadel.org team * * This program is open source software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3. @@ -12,58 +12,26 @@ * GNU General Public License for more details. */ -#include "sysdep.h" -#include -#include -#include -#include - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#include -#include -#include -#include -#include -#include -#include +#include #include +#include #include "md5.h" -#include -#include "citadel.h" -#include "server.h" -#include "serv_extensions.h" -#include "database.h" -#include "msgbase.h" -#include "support.h" -#include "sysdep_decls.h" +#include "ctdl_module.h" #include "citserver.h" -#include "room_ops.h" -#include "user_ops.h" -#include "file_ops.h" -#include "config.h" #include "control.h" +#include "config.h" +#include "clientsocket.h" #include "genstamp.h" +#include "room_ops.h" +#include "user_ops.h" + #include "internet_addressing.h" #include "euidindex.h" +#include "msgbase.h" #include "journaling.h" -#include "citadel_dirs.h" -#include "clientsocket.h" -#include "threads.h" - -#include "ctdl_module.h" struct addresses_to_be_filed *atbf = NULL; @@ -169,6 +137,7 @@ void CM_SetField(struct CtdlMessage *Msg, eMsgField which, const char *buf, long Msg->cm_fields[which] = malloc(length + 1); memcpy(Msg->cm_fields[which], buf, length); Msg->cm_fields[which][length] = '\0'; + Msg->cm_lengths[which] = length; } void CM_SetFieldLONG(struct CtdlMessage *Msg, eMsgField which, long lvalue) @@ -183,8 +152,11 @@ void CM_CutFieldAt(struct CtdlMessage *Msg, eMsgField WhichToCut, long maxlen) if (Msg->cm_fields[WhichToCut] == NULL) return; - if (strlen(Msg->cm_fields[WhichToCut]) > maxlen) + if (Msg->cm_lengths[WhichToCut] > maxlen) + { Msg->cm_fields[WhichToCut][maxlen] = '\0'; + Msg->cm_lengths[WhichToCut] = maxlen; + } } void CM_FlushField(struct CtdlMessage *Msg, eMsgField which) @@ -192,6 +164,19 @@ void CM_FlushField(struct CtdlMessage *Msg, eMsgField which) if (Msg->cm_fields[which] != NULL) free (Msg->cm_fields[which]); Msg->cm_fields[which] = NULL; + Msg->cm_lengths[which] = 0; +} +void CM_Flush(struct CtdlMessage *Msg) +{ + int i; + + if (CM_IsValidMsg(Msg) == 0) + return; + + for (i = 0; i < 256; ++i) + { + CM_FlushField(Msg, i); + } } void CM_CopyField(struct CtdlMessage *Msg, eMsgField WhichToPutTo, eMsgField WhichtToCopy) @@ -202,13 +187,17 @@ void CM_CopyField(struct CtdlMessage *Msg, eMsgField WhichToPutTo, eMsgField Whi if (Msg->cm_fields[WhichtToCopy] != NULL) { - len = strlen(Msg->cm_fields[WhichtToCopy]); + len = Msg->cm_lengths[WhichtToCopy]; Msg->cm_fields[WhichToPutTo] = malloc(len + 1); - memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichToPutTo], len); + memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichtToCopy], len); Msg->cm_fields[WhichToPutTo][len] = '\0'; + Msg->cm_lengths[WhichToPutTo] = len; } else + { Msg->cm_fields[WhichToPutTo] = NULL; + Msg->cm_lengths[WhichToPutTo] = 0; + } } @@ -219,7 +208,7 @@ void CM_PrependToField(struct CtdlMessage *Msg, eMsgField which, const char *buf long newmsgsize; char *new; - oldmsgsize = strlen(Msg->cm_fields[which]) + 1; + oldmsgsize = Msg->cm_lengths[which] + 1; newmsgsize = length + oldmsgsize; new = malloc(newmsgsize); @@ -227,11 +216,13 @@ void CM_PrependToField(struct CtdlMessage *Msg, eMsgField which, const char *buf memcpy(new + length, Msg->cm_fields[which], oldmsgsize); free(Msg->cm_fields[which]); Msg->cm_fields[which] = new; + Msg->cm_lengths[which] = newmsgsize - 1; } else { Msg->cm_fields[which] = malloc(length + 1); memcpy(Msg->cm_fields[which], buf, length); Msg->cm_fields[which][length] = '\0'; + Msg->cm_lengths[which] = length; } } @@ -242,6 +233,7 @@ void CM_SetAsField(struct CtdlMessage *Msg, eMsgField which, char **buf, long le Msg->cm_fields[which] = *buf; *buf = NULL; + Msg->cm_lengths[which] = length; } void CM_SetAsFieldSB(struct CtdlMessage *Msg, eMsgField which, StrBuf **buf) @@ -249,6 +241,7 @@ void CM_SetAsFieldSB(struct CtdlMessage *Msg, eMsgField which, StrBuf **buf) if (Msg->cm_fields[which] != NULL) free (Msg->cm_fields[which]); + Msg->cm_lengths[which] = StrLength(*buf); Msg->cm_fields[which] = SmashStrBuf(buf); } @@ -256,9 +249,10 @@ void CM_GetAsField(struct CtdlMessage *Msg, eMsgField which, char **ret, long *r { if (Msg->cm_fields[which] != NULL) { - *retlen = strlen(Msg->cm_fields[which]); + *retlen = Msg->cm_lengths[which]; *ret = Msg->cm_fields[which]; Msg->cm_fields[which] = NULL; + Msg->cm_lengths[which] = 0; } else { @@ -289,6 +283,7 @@ void CM_FreeContents(struct CtdlMessage *msg) for (i = 0; i < 256; ++i) if (msg->cm_fields[i] != NULL) { free(msg->cm_fields[i]); + msg->cm_lengths[i] = 0; } msg->cm_magic = 0; /* just in case */ @@ -310,12 +305,13 @@ void CM_Free(struct CtdlMessage *msg) int CM_DupField(eMsgField i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg) { long len; - len = strlen(OrgMsg->cm_fields[i]); + len = OrgMsg->cm_lengths[i]; NewMsg->cm_fields[i] = malloc(len + 1); if (NewMsg->cm_fields[i] == NULL) return 0; memcpy(NewMsg->cm_fields[i], OrgMsg->cm_fields[i], len); NewMsg->cm_fields[i][len] = '\0'; + NewMsg->cm_lengths[i] = len; return 1; } @@ -351,62 +347,6 @@ struct CtdlMessage * CM_Duplicate(struct CtdlMessage *OrgMsg) -/* - * Back end for the MSGS command: output message number only. - */ -void simple_listing(long msgnum, void *userdata) -{ - cprintf("%ld\n", msgnum); -} - - - -/* - * Back end for the MSGS command: output header summary. - */ -void headers_listing(long msgnum, void *userdata) -{ - struct CtdlMessage *msg; - - msg = CtdlFetchMessage(msgnum, 0); - if (msg == NULL) { - cprintf("%ld|0|||||\n", msgnum); - return; - } - - cprintf("%ld|%s|%s|%s|%s|%s|\n", - msgnum, - (!CM_IsEmpty(msg, eTimestamp) ? msg->cm_fields[eTimestamp] : "0"), - (!CM_IsEmpty(msg, eAuthor) ? msg->cm_fields[eAuthor] : ""), - (!CM_IsEmpty(msg, eNodeName) ? msg->cm_fields[eNodeName] : ""), - (!CM_IsEmpty(msg, erFc822Addr) ? msg->cm_fields[erFc822Addr] : ""), - (!CM_IsEmpty(msg, eMsgSubject) ? msg->cm_fields[eMsgSubject] : "") - ); - CM_Free(msg); -} - -/* - * Back end for the MSGS command: output EUID header. - */ -void headers_euid(long msgnum, void *userdata) -{ - struct CtdlMessage *msg; - - msg = CtdlFetchMessage(msgnum, 0); - if (msg == NULL) { - cprintf("%ld||\n", msgnum); - return; - } - - cprintf("%ld|%s|%s\n", - msgnum, - (!CM_IsEmpty(msg, eExclusiveID) ? msg->cm_fields[eExclusiveID] : ""), - (!CM_IsEmpty(msg, eTimestamp) ? msg->cm_fields[eTimestamp] : "0")); - CM_Free(msg); -} - - - /* Determine if a given message matches the fields in a message template. @@ -430,8 +370,9 @@ int CtdlMsgCmp(struct CtdlMessage *msg, struct CtdlMessage *template) { if (IsEmptyStr(template->cm_fields[i])) continue; return 1; } - if (strcasecmp(msg->cm_fields[i], - template->cm_fields[i])) return 1; + if ((template->cm_lengths[i] != msg->cm_lengths[i]) || + (strcasecmp(msg->cm_fields[i], template->cm_fields[i]))) + return 1; } } @@ -797,7 +738,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, free(msglist); return -1; } - msg = CtdlFetchMessage(msglist[a], 1); + msg = CtdlFetchMessage(msglist[a], 1, 1); if (msg != NULL) { if (CtdlMsgCmp(msg, compare)) { msglist[a] = 0L; @@ -917,106 +858,6 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, -/* - * cmd_msgs() - get list of message #'s in this room - * implements the MSGS server command using CtdlForEachMessage() - */ -void cmd_msgs(char *cmdbuf) -{ - int mode = 0; - 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; - char search_string[1024]; - ForEachMsgCallback CallBack; - - if (CtdlAccessCheck(ac_logged_in_or_guest)) return; - - extract_token(which, cmdbuf, 0, '|', sizeof which); - cm_ref = extract_int(cmdbuf, 1); - extract_token(search_string, cmdbuf, 1, '|', sizeof search_string); - with_template = extract_int(cmdbuf, 2); - switch (extract_int(cmdbuf, 3)) - { - default: - case MSG_HDRS_BRIEF: - CallBack = simple_listing; - break; - case MSG_HDRS_ALL: - CallBack = headers_listing; - break; - case MSG_HDRS_EUID: - CallBack = headers_euid; - break; - } - - strcat(which, " "); - if (!strncasecmp(which, "OLD", 3)) - mode = MSGS_OLD; - else if (!strncasecmp(which, "NEW", 3)) - mode = MSGS_NEW; - else if (!strncasecmp(which, "FIRST", 5)) - mode = MSGS_FIRST; - else if (!strncasecmp(which, "LAST", 4)) - mode = MSGS_LAST; - else if (!strncasecmp(which, "GT", 2)) - mode = MSGS_GT; - else if (!strncasecmp(which, "LT", 2)) - mode = MSGS_LT; - else if (!strncasecmp(which, "SEARCH", 6)) - mode = MSGS_SEARCH; - else - mode = MSGS_ALL; - - if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) { - cprintf("%d Full text index is not enabled on this server.\n", - ERROR + CMD_NOT_SUPPORTED); - return; - } - - if (with_template) { - unbuffer_output(); - cprintf("%d Send template then receive message list\n", - START_CHAT_MODE); - template = (struct CtdlMessage *) - malloc(sizeof(struct CtdlMessage)); - memset(template, 0, sizeof(struct CtdlMessage)); - template->cm_magic = CTDLMESSAGE_MAGIC; - template->cm_anon_type = MES_NORMAL; - - while(client_getln(buf, sizeof buf) >= 0 && strcmp(buf,"000")) { - long tValueLen; - extract_token(tfield, buf, 0, '|', sizeof tfield); - tValueLen = extract_token(tvalue, buf, 1, '|', sizeof tvalue); - for (i='A'; i<='Z'; ++i) if (msgkeys[i]!=NULL) { - if (!strcasecmp(tfield, msgkeys[i])) { - CM_SetField(template, i, tvalue, tValueLen); - } - } - } - buffer_output(); - } - else { - cprintf("%d \n", LISTING_FOLLOWS); - } - - CtdlForEachMessage(mode, - ( (mode == MSGS_SEARCH) ? 0 : cm_ref ), - ( (mode == MSGS_SEARCH) ? search_string : NULL ), - NULL, - template, - CallBack, - NULL); - if (template != NULL) CM_Free(template); - cprintf("000\n"); -} - - /* * memfmout() - Citadel text formatter and paginator. * Although the original purpose of this routine was to format @@ -1101,7 +942,6 @@ void memfmout( MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } - len = 0; client_write(nl, nllen); column = 0; } @@ -1172,7 +1012,9 @@ void list_this_suff(char *name, char *filename, char *partnum, char *disp, /* * Callback function for mime parser that opens a section for downloading + * we use serv_files function here: */ +extern void OpenCmdResult(char *filename, const char *mime_type); void mime_download(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata) @@ -1242,32 +1084,18 @@ void mime_spew_section(char *name, char *filename, char *partnum, char *disp, } } - -/* - * Load a message from disk into memory. - * This is used by CtdlOutputMsg() and other fetch functions. - * - * NOTE: Caller is responsible for freeing the returned CtdlMessage struct - * using the CtdlMessageFree() function. - */ -struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) +struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const char *Buffer, long Length) { struct CitContext *CCC = CC; - struct cdbdata *dmsgtext; struct CtdlMessage *ret = NULL; - char *mptr; - char *upper_bound; + const char *mptr; + const char *upper_bound; cit_uint8_t ch; cit_uint8_t field_header; + eMsgField which; - MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); - dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long)); - if (dmsgtext == NULL) { - MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body); - return NULL; - } - mptr = dmsgtext->ptr; - upper_bound = mptr + dmsgtext->len; + mptr = Buffer; + upper_bound = Buffer + Length; /* Parse the three bytes that begin EVERY message on disk. * The first is always 0xFF, the on-disk magic number. @@ -1277,7 +1105,6 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) ch = *mptr++; if (ch != 255) { MSG_syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum); - cdb_free(dmsgtext); return NULL; } ret = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage)); @@ -1293,20 +1120,67 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) * have just processed the 'M' (message text) field. */ do { + field_header = '\0'; long len; + + /* work around possibly buggy messages: */ + while (field_header == '\0') + { + if (mptr >= upper_bound) { + break; + } + field_header = *mptr++; + } if (mptr >= upper_bound) { break; } - field_header = *mptr++; + which = field_header; len = strlen(mptr); - CM_SetField(ret, field_header, mptr, len); + + CM_SetField(ret, which, mptr, len); mptr += len + 1; /* advance to next field */ } while ((mptr < upper_bound) && (field_header != 'M')); + return (ret); +} + + +/* + * Load a message from disk into memory. + * This is used by CtdlOutputMsg() and other fetch functions. + * + * NOTE: Caller is responsible for freeing the returned CtdlMessage struct + * using the CtdlMessageFree() function. + */ +struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body, int run_msg_hooks) +{ + struct CitContext *CCC = CC; + struct cdbdata *dmsgtext; + struct CtdlMessage *ret = NULL; + + MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); + dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long)); + if (dmsgtext == NULL) { + MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body); + return NULL; + } + + if (dmsgtext->ptr[dmsgtext->len - 1] != '\0') + { + MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Forcefully terminating message!!\n", msgnum, with_body); + dmsgtext->ptr[dmsgtext->len - 1] = '\0'; + } + + ret = CtdlDeserializeMessage(msgnum, with_body, dmsgtext->ptr, dmsgtext->len); + cdb_free(dmsgtext); + if (ret == NULL) { + return NULL; + } + /* Always make sure there's something in the msg text field. If * it's NULL, the message text is most likely stored separately, * so go ahead and fetch that. Failing that, just set a dummy @@ -1315,7 +1189,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) if ( (CM_IsEmpty(ret, eMesageText)) && (with_body) ) { dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long)); if (dmsgtext != NULL) { - CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len); + CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len - 1); cdb_free(dmsgtext); } } @@ -1324,7 +1198,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) } /* Perform "before read" hooks (aborting if any return nonzero) */ - if (PerformMessageHooks(ret, EVT_BEFOREREAD) > 0) { + if (run_msg_hooks && (PerformMessageHooks(ret, NULL, EVT_BEFOREREAD) > 0)) { CM_Free(ret); return NULL; } @@ -1661,14 +1535,15 @@ int check_cached_msglist(long msgnum) { * */ 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? */ - char *section, /* NULL or a message/rfc822 section */ - int flags, /* various flags; see msgbase.h */ - char **Author, - char **Address + 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? */ + char *section, /* NULL or a message/rfc822 section */ + int flags, /* various flags; see msgbase.h */ + char **Author, + char **Address, + char **MessageID ) { struct CitContext *CCC = CC; struct CtdlMessage *TheMessage = NULL; @@ -1723,10 +1598,10 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ * request that we don't even bother loading the body into memory. */ if (headers_only == HEADERS_FAST) { - TheMessage = CtdlFetchMessage(msg_num, 0); + TheMessage = CtdlFetchMessage(msg_num, 0, 1); } else { - TheMessage = CtdlFetchMessage(msg_num, 1); + TheMessage = CtdlFetchMessage(msg_num, 1, 1); } if (TheMessage == NULL) { @@ -1741,21 +1616,25 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ if (section) if (!IsEmptyStr(section)) if (strcmp(section, "0")) { memset(&encap, 0, sizeof encap); safestrncpy(encap.desired_section, section, sizeof encap.desired_section); - mime_parser(TheMessage->cm_fields[eMesageText], - NULL, - *extract_encapsulated_message, - NULL, NULL, (void *)&encap, 0 - ); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *extract_encapsulated_message, + NULL, NULL, (void *)&encap, 0 + ); if ((Author != NULL) && (*Author == NULL)) { - *Author = TheMessage->cm_fields[eAuthor]; - TheMessage->cm_fields[eAuthor] = NULL; + long len; + CM_GetAsField(TheMessage, eAuthor, Author, &len); } if ((Address != NULL) && (*Address == NULL)) { - *Address = TheMessage->cm_fields[erFc822Addr]; - TheMessage->cm_fields[erFc822Addr] = NULL; + long len; + CM_GetAsField(TheMessage, erFc822Addr, Address, &len); + } + if ((MessageID != NULL) && (*MessageID == NULL)) + { + long len; + CM_GetAsField(TheMessage, emessageId, MessageID, &len); } CM_Free(TheMessage); TheMessage = NULL; @@ -1788,13 +1667,18 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ retcode = CtdlOutputPreLoadedMsg(TheMessage, mode, headers_only, do_proto, crlf, flags); if ((Author != NULL) && (*Author == NULL)) { - *Author = TheMessage->cm_fields[eAuthor]; - TheMessage->cm_fields[eAuthor] = NULL; + long len; + CM_GetAsField(TheMessage, eAuthor, Author, &len); } if ((Address != NULL) && (*Address == NULL)) { - *Address = TheMessage->cm_fields[erFc822Addr]; - TheMessage->cm_fields[erFc822Addr] = NULL; + long len; + CM_GetAsField(TheMessage, erFc822Addr, Address, &len); + } + if ((MessageID != NULL) && (*MessageID == NULL)) + { + long len; + CM_GetAsField(TheMessage, emessageId, MessageID, &len); } CM_Free(TheMessage); @@ -1882,7 +1766,7 @@ void OutputCtdlMsgHeaders( void OutputRFC822MsgHeaders( struct CtdlMessage *TheMessage, int flags, /* should the bessage be exported clean */ - const char *nl, + const char *nl, int nlen, char *mid, long sizeof_mid, char *suser, long sizeof_suser, char *luser, long sizeof_luser, @@ -1897,28 +1781,28 @@ void OutputRFC822MsgHeaders( char *mpptr = NULL; char *hptr; - for (i = 0; i < 256; ++i) { - if (TheMessage->cm_fields[i]) { - mptr = mpptr = TheMessage->cm_fields[i]; - - if (i == eAuthor) { + for (i = 0; i < NDiskFields; ++i) { + if (TheMessage->cm_fields[FieldOrder[i]]) { + mptr = mpptr = TheMessage->cm_fields[FieldOrder[i]]; + switch (FieldOrder[i]) { + case eAuthor: safestrncpy(luser, mptr, sizeof_luser); safestrncpy(suser, mptr, sizeof_suser); - } - else if (i == 'Y') { + break; + case eCarbonCopY: if ((flags & QP_EADDR) != 0) { mptr = qp_encode_email_addrs(mptr); } sanitize_truncated_recipient(mptr); cprintf("CC: %s%s", mptr, nl); - } - else if (i == 'P') { + break; + case eMessagePath: cprintf("Return-Path: %s%s", mptr, nl); - } - else if (i == eListID) { + break; + case eListID: cprintf("List-ID: %s%s", mptr, nl); - } - else if (i == 'V') { + break; + case eenVelopeTo: if ((flags & QP_EADDR) != 0) mptr = qp_encode_email_addrs(mptr); hptr = mptr; @@ -1926,26 +1810,29 @@ void OutputRFC822MsgHeaders( hptr ++; if (!IsEmptyStr(hptr)) cprintf("Envelope-To: %s%s", hptr, nl); - } - else if (i == 'U') { + break; + case eMsgSubject: cprintf("Subject: %s%s", mptr, nl); subject_found = 1; - } - else if (i == 'I') + break; + case emessageId: safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found. - else if (i == erFc822Addr) + break; + case erFc822Addr: safestrncpy(fuser, mptr, sizeof_fuser); - /* else if (i == 'O') + /* case eOriginalRoom: cprintf("X-Citadel-Room: %s%s", - mptr, nl); */ - else if (i == 'N') + mptr, nl) + break; + ; */ + case eNodeName: safestrncpy(snode, mptr, sizeof_snode); - else if (i == 'R') - { + break; + case eRecipient: if (haschar(mptr, '@') == 0) { sanitize_truncated_recipient(mptr); - cprintf("To: %s@%s", mptr, config.c_fqdn); + cprintf("To: %s@%s", mptr, CtdlGetConfigStr("c_fqdn")); cprintf("%s", nl); } else @@ -1957,13 +1844,13 @@ void OutputRFC822MsgHeaders( cprintf("To: %s", mptr); cprintf("%s", nl); } - } - else if (i == 'T') { + break; + case eTimestamp: datestring(datestamp, sizeof datestamp, atol(mptr), DATESTRING_RFC822); cprintf("Date: %s%s", datestamp, nl); - } - else if (i == 'W') { + break; + case eWeferences: cprintf("References: "); k = num_tokens(mptr, '|'); for (j=0; jcm_fields[eMesageText]; @@ -2064,12 +1970,16 @@ void Dump_RFC822HeadersBody( MSGM_syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n"); return; } + lfSent = (outbuf[outlen - 1] == '\n'); outlen = 0; } } if (outlen > 0) { client_write(outbuf, outlen); + lfSent = (outbuf[outlen - 1] == '\n'); } + if (!lfSent) + client_write(nl, nlen); } @@ -2081,13 +1991,12 @@ void Dump_RFC822HeadersBody( void DumpFormatFixed( struct CtdlMessage *TheMessage, int mode, /* how would you like that message? */ - const char *nl) + const char *nl, int nllen) { cit_uint8_t ch; char buf[SIZ]; int buflen; int xlline = 0; - int nllen = strlen (nl); char *mptr; mptr = TheMessage->cm_fields[eMesageText]; @@ -2161,8 +2070,8 @@ int CtdlOutputPreLoadedMsg( ) { struct CitContext *CCC = CC; int i; - char *mptr = NULL; const char *nl; /* newline string */ + int nlen; struct ma_info ma; /* Buffers needed for RFC822 translation. These are all filled @@ -2181,6 +2090,7 @@ int CtdlOutputPreLoadedMsg( strcpy(mid, "unknown"); nl = (crlf ? "\r\n" : "\n"); + nlen = crlf ? 2 : 1; if (!CM_IsValidMsg(TheMessage)) { MSGM_syslog(LOG_ERR, @@ -2193,7 +2103,7 @@ int CtdlOutputPreLoadedMsg( * Pad it with spaces in order to avoid changing the RFC822 length of the message. */ if ( (flags & SUPPRESS_ENV_TO) && (!CM_IsEmpty(TheMessage, eenVelopeTo)) ) { - memset(TheMessage->cm_fields[eenVelopeTo], ' ', strlen(TheMessage->cm_fields[eenVelopeTo])); + memset(TheMessage->cm_fields[eenVelopeTo], ' ', TheMessage->cm_lengths[eenVelopeTo]); } /* Are we downloading a MIME component? */ @@ -2208,8 +2118,8 @@ int CtdlOutputPreLoadedMsg( ERROR + RESOURCE_BUSY); } else { /* Parse the message text component */ - mptr = TheMessage->cm_fields[eMesageText]; - mime_parser(mptr, NULL, *mime_download, NULL, NULL, NULL, 0); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *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 */ @@ -2235,8 +2145,8 @@ int CtdlOutputPreLoadedMsg( /* Parse the message text component */ int found_it = 0; - mptr = TheMessage->cm_fields[eMesageText]; - mime_parser(mptr, NULL, *mime_spew_section, NULL, NULL, (void *)&found_it, 0); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *mime_spew_section, NULL, NULL, (void *)&found_it, 0); /* If section wasn't found, print an error */ if (!found_it) { @@ -2276,12 +2186,12 @@ int CtdlOutputPreLoadedMsg( strcpy(suser, ""); strcpy(luser, ""); strcpy(fuser, ""); - strcpy(snode, NODENAME); + memcpy(snode, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")) + 1); if (mode == MT_RFC822) OutputRFC822MsgHeaders( TheMessage, flags, - nl, + nl, nlen, mid, sizeof(mid), suser, sizeof(suser), luser, sizeof(luser), @@ -2333,9 +2243,8 @@ 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) ) { - mptr = TheMessage->cm_fields[eMesageText]; memset(&ma, 0, sizeof(struct ma_info)); - mime_parser(mptr, NULL, + mime_parser(CM_RANGE(TheMessage, eMesageText), (do_proto ? *list_this_part : NULL), (do_proto ? *list_this_pref : NULL), (do_proto ? *list_this_suff : NULL), @@ -2346,7 +2255,7 @@ START_TEXT: TheMessage, headers_only, flags, - nl); + nl, nlen); goto DONE; } } @@ -2364,7 +2273,7 @@ START_TEXT: DumpFormatFixed( TheMessage, mode, /* how would you like that message? */ - nl); + nl, nlen); /* If the message on disk is format 0 (Citadel vari-format), we * output using the formatter at 80 columns. This is the final output @@ -2374,12 +2283,10 @@ START_TEXT: * message to the reader's screen width. */ if (TheMessage->cm_format_type == FMT_CITADEL) { - mptr = TheMessage->cm_fields[eMesageText]; - if (mode == MT_MIME) { cprintf("Content-type: text/x-citadel-variformat\n\n"); } - memfmout(mptr, nl); + memfmout(TheMessage->cm_fields[eMesageText], nl); } /* If the message on disk is format 4 (MIME), we've gotta hand it @@ -2395,17 +2302,17 @@ START_TEXT: strcpy(ma.chosen_part, "1"); ma.chosen_pref = 9999; ma.dont_decode = CCC->msg4_dont_decode; - mime_parser(mptr, NULL, - *choose_preferred, *fixed_output_pre, - *fixed_output_post, (void *)&ma, 1); - mime_parser(mptr, NULL, - *output_preferred, NULL, NULL, (void *)&ma, 1); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *choose_preferred, *fixed_output_pre, + *fixed_output_post, (void *)&ma, 1); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *output_preferred, NULL, NULL, (void *)&ma, 1); } else { ma.use_fo_hooks = 1; - mime_parser(mptr, NULL, - *fixed_output, *fixed_output_pre, - *fixed_output_post, (void *)&ma, 0); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *fixed_output, *fixed_output_pre, + *fixed_output_post, (void *)&ma, 0); } } @@ -2415,141 +2322,6 @@ DONE: /* now we're done */ return(om_ok); } - -/* - * display a message (mode 0 - Citadel proprietary) - */ -void cmd_msg0(char *cmdbuf) -{ - long msgid; - int headers_only = HEADERS_ALL; - - msgid = extract_long(cmdbuf, 0); - headers_only = extract_int(cmdbuf, 1); - - CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0, NULL, 0, NULL, NULL); - return; -} - - -/* - * display a message (mode 2 - RFC822) - */ -void cmd_msg2(char *cmdbuf) -{ - long msgid; - int headers_only = HEADERS_ALL; - - msgid = extract_long(cmdbuf, 0); - headers_only = extract_int(cmdbuf, 1); - - CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL, 0, NULL, NULL); -} - - - -/* - * display a message (mode 3 - IGnet raw format - internal programs only) - */ -void cmd_msg3(char *cmdbuf) -{ - long msgnum; - struct CtdlMessage *msg = NULL; - struct ser_ret smr; - - if (CC->internal_pgm == 0) { - cprintf("%d This command is for internal programs only.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return; - } - - msgnum = extract_long(cmdbuf, 0); - msg = CtdlFetchMessage(msgnum, 1); - if (msg == NULL) { - cprintf("%d Message %ld not found.\n", - ERROR + MESSAGE_NOT_FOUND, msgnum); - return; - } - - serialize_message(&smr, msg); - CM_Free(msg); - - if (smr.len == 0) { - cprintf("%d Unable to serialize message\n", - ERROR + INTERNAL_ERROR); - return; - } - - cprintf("%d %ld\n", BINARY_FOLLOWS, (long)smr.len); - client_write((char *)smr.ser, (int)smr.len); - free(smr.ser); -} - - - -/* - * Display a message using MIME content types - */ -void cmd_msg4(char *cmdbuf) -{ - long msgid; - char section[64]; - - msgid = extract_long(cmdbuf, 0); - extract_token(section, cmdbuf, 1, '|', sizeof section); - CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0, (section[0] ? section : NULL) , 0, NULL, NULL); -} - - - -/* - * Client tells us its preferred message format(s) - */ -void cmd_msgp(char *cmdbuf) -{ - if (!strcasecmp(cmdbuf, "dont_decode")) { - CC->msg4_dont_decode = 1; - cprintf("%d MSG4 will not pre-decode messages.\n", CIT_OK); - } - else { - safestrncpy(CC->preferred_formats, cmdbuf, sizeof(CC->preferred_formats)); - cprintf("%d Preferred MIME formats have been set.\n", CIT_OK); - } -} - - -/* - * Open a component of a MIME message as a download file - */ -void cmd_opna(char *cmdbuf) -{ - long msgid; - char desired_section[128]; - - 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, NULL, 0, NULL, NULL); -} - - -/* - * Open a component of a MIME message and transmit it all at once - */ -void cmd_dlat(char *cmdbuf) -{ - long msgid; - char desired_section[128]; - - 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_SPEW_SECTION, 0, 1, 1, NULL, 0, NULL, NULL); -} - - /* * Save one or more message pointers into a specified room * (Returns 0 for success, nonzero for failure) @@ -2673,7 +2445,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms msg = supplied_msg; } else { - msg = CtdlFetchMessage(msgid, 0); + msg = CtdlFetchMessage(msgid, 0, 1); } if (msg != NULL) { @@ -2739,71 +2511,101 @@ int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, * called by server-side modules. * */ -long send_message(struct CtdlMessage *msg) { +long CtdlSaveThisMessage(struct CtdlMessage *msg, long msgid, int Reply) { struct CitContext *CCC = CC; - long newmsgid; long retval; - char msgidbuf[256]; - long msgidbuflen; struct ser_ret smr; int is_bigmsg = 0; char *holdM = NULL; + long holdMLen = 0; - /* Get a new message number */ - newmsgid = get_new_message_number(); - msgidbuflen = snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s", - (long unsigned int) time(NULL), - (long unsigned int) newmsgid, - config.c_fqdn - ); - - /* Generate an ID if we don't have one already */ - if (CM_IsEmpty(msg, emessageId)) { - CM_SetField(msg, emessageId, msgidbuf, msgidbuflen); - } - - /* If the message is big, set its body aside for storage elsewhere */ - if (!CM_IsEmpty(msg, eMesageText)) { - if (strlen(msg->cm_fields[eMesageText]) > BIGMSG) { - is_bigmsg = 1; - holdM = msg->cm_fields[eMesageText]; - msg->cm_fields[eMesageText] = NULL; - } - } + /* + * If the message is big, set its body aside for storage elsewhere + * and we hide the message body from the serializer + */ + if (!CM_IsEmpty(msg, eMesageText) && msg->cm_lengths[eMesageText] > BIGMSG) + { + is_bigmsg = 1; + holdM = msg->cm_fields[eMesageText]; + msg->cm_fields[eMesageText] = NULL; + holdMLen = msg->cm_lengths[eMesageText]; + msg->cm_lengths[eMesageText] = 0; + } /* Serialize our data structure for storage in the database */ - serialize_message(&smr, msg); + CtdlSerializeMessage(&smr, msg); if (is_bigmsg) { + /* put the message body back into the message */ msg->cm_fields[eMesageText] = holdM; + msg->cm_lengths[eMesageText] = holdMLen; } if (smr.len == 0) { - cprintf("%d Unable to serialize message\n", - ERROR + INTERNAL_ERROR); + if (Reply) { + cprintf("%d Unable to serialize message\n", + ERROR + INTERNAL_ERROR); + } + else { + MSGM_syslog(LOG_ERR, "CtdlSaveMessage() unable to serialize message"); + + } return (-1L); } /* Write our little bundle of joy into the message base */ - if (cdb_store(CDB_MSGMAIN, &newmsgid, (int)sizeof(long), - smr.ser, smr.len) < 0) { - MSGM_syslog(LOG_ERR, "Can't store message\n"); - retval = 0L; - } else { + retval = cdb_store(CDB_MSGMAIN, &msgid, (int)sizeof(long), + smr.ser, smr.len); + if (retval < 0) { + MSG_syslog(LOG_ERR, "Can't store message %ld: %ld", msgid, retval); + } + else { if (is_bigmsg) { - cdb_store(CDB_BIGMSGS, - &newmsgid, - (int)sizeof(long), - holdM, - (strlen(holdM) + 1) + retval = cdb_store(CDB_BIGMSGS, + &msgid, + (int)sizeof(long), + holdM, + (holdMLen + 1) ); + if (retval < 0) { + MSG_syslog(LOG_ERR, "failed to store message body for msgid %ld: %ld", + msgid, retval); + } } - retval = newmsgid; } /* Free the memory we used for the serialized message */ free(smr.ser); + return(retval); +} + +long send_message(struct CtdlMessage *msg) { + long newmsgid; + long retval; + char msgidbuf[256]; + long msgidbuflen; + + /* Get a new message number */ + newmsgid = get_new_message_number(); + + /* Generate an ID if we don't have one already */ + if (CM_IsEmpty(msg, emessageId)) { + msgidbuflen = snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s", + (long unsigned int) time(NULL), + (long unsigned int) newmsgid, + CtdlGetConfigStr("c_fqdn") + ); + + CM_SetField(msg, emessageId, msgidbuf, msgidbuflen); + } + + retval = CtdlSaveThisMessage(msg, newmsgid, 1); + + if (retval == 0) { + retval = newmsgid; + } + /* Return the *local* message ID to the caller * (even if we're storing an incoming network message) */ @@ -2819,21 +2621,18 @@ long send_message(struct CtdlMessage *msg) { * contains the length of the serialized message and a pointer to the * serialized message in memory. THE LATTER MUST BE FREED BY THE CALLER. */ -void serialize_message(struct ser_ret *ret, /* return values */ - struct CtdlMessage *msg) /* unserialized msg */ +void CtdlSerializeMessage(struct ser_ret *ret, /* return values */ + struct CtdlMessage *msg) /* unserialized msg */ { struct CitContext *CCC = CC; - size_t wlen, fieldlen; + size_t wlen; int i; - long lengths[NDiskFields]; - - memset(lengths, 0, sizeof(lengths)); /* * Check for valid message format */ if (CM_IsValidMsg(msg) == 0) { - MSGM_syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n"); + MSGM_syslog(LOG_ERR, "CtdlSerializeMessage() aborting due to invalid message\n"); ret->len = 0; ret->ser = NULL; return; @@ -2842,14 +2641,11 @@ void serialize_message(struct ser_ret *ret, /* return values */ ret->len = 3; for (i=0; i < NDiskFields; ++i) if (msg->cm_fields[FieldOrder[i]] != NULL) - { - lengths[i] = strlen(msg->cm_fields[FieldOrder[i]]); - ret->len += lengths[i] + 2; - } + ret->len += msg->cm_lengths[FieldOrder[i]] + 2; ret->ser = malloc(ret->len); if (ret->ser == NULL) { - MSG_syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n", + MSG_syslog(LOG_ERR, "CtdlSerializeMessage() malloc(%ld) failed: %s\n", (long)ret->len, strerror(errno)); ret->len = 0; ret->ser = NULL; @@ -2864,14 +2660,13 @@ void serialize_message(struct ser_ret *ret, /* return values */ for (i=0; i < NDiskFields; ++i) if (msg->cm_fields[FieldOrder[i]] != NULL) { - fieldlen = lengths[i]; ret->ser[wlen++] = (char)FieldOrder[i]; memcpy(&ret->ser[wlen], msg->cm_fields[FieldOrder[i]], - fieldlen+1); + msg->cm_lengths[FieldOrder[i]] + 1); - wlen = wlen + fieldlen + 1; + wlen = wlen + msg->cm_lengths[FieldOrder[i]] + 1; } if (ret->len != wlen) { @@ -2916,37 +2711,28 @@ void ReplicationChecks(struct CtdlMessage *msg) { * Save a message to disk and submit it into the delivery system. */ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ - struct recptypes *recps, /* recipients (if mail) */ + recptypes *recps, /* recipients (if mail) */ const char *force, /* force a particular room? */ int flags /* should the message be exported clean? */ ) { - char submit_filename[128]; char hold_rm[ROOMNAMELEN]; char actual_rm[ROOMNAMELEN]; char force_room[ROOMNAMELEN]; char content_type[SIZ]; /* We have to learn this */ char recipient[SIZ]; + char bounce_to[1024]; const char *room; long newmsgid; const char *mptr = NULL; struct ctdluser userbuf; int a, i; struct MetaData smi; - FILE *network_fp = NULL; - static int seqnum = 1; - struct CtdlMessage *imsg = NULL; - char *instr = NULL; - size_t instr_alloc = 0; - struct ser_ret smr; - char *hold_R, *hold_D; char *collected_addresses = NULL; struct addresses_to_be_filed *aptr = NULL; StrBuf *saved_rfc822_version = NULL; int qualified_for_journaling = 0; CitContext *CCC = MyContext(); - char bounce_to[1024] = ""; - int rv = 0; MSGM_syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n"); if (CM_IsValidMsg(msg) == 0) return(-1); /* self check */ @@ -3027,7 +2813,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (TWITDETECT) { if (CCC->user.axlevel == AxProbU) { strcpy(hold_rm, actual_rm); - strcpy(actual_rm, config.c_twitroom); + strcpy(actual_rm, CtdlGetConfigStr("c_twitroom")); MSGM_syslog(LOG_DEBUG, "Diverting to twit room\n"); } } @@ -3040,7 +2826,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ MSG_syslog(LOG_INFO, "Final selection: %s (%s)\n", actual_rm, room); if (strcasecmp(actual_rm, CCC->room.QRname)) { /* CtdlGetRoom(&CCC->room, actual_rm); */ - CtdlUserGoto(actual_rm, 0, 1, NULL, NULL); + CtdlUserGoto(actual_rm, 0, 1, NULL, NULL, NULL, NULL); } /* @@ -3052,7 +2838,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Perform "before save" hooks (aborting if any return nonzero) */ MSGM_syslog(LOG_DEBUG, "Performing before-save hooks\n"); - if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3); + if (PerformMessageHooks(msg, recps, EVT_BEFORESAVE) > 0) return(-3); /* * If this message has an Exclusive ID, and the room is replication @@ -3110,7 +2896,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if ((!CCC->internal_pgm) || (recps == NULL)) { if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) { MSGM_syslog(LOG_ERR, "ERROR saving message pointer!\n"); - CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); + CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg); } } @@ -3130,184 +2916,64 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Bump this user's messages posted counter. */ MSGM_syslog(LOG_DEBUG, "Updating user\n"); - CtdlGetUserLock(&CCC->user, CCC->curr_user); + CtdlLockGetCurrentUser(); CCC->user.posted = CCC->user.posted + 1; - CtdlPutUserLock(&CCC->user); + CtdlPutCurrentUserLock(); /* Decide where bounces need to be delivered */ - if ((recps != NULL) && (recps->bounce_to != NULL)) { - safestrncpy(bounce_to, recps->bounce_to, sizeof bounce_to); - } - else if (CCC->logged_in) { - snprintf(bounce_to, sizeof bounce_to, "%s@%s", CCC->user.fullname, config.c_nodename); - } - else { - snprintf(bounce_to, sizeof bounce_to, "%s@%s", msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]); + if ((recps != NULL) && (recps->bounce_to == NULL)) + { + if (CCC->logged_in) + snprintf(bounce_to, sizeof bounce_to, "%s@%s", + CCC->user.fullname, CtdlGetConfigStr("c_nodename")); + else + snprintf(bounce_to, sizeof bounce_to, "%s@%s", + msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]); + recps->bounce_to = bounce_to; } + + CM_SetFieldLONG(msg, eVltMsgNum, newmsgid); + /* If this is private, local mail, make a copy in the * recipient's mailbox and bump the reference count. */ if ((recps != NULL) && (recps->num_local > 0)) - for (i=0; irecp_local, '|'); ++i) { - long recipientlen; - recipientlen = extract_token(recipient, - recps->recp_local, i, - '|', sizeof recipient); - MSG_syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n", - recipient); + { + char *pch; + int ntokens; + + pch = recps->recp_local; + recps->recp_local = recipient; + ntokens = num_tokens(pch, '|'); + for (i=0; i\n", recipient); if (CtdlGetUser(&userbuf, recipient) == 0) { CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg); CtdlBumpNewMailCounter(userbuf.usernum); - if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) { - /* Generate a instruction message for the Funambol notification - * server, in the same style as the SMTP queue - */ - long instrlen; - instr_alloc = 1024; - instr = malloc(instr_alloc); - instrlen = snprintf( - instr, instr_alloc, - "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n" - "bounceto|%s\n", - SPOOLMIME, - newmsgid, - (long)time(NULL), //todo: time() is expensive! - bounce_to - ); - - 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; - CM_SetField(imsg, eMsgSubject, HKEY("QMSG")); - CM_SetField(imsg, eAuthor, HKEY("Citadel")); - CM_SetField(imsg, eJournal, HKEY("do not journal")); - CM_SetAsField(imsg, eMesageText, &instr, instrlen); - CM_SetField(imsg, eExtnotify, recipient, recipientlen); - CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM, 0); - CM_Free(imsg); - } + PerformMessageHooks(msg, recps, EVT_AFTERUSRMBOXSAVE); } else { MSG_syslog(LOG_DEBUG, "No user <%s>\n", recipient); - CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); + CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg); } } + recps->recp_local = pch; + } /* Perform "after save" hooks */ MSGM_syslog(LOG_DEBUG, "Performing after-save hooks\n"); - CM_SetFieldLONG(msg, eVltMsgNum, newmsgid); - PerformMessageHooks(msg, EVT_AFTERSAVE); + PerformMessageHooks(msg, recps, EVT_AFTERSAVE); CM_FlushField(msg, eVltMsgNum); - /* For IGnet mail, we have to save a new copy into the spooler for - * each recipient, with the R and D fields set to the recipient and - * destination-node. This has two ugly side effects: all other - * recipients end up being unlisted in this recipient's copy of the - * message, and it has to deliver multiple messages to the same - * node. We'll revisit this again in a year or so when everyone has - * a network spool receiver that can handle the new style messages. - */ - if ((recps != NULL) && (recps->num_ignet > 0)) - for (i=0; irecp_ignet, '|'); ++i) { - extract_token(recipient, recps->recp_ignet, i, - '|', sizeof recipient); - - hold_R = msg->cm_fields[eRecipient]; - hold_D = msg->cm_fields[eDestination]; - msg->cm_fields[eRecipient] = malloc(SIZ); - msg->cm_fields[eDestination] = malloc(128); - extract_token(msg->cm_fields[eRecipient], recipient, 0, '@', SIZ); - extract_token(msg->cm_fields[eDestination], recipient, 1, '@', 128); - - serialize_message(&smr, msg); - if (smr.len > 0) { - snprintf(submit_filename, sizeof submit_filename, - "%s/netmail.%04lx.%04x.%04x", - ctdl_netin_dir, - (long) getpid(), CCC->cs_pid, ++seqnum); - network_fp = fopen(submit_filename, "wb+"); - if (network_fp != NULL) { - rv = fwrite(smr.ser, smr.len, 1, network_fp); - if (rv == -1) { - MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n", - strerror(errno)); - } - fclose(network_fp); - } - free(smr.ser); - } - - free(msg->cm_fields[eRecipient]); - free(msg->cm_fields[eDestination]); - msg->cm_fields[eRecipient] = hold_R; - msg->cm_fields[eDestination] = hold_D; - } - /* Go back to the room we started from */ MSG_syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm); if (strcasecmp(hold_rm, CCC->room.QRname)) - CtdlUserGoto(hold_rm, 0, 1, NULL, NULL); - - /* For internet mail, generate delivery instructions. - * Yes, this is recursive. Deal with it. Infinite recursion does - * not happen because the delivery instructions message does not - * contain a recipient. - */ - if ((recps != NULL) && (recps->num_internet > 0)) { - StrBuf *SpoolMsg = NewStrBuf(); - long nTokens; - - MSGM_syslog(LOG_DEBUG, "Generating delivery instructions\n"); - - StrBufPrintf(SpoolMsg, - "Content-type: "SPOOLMIME"\n" - "\n" - "msgid|%ld\n" - "submitted|%ld\n" - "bounceto|%s\n", - newmsgid, - (long)time(NULL), - bounce_to); - - if (recps->envelope_from != NULL) { - StrBufAppendBufPlain(SpoolMsg, HKEY("envelope_from|"), 0); - StrBufAppendBufPlain(SpoolMsg, recps->envelope_from, -1, 0); - StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0); - } - if (recps->sending_room != NULL) { - StrBufAppendBufPlain(SpoolMsg, HKEY("source_room|"), 0); - StrBufAppendBufPlain(SpoolMsg, recps->sending_room, -1, 0); - StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0); - } - - nTokens = num_tokens(recps->recp_internet, '|'); - for (i = 0; i < nTokens; i++) { - long len; - len = extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient); - if (len > 0) { - StrBufAppendBufPlain(SpoolMsg, HKEY("remote|"), 0); - StrBufAppendBufPlain(SpoolMsg, recipient, len, 0); - StrBufAppendBufPlain(SpoolMsg, HKEY("|0||\n"), 0); - } - } - - 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[eMsgSubject] = strdup("QMSG"); - imsg->cm_fields[eAuthor] = strdup("Citadel"); - imsg->cm_fields[eJournal] = strdup("do not journal"); - imsg->cm_fields[eMesageText] = SmashStrBuf(&SpoolMsg); /* imsg owns this memory now */ - CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR); - CM_Free(imsg); - } + CtdlUserGoto(hold_rm, 0, 1, NULL, NULL, NULL, NULL); /* * Any addresses to harvest for someone's address book? @@ -3337,13 +3003,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } else { if (recps == NULL) { - qualified_for_journaling = config.c_journal_pubmsgs; + qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs"); } else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) { - qualified_for_journaling = config.c_journal_email; + qualified_for_journaling = CtdlGetConfigInt("c_journal_email"); } else { - qualified_for_journaling = config.c_journal_pubmsgs; + qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs"); } } @@ -3361,6 +3027,9 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } } + if ((recps != NULL) && (recps->bounce_to == bounce_to)) + recps->bounce_to = NULL; + /* Done. */ return(newmsgid); } @@ -3378,7 +3047,7 @@ void quickie_message(const char *from, const char *subject) { struct CtdlMessage *msg; - struct recptypes *recp = NULL; + recptypes *recp = NULL; msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); @@ -3387,29 +3056,31 @@ void quickie_message(const char *from, msg->cm_format_type = format_type; if (from != NULL) { - msg->cm_fields[eAuthor] = strdup(from); + CM_SetField(msg, eAuthor, from, strlen(from)); } else if (fromaddr != NULL) { - msg->cm_fields[eAuthor] = strdup(fromaddr); - if (strchr(msg->cm_fields[eAuthor], '@')) { - *strchr(msg->cm_fields[eAuthor], '@') = 0; + char *pAt; + CM_SetField(msg, eAuthor, fromaddr, strlen(fromaddr)); + pAt = strchr(msg->cm_fields[eAuthor], '@'); + if (pAt != NULL) { + CM_CutFieldAt(msg, eAuthor, pAt - msg->cm_fields[eAuthor]); } } else { msg->cm_fields[eAuthor] = strdup("Citadel"); } - if (fromaddr != NULL) msg->cm_fields[erFc822Addr] = strdup(fromaddr); - if (room != NULL) msg->cm_fields[eOriginalRoom] = strdup(room); - msg->cm_fields[eNodeName] = strdup(NODENAME); + if (fromaddr != NULL) CM_SetField(msg, erFc822Addr, fromaddr, strlen(fromaddr)); + if (room != NULL) CM_SetField(msg, eOriginalRoom, room, strlen(room)); + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); if (to != NULL) { - msg->cm_fields[eRecipient] = strdup(to); + CM_SetField(msg, eRecipient, to, strlen(to)); recp = validate_recipients(to, NULL, 0); } if (subject != NULL) { - msg->cm_fields[eMsgSubject] = strdup(subject); + CM_SetField(msg, eMsgSubject, subject, strlen(subject)); } - msg->cm_fields[eMesageText] = strdup(text); + CM_SetField(msg, eMesageText, text, strlen(text)); CtdlSubmitMsg(msg, recp, room, 0); CM_Free(msg); @@ -3425,7 +3096,7 @@ void flood_protect_quickie_message(const char *from, const char *subject, int nCriterions, const char **CritStr, - long *CritStrLen, + const long *CritStrLen, long ccid, long ioid, time_t NOW) @@ -3436,7 +3107,8 @@ void flood_protect_quickie_message(const char *from, StrBuf *guid; char timestamp[64]; long tslen; - time_t tsday = NOW / (8*60*60); /* just care for a day... */ + static const time_t tsday = (8*60*60); /* just care for a day... */ + time_t seenstamp; tslen = snprintf(timestamp, sizeof(timestamp), "%ld", tsday); MD5Init(&md5context); @@ -3455,29 +3127,35 @@ void flood_protect_quickie_message(const char *from, if (StrLength(guid) > 40) StrBufCutAt(guid, 40, NULL); - if (CheckIfAlreadySeen("FPAideMessage", - guid, - NOW, - tsday, - eUpdate, - ccid, - ioid)!= 0) + seenstamp = CheckIfAlreadySeen("FPAideMessage", + guid, + NOW, + tsday, + eUpdate, + ccid, + ioid); + if ((seenstamp > 0) && (seenstamp < tsday)) { FreeStrBuf(&guid); /* yes, we did. flood protection kicks in. */ syslog(LOG_DEBUG, - "not sending message again\n"); + "not sending message again - %ld < %ld \n", seenstamp, tsday); return; } - FreeStrBuf(&guid); - /* no, this message isn't sent recently; go ahead. */ - quickie_message(from, - fromaddr, - to, - room, - text, - format_type, - subject); + else + { + syslog(LOG_DEBUG, + "sending message. %ld >= %ld", seenstamp, tsday); + FreeStrBuf(&guid); + /* no, this message isn't sent recently; go ahead. */ + quickie_message(from, + fromaddr, + to, + room, + text, + format_type, + subject); + } } @@ -3632,6 +3310,11 @@ eReadState CtdlReadMessageBodyAsync(AsyncIO *IO) IO->SendBuf.fd); fd = fopen(fn, "a+"); + if (fd == NULL) { + syslog(LOG_EMERG, "failed to open file %s: %s", fn, strerror(errno)); + cit_backtrace(); + exit(1); + } #endif ReadMsg = IO->ReadMsg; @@ -3713,7 +3396,7 @@ eReadState CtdlReadMessageBodyAsync(AsyncIO *IO) if (MsgFinished) return eReadSuccess; else - return eAbort; + return eReadFail; } @@ -3743,6 +3426,45 @@ char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ return SmashStrBuf(&Message); } +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 *my_email, /* which of my email addresses to use (empty is ok) */ + char *subject, /* Subject (optional) */ + char *supplied_euid, /* ...or NULL if this is irrelevant */ + char *preformatted_text, /* ...or NULL to read text from client */ + char *references /* Thread references */ +) +{ + return CtdlMakeMessageLen( + author, /* author's user structure */ + recipient, /* NULL if it's not mail */ + (recipient)?strlen(recipient) : 0, + recp_cc, /* NULL if it's not mail */ + (recp_cc)?strlen(recp_cc): 0, + room, /* room where it's going */ + (room)?strlen(room): 0, + type, /* see MES_ types in header file */ + format_type, /* variformat, plain text, MIME... */ + fake_name, /* who we're masquerading as */ + (fake_name)?strlen(fake_name): 0, + my_email, /* which of my email addresses to use (empty is ok) */ + (my_email)?strlen(my_email): 0, + subject, /* Subject (optional) */ + (subject)?strlen(subject): 0, + supplied_euid, /* ...or NULL if this is irrelevant */ + (supplied_euid)?strlen(supplied_euid):0, + preformatted_text, /* ...or NULL to read text from client */ + (preformatted_text)?strlen(preformatted_text) : 0, + references, /* Thread references */ + (references)?strlen(references):0); + +} /* * Build a binary message to be saved on disk. @@ -3752,21 +3474,34 @@ char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ * the rest of the fields when CM_Free() is called.) */ -struct CtdlMessage *CtdlMakeMessage( +struct CtdlMessage *CtdlMakeMessageLen( struct ctdluser *author, /* author's user structure */ char *recipient, /* NULL if it's not mail */ + long rcplen, char *recp_cc, /* NULL if it's not mail */ + long cclen, char *room, /* room where it's going */ + long roomlen, int type, /* see MES_ types in header file */ int format_type, /* variformat, plain text, MIME... */ char *fake_name, /* who we're masquerading as */ + long fnlen, char *my_email, /* which of my email addresses to use (empty is ok) */ + long myelen, char *subject, /* Subject (optional) */ + long subjlen, char *supplied_euid, /* ...or NULL if this is irrelevant */ + long euidlen, char *preformatted_text, /* ...or NULL to read text from client */ - char *references /* Thread references */ - ) { - char dest_node[256]; + long textlen, + char *references, /* Thread references */ + long reflen + ) +{ + struct CitContext *CCC = CC; + /* Don't confuse the poor folks if it's not routed mail. * / + char dest_node[256] = "";*/ + long blen; char buf[1024]; struct CtdlMessage *msg; StrBuf *FakeAuthor; @@ -3778,68 +3513,58 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_anon_type = type; msg->cm_format_type = format_type; - /* Don't confuse the poor folks if it's not routed mail. */ - strcpy(dest_node, ""); - - if (recipient != NULL) striplt(recipient); - if (recp_cc != NULL) striplt(recp_cc); + if (recipient != NULL) rcplen = striplt(recipient); + if (recp_cc != NULL) cclen = striplt(recp_cc); /* Path or Return-Path */ - if (my_email == NULL) my_email = ""; - - if (!IsEmptyStr(my_email)) { - msg->cm_fields[eMessagePath] = strdup(my_email); + if (myelen > 0) { + CM_SetField(msg, eMessagePath, my_email, myelen); } else { - snprintf(buf, sizeof buf, "%s", author->fullname); - msg->cm_fields[eMessagePath] = strdup(buf); + CM_SetField(msg, eMessagePath, author->fullname, strlen(author->fullname)); } convert_spaces_to_underscores(msg->cm_fields[eMessagePath]); - snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */ - msg->cm_fields[eTimestamp] = strdup(buf); + blen = snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); + CM_SetField(msg, eTimestamp, buf, blen); - if ((fake_name != NULL) && (fake_name[0])) { /* author */ - FakeAuthor = NewStrBufPlain (fake_name, -1); + if (fnlen > 0) { + FakeAuthor = NewStrBufPlain (fake_name, fnlen); } else { FakeAuthor = NewStrBufPlain (author->fullname, -1); } StrBufRFC2047encode(&FakeEncAuthor, FakeAuthor); - msg->cm_fields[eAuthor] = SmashStrBuf(&FakeEncAuthor); + CM_SetAsFieldSB(msg, eAuthor, &FakeEncAuthor); FreeStrBuf(&FakeAuthor); - if (CC->room.QRflags & QR_MAILBOX) { /* room */ - msg->cm_fields[eOriginalRoom] = strdup(&CC->room.QRname[11]); + if (CCC->room.QRflags & QR_MAILBOX) { /* room */ + CM_SetField(msg, eOriginalRoom, &CCC->room.QRname[11], strlen(&CCC->room.QRname[11])); } else { - msg->cm_fields[eOriginalRoom] = strdup(CC->room.QRname); + CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname)); } - msg->cm_fields[eNodeName] = strdup(NODENAME); /* nodename */ - msg->cm_fields[eHumanNode] = strdup(HUMANNODE); /* hnodename */ + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); + CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode"))); - if ((recipient != NULL) && (recipient[0] != 0)) { - msg->cm_fields[eRecipient] = strdup(recipient); - } - if ((recp_cc != NULL) && (recp_cc[0] != 0)) { - msg->cm_fields[eCarbonCopY] = strdup(recp_cc); + if (rcplen > 0) { + CM_SetField(msg, eRecipient, recipient, rcplen); } - if (dest_node[0] != 0) { - msg->cm_fields[eDestination] = strdup(dest_node); + if (cclen > 0) { + CM_SetField(msg, eCarbonCopY, recp_cc, cclen); } - if (!IsEmptyStr(my_email)) { - msg->cm_fields[erFc822Addr] = strdup(my_email); + if (myelen > 0) { + CM_SetField(msg, erFc822Addr, my_email, myelen); } - else if ( (author == &CC->user) && (!IsEmptyStr(CC->cs_inet_email)) ) { - msg->cm_fields[erFc822Addr] = strdup(CC->cs_inet_email); + else if ( (author == &CCC->user) && (!IsEmptyStr(CCC->cs_inet_email)) ) { + CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email)); } if (subject != NULL) { long length; - striplt(subject); - length = strlen(subject); + length = striplt(subject); if (length > 0) { long i; long IsAscii; @@ -3849,30 +3574,34 @@ struct CtdlMessage *CtdlMakeMessage( (IsAscii = isascii(subject[i]) != 0 )) i++; if (IsAscii != 0) - msg->cm_fields[eMsgSubject] = strdup(subject); + CM_SetField(msg, eMsgSubject, subject, subjlen); else /* ok, we've got utf8 in the string. */ { - msg->cm_fields[eMsgSubject] = rfc2047encode(subject, length); + char *rfc2047Subj; + rfc2047Subj = rfc2047encode(subject, length); + CM_SetAsField(msg, eMsgSubject, &rfc2047Subj, strlen(rfc2047Subj)); } } } - if (supplied_euid != NULL) { - msg->cm_fields[eExclusiveID] = strdup(supplied_euid); + if (euidlen > 0) { + CM_SetField(msg, eExclusiveID, supplied_euid, euidlen); } - if ((references != NULL) && (!IsEmptyStr(references))) { - if (msg->cm_fields[eWeferences] != NULL) - free(msg->cm_fields[eWeferences]); - msg->cm_fields[eWeferences] = strdup(references); + if (reflen > 0) { + CM_SetField(msg, eWeferences, references, reflen); } if (preformatted_text != NULL) { - msg->cm_fields[eMesageText] = preformatted_text; + CM_SetField(msg, eMesageText, preformatted_text, textlen); } else { - msg->cm_fields[eMesageText] = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0); + StrBuf *MsgBody; + MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0, 0); + if (MsgBody != NULL) { + CM_SetAsFieldSB(msg, eMesageText, &MsgBody); + } } return(msg); @@ -3880,338 +3609,12 @@ struct CtdlMessage *CtdlMakeMessage( -/* - * message entry - mode 0 (normal) - */ -void cmd_ent0(char *entargs) -{ - struct CitContext *CCC = CC; - int post = 0; - char recp[SIZ]; - char cc[SIZ]; - char bcc[SIZ]; - char supplied_euid[128]; - int anon_flag = 0; - int format_type = 0; - char newusername[256]; - char newuseremail[256]; - struct CtdlMessage *msg; - int anonymous = 0; - 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 subject_required = 0; - int do_confirm = 0; - long msgnum; - int i, j; - char buf[256]; - int newuseremail_ok = 0; - char references[SIZ]; - char *ptr; - - unbuffer_output(); - - post = extract_int(entargs, 0); - extract_token(recp, entargs, 1, '|', sizeof recp); - anon_flag = extract_int(entargs, 2); - format_type = extract_int(entargs, 3); - extract_token(subject, entargs, 4, '|', sizeof subject); - extract_token(newusername, entargs, 5, '|', sizeof newusername); - 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; - } - extract_token(newuseremail, entargs, 10, '|', sizeof newuseremail); - extract_token(references, entargs, 11, '|', sizeof references); - for (ptr=references; *ptr != 0; ++ptr) { - if (*ptr == '!') *ptr = '|'; - } - - /* first check to make sure the request is valid. */ - - err = CtdlDoIHavePermissionToPostInThisRoom( - errmsg, - sizeof errmsg, - NULL, - POST_LOGGED_IN, - (!IsEmptyStr(references)) /* is this a reply? or a top-level post? */ - ); - if (err) - { - cprintf("%d %s\n", err, errmsg); - return; - } - - /* Check some other permission type things. */ - - if (IsEmptyStr(newusername)) { - strcpy(newusername, CCC->user.fullname); - } - if ( (CCC->user.axlevel < AxAideU) - && (strcasecmp(newusername, CCC->user.fullname)) - && (strcasecmp(newusername, CCC->cs_inet_fn)) - ) { - cprintf("%d You don't have permission to author messages as '%s'.\n", - ERROR + HIGHER_ACCESS_REQUIRED, - newusername - ); - return; - } - - - if (IsEmptyStr(newuseremail)) { - newuseremail_ok = 1; - } - - if (!IsEmptyStr(newuseremail)) { - if (!strcasecmp(newuseremail, CCC->cs_inet_email)) { - newuseremail_ok = 1; - } - else if (!IsEmptyStr(CCC->cs_inet_other_emails)) { - j = num_tokens(CCC->cs_inet_other_emails, '|'); - for (i=0; ics_inet_other_emails, i, '|', sizeof buf); - if (!strcasecmp(newuseremail, buf)) { - newuseremail_ok = 1; - } - } - } - } - - if (!newuseremail_ok) { - cprintf("%d You don't have permission to author messages as '%s'.\n", - ERROR + HIGHER_ACCESS_REQUIRED, - newuseremail - ); - return; - } - - CCC->cs_flags |= CS_POSTING; - - /* In mailbox rooms we have to behave a little differently -- - * make sure the user has specified at least one recipient. Then - * validate the recipient(s). We do this for the Mail> room, as - * well as any room which has the "Mailbox" view set - unless it - * is the DRAFTS room which does not require recipients - */ - - if ( ( ( (CCC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CCC->room.QRname[11], MAILROOM)) ) - || ( (CCC->room.QRflags & QR_MAILBOX) && (CCC->curr_view == VIEW_MAILBOX) ) - ) && (strcasecmp(&CCC->room.QRname[11], USERDRAFTROOM)) !=0 ) { - if (CCC->user.axlevel < AxProbU) { - strcpy(recp, "sysop"); - strcpy(cc, ""); - strcpy(bcc, ""); - } - - valid_to = validate_recipients(recp, NULL, 0); - if (valid_to->num_error > 0) { - cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_to->errormsg); - free_recipients(valid_to); - return; - } - - valid_cc = validate_recipients(cc, NULL, 0); - if (valid_cc->num_error > 0) { - cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_cc->errormsg); - free_recipients(valid_to); - free_recipients(valid_cc); - return; - } - - valid_bcc = validate_recipients(bcc, NULL, 0); - if (valid_bcc->num_error > 0) { - cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_bcc->errormsg); - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - return; - } - - /* Recipient required, but none were specified */ - if ( (valid_to->num_error < 0) && (valid_cc->num_error < 0) && (valid_bcc->num_error < 0) ) { - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - cprintf("%d At least one recipient is required.\n", ERROR + NO_SUCH_USER); - return; - } - - if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) { - if (CtdlCheckInternetMailPermission(&CCC->user)==0) { - cprintf("%d You do not have permission " - "to send Internet mail.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - return; - } - } - - 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) - && (CCC->user.axlevel < AxNetU) ) { - cprintf("%d Higher access required for network mail.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - return; - } - - if ((RESTRICT_INTERNET == 1) - && (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) - && ((CCC->user.flags & US_INTERNET) == 0) - && (!CCC->internal_pgm)) { - cprintf("%d You don't have access to Internet mail.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - return; - } - - } - - /* Is this a room which has anonymous-only or anonymous-option? */ - anonymous = MES_NORMAL; - if (CCC->room.QRflags & QR_ANONONLY) { - anonymous = MES_ANONONLY; - } - if (CCC->room.QRflags & QR_ANONOPT) { - if (anon_flag == 1) { /* only if the user requested it */ - anonymous = MES_ANONOPT; - } - } - - if ((CCC->room.QRflags & QR_MAILBOX) == 0) { - recp[0] = 0; - } - - /* Recommend to the client that the use of a message subject is - * strongly recommended in this room, if either the SUBJECTREQ flag - * is set, or if there is one or more Internet email recipients. - */ - if (CCC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1; - if ((valid_to) && (valid_to->num_internet > 0)) subject_required = 1; - if ((valid_cc) && (valid_cc->num_internet > 0)) subject_required = 1; - if ((valid_bcc) && (valid_bcc->num_internet > 0)) subject_required = 1; - - /* If we're only checking the validity of the request, return - * success without creating the message. - */ - if (post == 0) { - cprintf("%d %s|%d\n", CIT_OK, - ((valid_to != NULL) ? valid_to->display_recp : ""), - subject_required); - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - return; - } - - /* We don't need these anymore because we'll do it differently below */ - free_recipients(valid_to); - free_recipients(valid_cc); - free_recipients(valid_bcc); - - /* Read in the message from the client. */ - if (do_confirm) { - cprintf("%d send message\n", START_CHAT_MODE); - } else { - cprintf("%d send message\n", SEND_LISTING); - } - - msg = CtdlMakeMessage(&CCC->user, recp, cc, - CCC->room.QRname, anonymous, format_type, - newusername, newuseremail, subject, - ((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL), - NULL, references); - - /* 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 (!IsEmptyStr(cc)) { - if (!IsEmptyStr(all_recps)) { - strcat(all_recps, ","); - } - strcat(all_recps, cc); - } - if (!IsEmptyStr(bcc)) { - if (!IsEmptyStr(all_recps)) { - strcat(all_recps, ","); - } - strcat(all_recps, bcc); - } - if (!IsEmptyStr(all_recps)) { - valid = validate_recipients(all_recps, NULL, 0); - } - else { - valid = NULL; - } - free(all_recps); - - if ((valid != NULL) && (valid->num_room == 1)) - { - /* posting into an ML room? set the envelope from - * to the actual mail address so others get a valid - * reply-to-header. - */ - msg->cm_fields[eenVelopeTo] = strdup(valid->recp_orgroom); - } - - if (msg != NULL) { - msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR); - if (do_confirm) { - cprintf("%ld\n", msgnum); - - if (StrLength(CCC->StatusMessage) > 0) { - cprintf("%s\n", ChrPtr(CCC->StatusMessage)); - } - else if (msgnum >= 0L) { - client_write(HKEY("Message accepted.\n")); - } - else { - client_write(HKEY("Internal error.\n")); - } - - if (!CM_IsEmpty(msg, eExclusiveID)) { - cprintf("%s\n", msg->cm_fields[eExclusiveID]); - } else { - cprintf("\n"); - } - cprintf("000\n"); - } - - CM_Free(msg); - } - if (valid != NULL) { - free_recipients(valid); - } - return; -} - - /* * API function to delete messages which match a set of criteria * (returns the actual number of messages deleted) */ -int CtdlDeleteMessages(char *room_name, /* which room */ +int CtdlDeleteMessages(const char *room_name, /* which room */ 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. regular expressions expected. */ @@ -4354,163 +3757,6 @@ int CtdlDeleteMessages(char *room_name, /* which room */ return (num_deleted); } -/* - * Delete message from current room - */ -void cmd_dele(char *args) -{ - int num_deleted; - int i; - char msgset[SIZ]; - char msgtok[32]; - long *msgs; - int num_msgs = 0; - - extract_token(msgset, args, 0, '|', sizeof msgset); - num_msgs = num_tokens(msgset, ','); - if (num_msgs < 1) { - cprintf("%d Nothing to do.\n", CIT_OK); - return; - } - - if (CtdlDoIHavePermissionToDeleteMessagesFromThisRoom() == 0) { - cprintf("%d Higher access required.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return; - } - - /* - * Build our message set to be moved/copied - */ - msgs = malloc(num_msgs * sizeof(long)); - for (i=0; iroom.QRname, msgs, num_msgs, ""); - free(msgs); - - if (num_deleted) { - cprintf("%d %d message%s deleted.\n", CIT_OK, - num_deleted, ((num_deleted != 1) ? "s" : "")); - } else { - cprintf("%d Message not found.\n", ERROR + MESSAGE_NOT_FOUND); - } -} - - - - -/* - * move or copy a message to another room - */ -void cmd_move(char *args) -{ - char msgset[SIZ]; - char msgtok[32]; - long *msgs; - int num_msgs = 0; - - char targ[ROOMNAMELEN]; - struct ctdlroom qtemp; - int err; - int is_copy = 0; - int ra; - int permit = 0; - int i; - - extract_token(msgset, args, 0, '|', sizeof msgset); - num_msgs = num_tokens(msgset, ','); - if (num_msgs < 1) { - cprintf("%d Nothing to do.\n", CIT_OK); - return; - } - - extract_token(targ, args, 1, '|', sizeof targ); - convert_room_name_macros(targ, sizeof targ); - targ[ROOMNAMELEN - 1] = 0; - is_copy = extract_int(args, 2); - - if (CtdlGetRoom(&qtemp, targ) != 0) { - cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, targ); - return; - } - - if (!strcasecmp(qtemp.QRname, CC->room.QRname)) { - cprintf("%d Source and target rooms are the same.\n", ERROR + ALREADY_EXISTS); - return; - } - - CtdlGetUser(&CC->user, CC->curr_user); - CtdlRoomAccess(&qtemp, &CC->user, &ra, NULL); - - /* Check for permission to perform this operation. - * Remember: "CC->room" is source, "qtemp" is target. - */ - permit = 0; - - /* Admins can move/copy */ - if (CC->user.axlevel >= AxAideU) permit = 1; - - /* Room aides can move/copy */ - if (CC->user.usernum == CC->room.QRroomaide) permit = 1; - - /* Permit move/copy from personal rooms */ - if ((CC->room.QRflags & QR_MAILBOX) - && (qtemp.QRflags & QR_MAILBOX)) permit = 1; - - /* Permit only copy from public to personal room */ - if ( (is_copy) - && (!(CC->room.QRflags & QR_MAILBOX)) - && (qtemp.QRflags & QR_MAILBOX)) permit = 1; - - /* Permit message removal from collaborative delete rooms */ - if (CC->room.QRflags2 & QR2_COLLABDEL) permit = 1; - - /* Users allowed to post into the target room may move into it too. */ - if ((CC->room.QRflags & QR_MAILBOX) && - (qtemp.QRflags & UA_POSTALLOWED)) permit = 1; - - /* User must have access to target room */ - if (!(ra & UA_KNOWN)) permit = 0; - - if (!permit) { - cprintf("%d Higher access required.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return; - } - - /* - * Build our message set to be moved/copied - */ - msgs = malloc(num_msgs * sizeof(long)); - for (i=0; iroom.QRname, msgs, num_msgs, ""); - } - free(msgs); - - cprintf("%d Message(s) %s.\n", CIT_OK, (is_copy ? "copied" : "moved") ); -} @@ -4789,7 +4035,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ struct ctdlroom qrbuf; char roomname[ROOMNAMELEN]; struct CtdlMessage *msg; - char *encoded_message = NULL; + StrBuf *encoded_message = NULL; if (is_mailbox != NULL) { CtdlMailboxName(roomname, sizeof roomname, is_mailbox, req_room); @@ -4801,39 +4047,28 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ MSG_syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length); if (is_binary) { - encoded_message = malloc((size_t) (((raw_length * 134) / 100) + 4096 ) ); + encoded_message = NewStrBufPlain(NULL, (size_t) (((raw_length * 134) / 100) + 4096 ) ); } else { - encoded_message = malloc((size_t)(raw_length + 4096)); + encoded_message = NewStrBufPlain(NULL, (size_t)(raw_length + 4096)); } - sprintf(encoded_message, "Content-type: %s\n", content_type); + StrBufAppendBufPlain(encoded_message, HKEY("Content-type: "), 0); + StrBufAppendBufPlain(encoded_message, content_type, -1, 0); + StrBufAppendBufPlain(encoded_message, HKEY("\n"), 0); if (is_binary) { - sprintf(&encoded_message[strlen(encoded_message)], - "Content-transfer-encoding: base64\n\n" - ); + StrBufAppendBufPlain(encoded_message, HKEY("Content-transfer-encoding: base64\n\n"), 0); } else { - sprintf(&encoded_message[strlen(encoded_message)], - "Content-transfer-encoding: 7bit\n\n" - ); + StrBufAppendBufPlain(encoded_message, HKEY("Content-transfer-encoding: 7bit\n\n"), 0); } if (is_binary) { - CtdlEncodeBase64( - &encoded_message[strlen(encoded_message)], - raw_message, - (int)raw_length, - 0 - ); + StrBufBase64Append(encoded_message, NULL, raw_message, raw_length, 0); } else { - memcpy( - &encoded_message[strlen(encoded_message)], - raw_message, - (int)(raw_length+1) - ); + StrBufAppendBufPlain(encoded_message, raw_message, raw_length, 0); } MSGM_syslog(LOG_DEBUG, "Allocating\n"); @@ -4842,13 +4077,13 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ msg->cm_magic = CTDLMESSAGE_MAGIC; msg->cm_anon_type = MES_NORMAL; msg->cm_format_type = 4; - msg->cm_fields[eAuthor] = strdup(CCC->user.fullname); - msg->cm_fields[eOriginalRoom] = strdup(req_room); - msg->cm_fields[eNodeName] = strdup(config.c_nodename); - msg->cm_fields[eHumanNode] = strdup(config.c_humannode); + CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname)); + CM_SetField(msg, eOriginalRoom, req_room, strlen(req_room)); + CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename"))); + CM_SetField(msg, eHumanNode, CtdlGetConfigStr("c_humannode"), strlen(CtdlGetConfigStr("c_humannode"))); msg->cm_flags = flags; - msg->cm_fields[eMesageText] = encoded_message; + CM_SetAsFieldSB(msg, eMesageText, &encoded_message); /* Create the requested room if we have to. */ if (CtdlGetRoom(&qrbuf, roomname) != 0) { @@ -4882,18 +4117,6 @@ CTDL_MODULE_INIT(msgbase) { if (!threading) { CtdlRegisterDebugFlagHook(HKEY("messages"), SetMessageDebugEnabled, &MessageDebugEnabled); - - CtdlRegisterProtoHook(cmd_msgs, "MSGS", "Output a list of messages in the current room"); - CtdlRegisterProtoHook(cmd_msg0, "MSG0", "Output a message in plain text format"); - CtdlRegisterProtoHook(cmd_msg2, "MSG2", "Output a message in RFC822 format"); - CtdlRegisterProtoHook(cmd_msg3, "MSG3", "Output a message in raw format (deprecated)"); - CtdlRegisterProtoHook(cmd_msg4, "MSG4", "Output a message in the client's preferred format"); - CtdlRegisterProtoHook(cmd_msgp, "MSGP", "Select preferred format for MSG4 output"); - CtdlRegisterProtoHook(cmd_opna, "OPNA", "Open an attachment for download"); - CtdlRegisterProtoHook(cmd_dlat, "DLAT", "Download an attachment"); - CtdlRegisterProtoHook(cmd_ent0, "ENT0", "Enter a message"); - CtdlRegisterProtoHook(cmd_dele, "DELE", "Delete a message"); - CtdlRegisterProtoHook(cmd_move, "MOVE", "Move or copy a message to another room"); } /* return our Subversion id for the Log */