X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=21c1aabb41bb16ff61581832b76673965439f7c0;hp=a1acc98c4221cf7832a5a398bf4e8a6518b7152a;hb=18debdb7279e0c800a5a2f2a1f8b79f97cd4f4e4;hpb=ca4f48f24ef79b27dd0e8b539604e7789530e07f diff --git a/citadel/msgbase.c b/citadel/msgbase.c index a1acc98c4..21c1aabb4 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -12,57 +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 "citadel.h" -#include "server.h" -#include "serv_extensions.h" -#include "database.h" -#include "msgbase.h" -#include "support.h" -#include "sysdep_decls.h" + +#include "md5.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 "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" - -long config_msgnum; struct addresses_to_be_filed *atbf = NULL; /* This temp file holds the queue of operations for AdjRefCount() */ @@ -85,223 +54,294 @@ char *msgkeys[] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, - "from", - NULL, NULL, NULL, - "exti", - "rfca", - NULL, - "hnod", - "msgn", - "jrnl", - NULL, - "list", - "text", - "node", - "room", - "path", - NULL, - "rcpt", - "spec", - "time", - "subj", - NULL, - "wefw", - NULL, - "cccc", - NULL + "from", /* A */ + NULL, /* B */ + NULL, /* C */ + NULL, /* D */ + "exti", /* E */ + "rfca", /* F */ + NULL, /* G */ + "hnod", /* H */ + "msgn", /* I */ + "jrnl", /* J */ + "rep2", /* K */ + "list", /* L */ + "text", /* M */ + "node", /* N */ + "room", /* O */ + "path", /* P */ + NULL, /* Q */ + "rcpt", /* R */ + "spec", /* S */ + "time", /* T */ + "subj", /* U */ + "nvto", /* V */ + "wefw", /* W */ + NULL, /* X */ + "cccc", /* Y */ + NULL /* Z */ }; -/* - * This function is self explanatory. - * (What can I say, I'm in a weird mood today...) - */ -void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) +eMsgField FieldOrder[] = { +/* Important fields */ + emessageId , + eMessagePath , + eTimestamp , + eAuthor , + erFc822Addr , + eOriginalRoom, + eNodeName , + eHumanNode , + eRecipient , + eDestination , +/* Semi-important fields */ + eBig_message , + eRemoteRoom , + eExclusiveID , + eWeferences , + eJournal , +/* G is not used yet, may become virus signature*/ + eReplyTo , + eListID , +/* Q is not used yet */ + eSpecialField, + eenVelopeTo , +/* X is not used yet */ +/* Z is not used yet */ + eCarbonCopY , + eMsgSubject , +/* internal only */ + eErrorMsg , + eSuppressIdx , + eExtnotify , +/* Message text (MUST be last) */ + eMesageText +/* Not saved to disk: + eVltMsgNum +*/ +}; + +static const long NDiskFields = sizeof(FieldOrder) / sizeof(eMsgField); + +int CM_IsEmpty(struct CtdlMessage *Msg, eMsgField which) { - int i; + return !((Msg->cm_fields[which] != NULL) && + (Msg->cm_fields[which][0] != '\0')); +} - for (i = 0; i < strlen(name); ++i) { - if (name[i] == '@') { - while (isspace(name[i - 1]) && i > 0) { - strcpy(&name[i - 1], &name[i]); - --i; - } - while (isspace(name[i + 1])) { - strcpy(&name[i + 1], &name[i + 2]); - } - } - } +void CM_SetField(struct CtdlMessage *Msg, eMsgField which, const char *buf, long length) +{ + if (Msg->cm_fields[which] != NULL) + free (Msg->cm_fields[which]); + 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) +{ + char buf[128]; + long len; + len = snprintf(buf, sizeof(buf), "%ld", lvalue); + CM_SetField(Msg, which, buf, len); +} +void CM_CutFieldAt(struct CtdlMessage *Msg, eMsgField WhichToCut, long maxlen) +{ + if (Msg->cm_fields[WhichToCut] == NULL) + return; -/* - * Aliasing for network mail. - * (Error messages have been commented out, because this is a server.) - */ -int alias(char *name) -{ /* process alias and routing info for mail */ - struct CitContext *CCC = CC; - FILE *fp; - int a, i; - char aaa[SIZ], bbb[SIZ]; - char *ignetcfg = NULL; - char *ignetmap = NULL; - int at = 0; - char node[64]; - char testnode[64]; - char buf[SIZ]; + if (Msg->cm_lengths[WhichToCut] > maxlen) + { + Msg->cm_fields[WhichToCut][maxlen] = '\0'; + Msg->cm_lengths[WhichToCut] = maxlen; + } +} - char original_name[256]; - safestrncpy(original_name, name, sizeof original_name); +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; - striplt(name); - remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); - stripallbut(name, '<', '>'); + if (CM_IsValidMsg(Msg) == 0) + return; - fp = fopen(file_mail_aliases, "r"); - if (fp == NULL) { - fp = fopen("/dev/null", "r"); - } - if (fp == NULL) { - return (MES_ERROR); - } - strcpy(aaa, ""); - strcpy(bbb, ""); - while (fgets(aaa, sizeof aaa, fp) != NULL) { - while (isspace(name[0])) - strcpy(name, &name[1]); - aaa[strlen(aaa) - 1] = 0; - strcpy(bbb, ""); - for (a = 0; a < strlen(aaa); ++a) { - if (aaa[a] == ',') { - strcpy(bbb, &aaa[a + 1]); - aaa[a] = 0; - } - } - if (!strcasecmp(name, aaa)) - strcpy(name, bbb); + for (i = 0; i < 256; ++i) + { + CM_FlushField(Msg, i); } - fclose(fp); +} - /* Hit the Global Address Book */ - if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) { - strcpy(name, aaa); - } +void CM_CopyField(struct CtdlMessage *Msg, eMsgField WhichToPutTo, eMsgField WhichtToCopy) +{ + long len; + if (Msg->cm_fields[WhichToPutTo] != NULL) + free (Msg->cm_fields[WhichToPutTo]); - if (strcasecmp(original_name, name)) { - MSG_syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name); + if (Msg->cm_fields[WhichtToCopy] != NULL) + { + len = Msg->cm_lengths[WhichtToCopy]; + Msg->cm_fields[WhichToPutTo] = malloc(len + 1); + memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichtToCopy], len); + Msg->cm_fields[WhichToPutTo][len] = '\0'; + Msg->cm_lengths[WhichToPutTo] = len; } - - /* Change "user @ xxx" to "user" if xxx is an alias for this host */ - for (a=0; a\n", name); - } - } + else + { + Msg->cm_fields[WhichToPutTo] = NULL; + Msg->cm_lengths[WhichToPutTo] = 0; } +} - /* determine local or remote type, see citadel.h */ - at = haschar(name, '@'); - if (at == 0) return(MES_LOCAL); /* no @'s - local address */ - if (at > 1) return(MES_ERROR); /* >1 @'s - invalid address */ - remove_any_whitespace_to_the_left_or_right_of_at_symbol(name); - /* figure out the delivery mode */ - extract_token(node, name, 1, '@', sizeof node); +void CM_PrependToField(struct CtdlMessage *Msg, eMsgField which, const char *buf, long length) +{ + if (Msg->cm_fields[which] != NULL) { + long oldmsgsize; + long newmsgsize; + char *new; - /* If there are one or more dots in the nodename, we assume that it - * is an FQDN and will attempt SMTP delivery to the Internet. - */ - if (haschar(node, '.') > 0) { - return(MES_INTERNET); - } + oldmsgsize = Msg->cm_lengths[which] + 1; + newmsgsize = length + oldmsgsize; - /* Otherwise we look in the IGnet maps for a valid Citadel node. - * Try directly-connected nodes first... - */ - ignetcfg = CtdlGetSysConfig(IGNETCFG); - for (i=0; icm_fields[which], oldmsgsize); + free(Msg->cm_fields[which]); + Msg->cm_fields[which] = new; + Msg->cm_lengths[which] = newmsgsize - 1; } - free(ignetcfg); - - /* - * Then try nodes that are two or more hops away. - */ - ignetmap = CtdlGetSysConfig(IGNETMAP); - for (i=0; icm_fields[which] = malloc(length + 1); + memcpy(Msg->cm_fields[which], buf, length); + Msg->cm_fields[which][length] = '\0'; + Msg->cm_lengths[which] = length; } - free(ignetmap); +} + +void CM_SetAsField(struct CtdlMessage *Msg, eMsgField which, char **buf, long length) +{ + if (Msg->cm_fields[which] != NULL) + free (Msg->cm_fields[which]); + + Msg->cm_fields[which] = *buf; + *buf = NULL; + Msg->cm_lengths[which] = length; +} + +void CM_SetAsFieldSB(struct CtdlMessage *Msg, eMsgField which, StrBuf **buf) +{ + if (Msg->cm_fields[which] != NULL) + free (Msg->cm_fields[which]); - /* If we get to this point it's an invalid node name */ - return (MES_ERROR); + Msg->cm_lengths[which] = StrLength(*buf); + Msg->cm_fields[which] = SmashStrBuf(buf); } +void CM_GetAsField(struct CtdlMessage *Msg, eMsgField which, char **ret, long *retlen) +{ + if (Msg->cm_fields[which] != NULL) + { + *retlen = Msg->cm_lengths[which]; + *ret = Msg->cm_fields[which]; + Msg->cm_fields[which] = NULL; + Msg->cm_lengths[which] = 0; + } + else + { + *ret = NULL; + *retlen = 0; + } +} /* - * Back end for the MSGS command: output message number only. + * Returns 1 if the supplied pointer points to a valid Citadel message. + * If the pointer is NULL or the magic number check fails, returns 0. */ -void simple_listing(long msgnum, void *userdata) -{ - cprintf("%ld\n", msgnum); +int CM_IsValidMsg(struct CtdlMessage *msg) { + if (msg == NULL) + return 0; + if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) { + struct CitContext *CCC = CC; + MSGM_syslog(LOG_WARNING, "CM_IsValidMsg() -- self-check failed\n"); + return 0; + } + return 1; } +void CM_FreeContents(struct CtdlMessage *msg) +{ + int i; + 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 */ +} /* - * Back end for the MSGS command: output header summary. + * 'Destructor' for struct CtdlMessage */ -void headers_listing(long msgnum, void *userdata) +void CM_Free(struct CtdlMessage *msg) { - struct CtdlMessage *msg; - - msg = CtdlFetchMessage(msgnum, 0); - if (msg == NULL) { - cprintf("%ld|0|||||\n", msgnum); + if (CM_IsValidMsg(msg) == 0) + { + if (msg != NULL) free (msg); return; } + CM_FreeContents(msg); + free(msg); +} - cprintf("%ld|%s|%s|%s|%s|%s|\n", - msgnum, - (msg->cm_fields['T'] ? msg->cm_fields['T'] : "0"), - (msg->cm_fields['A'] ? msg->cm_fields['A'] : ""), - (msg->cm_fields['N'] ? msg->cm_fields['N'] : ""), - (msg->cm_fields['F'] ? msg->cm_fields['F'] : ""), - (msg->cm_fields['U'] ? msg->cm_fields['U'] : "") - ); - CtdlFreeMessage(msg); +int CM_DupField(eMsgField i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg) +{ + long len; + 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; } -/* - * Back end for the MSGS command: output EUID header. - */ -void headers_euid(long msgnum, void *userdata) +struct CtdlMessage * CM_Duplicate(struct CtdlMessage *OrgMsg) { - struct CtdlMessage *msg; + int i; + struct CtdlMessage *NewMsg; - msg = CtdlFetchMessage(msgnum, 0); - if (msg == NULL) { - cprintf("%ld||\n", msgnum); - return; + if (CM_IsValidMsg(OrgMsg) == 0) + return NULL; + NewMsg = (struct CtdlMessage *)malloc(sizeof(struct CtdlMessage)); + if (NewMsg == NULL) + return NULL; + + memcpy(NewMsg, OrgMsg, sizeof(struct CtdlMessage)); + + memset(&NewMsg->cm_fields, 0, sizeof(char*) * 256); + + for (i = 0; i < 256; ++i) + { + if (OrgMsg->cm_fields[i] != NULL) + { + if (!CM_DupField(i, OrgMsg, NewMsg)) + { + CM_Free(NewMsg); + return NULL; + } + } } - cprintf("%ld|%s|%s\n", - msgnum, - (msg->cm_fields['E'] ? msg->cm_fields['E'] : ""), - (msg->cm_fields['T'] ? msg->cm_fields['T'] : "0")); - CtdlFreeMessage(msg); + return NewMsg; } @@ -329,8 +369,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; } } @@ -701,7 +742,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, if (CtdlMsgCmp(msg, compare)) { msglist[a] = 0L; } - CtdlFreeMessage(msg); + CM_Free(msg); } } } @@ -816,143 +857,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")) { - extract_token(tfield, buf, 0, '|', sizeof tfield); - extract_token(tvalue, buf, 1, '|', sizeof tvalue); - for (i='A'; i<='Z'; ++i) if (msgkeys[i]!=NULL) { - if (!strcasecmp(tfield, msgkeys[i])) { - template->cm_fields[i] = - strdup(tvalue); - } - } - } - 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) CtdlFreeMessage(template); - cprintf("000\n"); -} - - - - -/* - * help_subst() - support routine for help file viewer - */ -void help_subst(char *strbuf, char *source, char *dest) -{ - char workbuf[SIZ]; - int p; - - while (p = pattern2(strbuf, source), (p >= 0)) { - strcpy(workbuf, &strbuf[p + strlen(source)]); - strcpy(&strbuf[p], dest); - strcat(strbuf, workbuf); - } -} - - -void do_help_subst(char *buffer) -{ - char buf2[16]; - - help_subst(buffer, "^nodename", config.c_nodename); - help_subst(buffer, "^humannode", config.c_humannode); - help_subst(buffer, "^fqdn", config.c_fqdn); - help_subst(buffer, "^username", CC->user.fullname); - snprintf(buf2, sizeof buf2, "%ld", CC->user.usernum); - help_subst(buffer, "^usernum", buf2); - help_subst(buffer, "^sysadm", config.c_sysadm); - help_subst(buffer, "^variantname", CITADEL); - snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions); - help_subst(buffer, "^maxsessions", buf2); - help_subst(buffer, "^bbsdir", ctdl_message_dir); -} - - - /* * memfmout() - Citadel text formatter and paginator. * Although the original purpose of this routine was to format @@ -1037,7 +941,6 @@ void memfmout( MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); return; } - len = 0; client_write(nl, nllen); column = 0; } @@ -1108,7 +1011,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) @@ -1133,7 +1038,7 @@ void mime_download(char *name, char *filename, char *partnum, char *disp, return; } - rv = fwrite(content, length, 1, CC->download_fp); + rv = fwrite(content, length, 1, CCC->download_fp); if (rv <= 0) { MSG_syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n", strerror(errno)); @@ -1195,10 +1100,12 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) 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; @@ -1222,19 +1129,29 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) ret->cm_anon_type = *mptr++; /* Anon type byte */ ret->cm_format_type = *mptr++; /* Format type byte */ + + 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'; + } + /* * The rest is zero or more arbitrary fields. Load them in. * We're done when we encounter either a zero-length field or * have just processed the 'M' (message text) field. */ do { + long len; if (mptr >= upper_bound) { break; } field_header = *mptr++; - ret->cm_fields[field_header] = strdup(mptr); + which = field_header; + len = strlen(mptr); + CM_SetField(ret, which, mptr, len); - while (*mptr++ != 0); /* advance to next field */ + mptr += len + 1; /* advance to next field */ } while ((mptr < upper_bound) && (field_header != 'M')); @@ -1245,21 +1162,20 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) * so go ahead and fetch that. Failing that, just set a dummy * body so other code doesn't barf. */ - if ( (ret->cm_fields['M'] == NULL) && (with_body) ) { + if ( (CM_IsEmpty(ret, eMesageText)) && (with_body) ) { dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long)); if (dmsgtext != NULL) { - ret->cm_fields['M'] = dmsgtext->ptr; - dmsgtext->ptr = NULL; + CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len - 1); cdb_free(dmsgtext); } } - if (ret->cm_fields['M'] == NULL) { - ret->cm_fields['M'] = strdup("\r\n\r\n (no text)\r\n"); + if (CM_IsEmpty(ret, eMesageText)) { + CM_SetField(ret, eMesageText, HKEY("\r\n\r\n (no text)\r\n")); } /* Perform "before read" hooks (aborting if any return nonzero) */ - if (PerformMessageHooks(ret, EVT_BEFOREREAD) > 0) { - CtdlFreeMessage(ret); + if (PerformMessageHooks(ret, NULL, EVT_BEFOREREAD) > 0) { + CM_Free(ret); return NULL; } @@ -1267,46 +1183,6 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) } -/* - * Returns 1 if the supplied pointer points to a valid Citadel message. - * If the pointer is NULL or the magic number check fails, returns 0. - */ -int is_valid_message(struct CtdlMessage *msg) { - if (msg == NULL) - return 0; - if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) { - struct CitContext *CCC = CC; - MSGM_syslog(LOG_WARNING, "is_valid_message() -- self-check failed\n"); - return 0; - } - return 1; -} - -void CtdlFreeMessageContents(struct CtdlMessage *msg) -{ - int i; - - for (i = 0; i < 256; ++i) - if (msg->cm_fields[i] != NULL) { - free(msg->cm_fields[i]); - } - - msg->cm_magic = 0; /* just in case */ -} -/* - * 'Destructor' for struct CtdlMessage - */ -void CtdlFreeMessage(struct CtdlMessage *msg) -{ - if (is_valid_message(msg) == 0) - { - if (msg != NULL) free (msg); - return; - } - CtdlFreeMessageContents(msg); - free(msg); -} - /* * Pre callback function for multipart/alternative @@ -1629,20 +1505,6 @@ int check_cached_msglist(long msgnum) { } -/* - * Determine whether the currently logged in session has permission to read - * messages in the current room. - */ -int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) { - if ( (!(CC->logged_in)) - && (!(CC->internal_pgm)) - && (!config.c_guest_logins) - ) { - return(om_not_logged_in); - } - return(om_ok); -} - /* * Get a message off disk. (returns om_* values found in msgbase.h) @@ -1654,7 +1516,9 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ 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 */ + int flags, /* various flags; see msgbase.h */ + char **Author, + char **Address ) { struct CitContext *CCC = CC; struct CtdlMessage *TheMessage = NULL; @@ -1727,12 +1591,22 @@ 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['M'], - NULL, - *extract_encapsulated_message, - NULL, NULL, (void *)&encap, 0 - ); - CtdlFreeMessage(TheMessage); + mime_parser(CM_RANGE(TheMessage, eMesageText), + *extract_encapsulated_message, + NULL, NULL, (void *)&encap, 0 + ); + + if ((Author != NULL) && (*Author == NULL)) + { + long len; + CM_GetAsField(TheMessage, eAuthor, Author, &len); + } + if ((Address != NULL) && (*Address == NULL)) + { + long len; + CM_GetAsField(TheMessage, erFc822Addr, Address, &len); + } + CM_Free(TheMessage); TheMessage = NULL; if (encap.msg) { @@ -1745,7 +1619,6 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ * encapsulated message instead of the top-level * message. Isn't that neat? */ - } else { if (do_proto) { @@ -1762,177 +1635,37 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ /* Ok, output the message now */ if (retcode == CIT_OK) retcode = CtdlOutputPreLoadedMsg(TheMessage, mode, headers_only, do_proto, crlf, flags); - CtdlFreeMessage(TheMessage); + if ((Author != NULL) && (*Author == NULL)) + { + long len; + CM_GetAsField(TheMessage, eAuthor, Author, &len); + } + if ((Address != NULL) && (*Address == NULL)) + { + long len; + CM_GetAsField(TheMessage, erFc822Addr, Address, &len); + } + + CM_Free(TheMessage); return(retcode); } -char *qp_encode_email_addrs(char *source) -{ - struct CitContext *CCC = CC; - char *user, *node, *name; - const char headerStr[] = "=?UTF-8?Q?"; - char *Encoded; - char *EncodedName; - char *nPtr; - int need_to_encode = 0; - long SourceLen; - long EncodedMaxLen; - long nColons = 0; - long *AddrPtr; - long *AddrUtf8; - long nAddrPtrMax = 50; - long nmax; - int InQuotes = 0; - int i, n; - - if (source == NULL) return source; - if (IsEmptyStr(source)) return source; - cit_backtrace(); - MSG_syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source); - - AddrPtr = malloc (sizeof (long) * nAddrPtrMax); - AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); - memset(AddrUtf8, 0, sizeof (long) * nAddrPtrMax); - *AddrPtr = 0; - i = 0; - while (!IsEmptyStr (&source[i])) { - if (nColons >= nAddrPtrMax){ - long *ptr; - - ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2); - memcpy (ptr, AddrPtr, sizeof (long) * nAddrPtrMax); - free (AddrPtr), AddrPtr = ptr; - - ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2); - memset(&ptr[nAddrPtrMax], 0, - sizeof (long) * nAddrPtrMax); - - memcpy (ptr, AddrUtf8, sizeof (long) * nAddrPtrMax); - free (AddrUtf8), AddrUtf8 = ptr; - nAddrPtrMax *= 2; - } - if (((unsigned char) source[i] < 32) || - ((unsigned char) source[i] > 126)) { - need_to_encode = 1; - AddrUtf8[nColons] = 1; - } - if (source[i] == '"') - InQuotes = !InQuotes; - if (!InQuotes && source[i] == ',') { - AddrPtr[nColons] = i; - nColons++; - } - i++; - } - if (need_to_encode == 0) { - free(AddrPtr); - free(AddrUtf8); - return source; - } - - SourceLen = i; - EncodedMaxLen = nColons * (sizeof(headerStr) + 3) + SourceLen * 3; - Encoded = (char*) malloc (EncodedMaxLen); - - for (i = 0; i < nColons; i++) - source[AddrPtr[i]++] = '\0'; - /* TODO: if libidn, this might get larger*/ - user = malloc(SourceLen + 1); - node = malloc(SourceLen + 1); - name = malloc(SourceLen + 1); - - nPtr = Encoded; - *nPtr = '\0'; - for (i = 0; i < nColons && nPtr != NULL; i++) { - nmax = EncodedMaxLen - (nPtr - Encoded); - if (AddrUtf8[i]) { - process_rfc822_addr(&source[AddrPtr[i]], - user, - node, - name); - /* TODO: libIDN here ! */ - if (IsEmptyStr(name)) { - n = snprintf(nPtr, nmax, - (i==0)?"%s@%s" : ",%s@%s", - user, node); - } - else { - EncodedName = rfc2047encode(name, strlen(name)); - n = snprintf(nPtr, nmax, - (i==0)?"%s <%s@%s>" : ",%s <%s@%s>", - EncodedName, user, node); - free(EncodedName); - } - } - else { - n = snprintf(nPtr, nmax, - (i==0)?"%s" : ",%s", - &source[AddrPtr[i]]); - } - if (n > 0 ) - nPtr += n; - else { - char *ptr, *nnPtr; - ptr = (char*) malloc(EncodedMaxLen * 2); - memcpy(ptr, Encoded, EncodedMaxLen); - nnPtr = ptr + (nPtr - Encoded), nPtr = nnPtr; - free(Encoded), Encoded = ptr; - EncodedMaxLen *= 2; - i--; /* do it once more with properly lengthened buffer */ - } - } - for (i = 0; i < nColons; i++) - source[--AddrPtr[i]] = ','; - - free(user); - free(node); - free(name); - free(AddrUtf8); - free(AddrPtr); - return Encoded; -} - - -/* If the last item in a list of recipients was truncated to a partial address, - * remove it completely in order to avoid choking libSieve - */ -void sanitize_truncated_recipient(char *str) -{ - if (!str) return; - if (num_tokens(str, ',') < 2) return; - - int len = strlen(str); - if (len < 900) return; - if (len > 998) str[998] = 0; - - char *cptr = strrchr(str, ','); - if (!cptr) return; - - char *lptr = strchr(cptr, '<'); - char *rptr = strchr(cptr, '>'); - - if ( (lptr) && (rptr) && (rptr > lptr) ) return; - - *cptr = 0; -} - void OutputCtdlMsgHeaders( struct CtdlMessage *TheMessage, int do_proto) /* do Citadel protocol responses? */ { - char allkeys[30]; - int i, k, n; + int i; int suppress_f = 0; char buf[SIZ]; char display_name[256]; /* begin header processing loop for Citadel message format */ safestrncpy(display_name, "", sizeof display_name); - if (TheMessage->cm_fields['A']) { - strcpy(buf, TheMessage->cm_fields['A']); + if (!CM_IsEmpty(TheMessage, eAuthor)) { + strcpy(buf, TheMessage->cm_fields[eAuthor]); if (TheMessage->cm_anon_type == MES_ANONONLY) { safestrncpy(display_name, "****", sizeof display_name); } @@ -1956,35 +1689,37 @@ void OutputCtdlMsgHeaders( * local Citadel network. */ suppress_f = 0; - if (TheMessage->cm_fields['N'] != NULL) - if (!IsEmptyStr(TheMessage->cm_fields['N'])) - if (haschar(TheMessage->cm_fields['N'], '.') == 0) { - suppress_f = 1; - } + if (!CM_IsEmpty(TheMessage, eNodeName) && + (haschar(TheMessage->cm_fields[eNodeName], '.') == 0)) + { + suppress_f = 1; + } /* Now spew the header fields in the order we like them. */ - n = safestrncpy(allkeys, FORDER, sizeof allkeys); - for (i=0; icm_fields[k] != NULL) - && (msgkeys[k] != NULL) ) { - if ((k == 'V') || (k == 'R') || (k == 'Y')) { - sanitize_truncated_recipient(TheMessage->cm_fields[k]); + for (i=0; i< NDiskFields; ++i) { + eMsgField Field; + Field = FieldOrder[i]; + if (Field != eMesageText) { + if ( (!CM_IsEmpty(TheMessage, Field)) + && (msgkeys[Field] != NULL) ) { + if ((Field == eenVelopeTo) || + (Field == eRecipient) || + (Field == eCarbonCopY)) { + sanitize_truncated_recipient(TheMessage->cm_fields[Field]); } - if (k == 'A') { + if (Field == eAuthor) { if (do_proto) cprintf("%s=%s\n", - msgkeys[k], + msgkeys[Field], display_name); } - else if ((k == 'F') && (suppress_f)) { + else if ((Field == erFc822Addr) && (suppress_f)) { /* do nothing */ } /* Masquerade display name if needed */ else { if (do_proto) cprintf("%s=%s\n", - msgkeys[k], - TheMessage->cm_fields[k] + msgkeys[Field], + TheMessage->cm_fields[Field] ); } } @@ -2015,7 +1750,7 @@ void OutputRFC822MsgHeaders( if (TheMessage->cm_fields[i]) { mptr = mpptr = TheMessage->cm_fields[i]; - if (i == 'A') { + if (i == eAuthor) { safestrncpy(luser, mptr, sizeof_luser); safestrncpy(suser, mptr, sizeof_suser); } @@ -2029,7 +1764,7 @@ void OutputRFC822MsgHeaders( else if (i == 'P') { cprintf("Return-Path: %s%s", mptr, nl); } - else if (i == 'L') { + else if (i == eListID) { cprintf("List-ID: %s%s", mptr, nl); } else if (i == 'V') { @@ -2047,7 +1782,7 @@ void OutputRFC822MsgHeaders( } else if (i == 'I') safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found. - else if (i == 'F') + else if (i == erFc822Addr) safestrncpy(fuser, mptr, sizeof_fuser); /* else if (i == 'O') cprintf("X-Citadel-Room: %s%s", @@ -2091,7 +1826,7 @@ void OutputRFC822MsgHeaders( } } } - else if (i == 'K') { + else if (i == eReplyTo) { hptr = mptr; while ((*hptr != '\0') && isspace(*hptr)) hptr ++; @@ -2123,7 +1858,7 @@ void Dump_RFC822HeadersBody( int nllen = strlen(nl); char *mptr; - mptr = TheMessage->cm_fields['M']; + mptr = TheMessage->cm_fields[eMesageText]; prev_ch = '\0'; @@ -2204,7 +1939,7 @@ void DumpFormatFixed( int nllen = strlen (nl); char *mptr; - mptr = TheMessage->cm_fields['M']; + mptr = TheMessage->cm_fields[eMesageText]; if (mode == MT_MIME) { cprintf("Content-type: text/plain\n\n"); @@ -2275,7 +2010,6 @@ int CtdlOutputPreLoadedMsg( ) { struct CitContext *CCC = CC; int i; - char *mptr = NULL; const char *nl; /* newline string */ struct ma_info ma; @@ -2296,7 +2030,7 @@ int CtdlOutputPreLoadedMsg( strcpy(mid, "unknown"); nl = (crlf ? "\r\n" : "\n"); - if (!is_valid_message(TheMessage)) { + if (!CM_IsValidMsg(TheMessage)) { MSGM_syslog(LOG_ERR, "ERROR: invalid preloaded message for output\n"); cit_backtrace (); @@ -2306,8 +2040,8 @@ int CtdlOutputPreLoadedMsg( /* Suppress envelope recipients if required to avoid disclosing BCC addresses. * Pad it with spaces in order to avoid changing the RFC822 length of the message. */ - if ( (flags & SUPPRESS_ENV_TO) && (TheMessage->cm_fields['V'] != NULL) ) { - memset(TheMessage->cm_fields['V'], ' ', strlen(TheMessage->cm_fields['V'])); + if ( (flags & SUPPRESS_ENV_TO) && (!CM_IsEmpty(TheMessage, eenVelopeTo)) ) { + memset(TheMessage->cm_fields[eenVelopeTo], ' ', TheMessage->cm_lengths[eenVelopeTo]); } /* Are we downloading a MIME component? */ @@ -2322,8 +2056,8 @@ int CtdlOutputPreLoadedMsg( ERROR + RESOURCE_BUSY); } else { /* Parse the message text component */ - mptr = TheMessage->cm_fields['M']; - 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 */ @@ -2349,8 +2083,8 @@ int CtdlOutputPreLoadedMsg( /* Parse the message text component */ int found_it = 0; - mptr = TheMessage->cm_fields['M']; - 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) { @@ -2390,7 +2124,7 @@ int CtdlOutputPreLoadedMsg( strcpy(suser, ""); strcpy(luser, ""); strcpy(fuser, ""); - strcpy(snode, NODENAME); + memcpy(snode, CFG_KEY(c_nodename) + 1); if (mode == MT_RFC822) OutputRFC822MsgHeaders( TheMessage, @@ -2447,9 +2181,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['M']; 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), @@ -2488,12 +2221,10 @@ START_TEXT: * message to the reader's screen width. */ if (TheMessage->cm_format_type == FMT_CITADEL) { - mptr = TheMessage->cm_fields['M']; - 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 @@ -2509,17 +2240,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); } } @@ -2529,141 +2260,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); - 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); -} - - - -/* - * 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); - CtdlFreeMessage(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); -} - - - -/* - * 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); -} - - -/* - * 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); -} - - /* * Save one or more message pointers into a specified room * (Returns 0 for success, nonzero for failure) @@ -2794,13 +2390,13 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms ReplicationChecks(msg); /* If the message has an Exclusive ID, index that... */ - if (msg->cm_fields['E'] != NULL) { - index_message_by_euid(msg->cm_fields['E'], &CCC->room, msgid); + if (!CM_IsEmpty(msg, eExclusiveID)) { + index_message_by_euid(msg->cm_fields[eExclusiveID], &CCC->room, msgid); } /* Free up the memory we may have allocated */ if (msg != supplied_msg) { - CtdlFreeMessage(msg); + CM_Free(msg); } } @@ -2858,37 +2454,42 @@ long send_message(struct CtdlMessage *msg) { 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(); - snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s", - (long unsigned int) time(NULL), - (long unsigned int) newmsgid, - config.c_fqdn + 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 (msg->cm_fields['I']==NULL) { - msg->cm_fields['I'] = strdup(msgidbuf); + if (CM_IsEmpty(msg, emessageId)) { + CM_SetField(msg, emessageId, msgidbuf, msgidbuflen); } /* If the message is big, set its body aside for storage elsewhere */ - if (msg->cm_fields['M'] != NULL) { - if (strlen(msg->cm_fields['M']) > BIGMSG) { + if (!CM_IsEmpty(msg, eMesageText)) { + if (msg->cm_lengths[eMesageText] > BIGMSG) { is_bigmsg = 1; - holdM = msg->cm_fields['M']; - msg->cm_fields['M'] = NULL; + 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) { - msg->cm_fields['M'] = holdM; + msg->cm_fields[eMesageText] = holdM; + msg->cm_lengths[eMesageText] = holdMLen; } if (smr.len == 0) { @@ -2908,7 +2509,7 @@ long send_message(struct CtdlMessage *msg) { &newmsgid, (int)sizeof(long), holdM, - (strlen(holdM) + 1) + (holdMLen + 1) ); } retval = newmsgid; @@ -2932,32 +2533,31 @@ 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 */ +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; - static char *forder = FORDER; /* * Check for valid message format */ - if (is_valid_message(msg) == 0) { - MSGM_syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n"); + if (CM_IsValidMsg(msg) == 0) { + MSGM_syslog(LOG_ERR, "CtdlSerializeMessage() 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; + for (i=0; i < NDiskFields; ++i) + if (msg->cm_fields[FieldOrder[i]] != NULL) + 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; @@ -2969,12 +2569,18 @@ void serialize_message(struct ser_ret *ret, /* return values */ ret->ser[2] = msg->cm_format_type; 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]; - safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1); - wlen = wlen + fieldlen + 1; + for (i=0; i < NDiskFields; ++i) + if (msg->cm_fields[FieldOrder[i]] != NULL) + { + ret->ser[wlen++] = (char)FieldOrder[i]; + + memcpy(&ret->ser[wlen], + msg->cm_fields[FieldOrder[i]], + msg->cm_lengths[FieldOrder[i]] + 1); + + wlen = wlen + msg->cm_lengths[FieldOrder[i]] + 1; } + if (ret->len != wlen) { MSG_syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n", (long)ret->len, (long)wlen); @@ -2999,12 +2605,12 @@ void ReplicationChecks(struct CtdlMessage *msg) { /* No exclusive id? Don't do anything. */ if (msg == NULL) return; - if (msg->cm_fields['E'] == NULL) return; - if (IsEmptyStr(msg->cm_fields['E'])) return; + if (CM_IsEmpty(msg, eExclusiveID)) return; + /*MSG_syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n", - msg->cm_fields['E'], CCC->room.QRname);*/ + msg->cm_fields[eExclusiveID], CCC->room.QRname);*/ - old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CCC->room); + old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields[eExclusiveID], &CCC->room); if (old_msgnum > 0L) { MSG_syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); CtdlDeleteMessages(CCC->room.QRname, &old_msgnum, 1, ""); @@ -3017,75 +2623,64 @@ 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 generated_timestamp[32]; 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 (is_valid_message(msg) == 0) return(-1); /* self check */ + if (CM_IsValidMsg(msg) == 0) return(-1); /* self check */ /* If this message has no timestamp, we take the liberty of * giving it one, right now. */ - if (msg->cm_fields['T'] == NULL) { - snprintf(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL)); - msg->cm_fields['T'] = strdup(generated_timestamp); + if (CM_IsEmpty(msg, eTimestamp)) { + CM_SetFieldLONG(msg, eTimestamp, time(NULL)); } /* If this message has no path, we generate one. */ - if (msg->cm_fields['P'] == NULL) { - if (msg->cm_fields['A'] != NULL) { - msg->cm_fields['P'] = strdup(msg->cm_fields['A']); - for (a=0; !IsEmptyStr(&msg->cm_fields['P'][a]); ++a) { - if (isspace(msg->cm_fields['P'][a])) { - msg->cm_fields['P'][a] = ' '; + if (CM_IsEmpty(msg, eMessagePath)) { + if (!CM_IsEmpty(msg, eAuthor)) { + CM_CopyField(msg, eMessagePath, eAuthor); + for (a=0; !IsEmptyStr(&msg->cm_fields[eMessagePath][a]); ++a) { + if (isspace(msg->cm_fields[eMessagePath][a])) { + msg->cm_fields[eMessagePath][a] = ' '; } } } else { - msg->cm_fields['P'] = strdup("unknown"); + CM_SetField(msg, eMessagePath, HKEY("unknown")); } } if (force == NULL) { - strcpy(force_room, ""); + force_room[0] = '\0'; } else { strcpy(force_room, force); } /* Learn about what's inside, because it's what's inside that counts */ - if (msg->cm_fields['M'] == NULL) { + if (CM_IsEmpty(msg, eMesageText)) { MSGM_syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n"); return(-2); } @@ -3099,7 +2694,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ break; case 4: strcpy(content_type, "text/plain"); - mptr = bmstrcasestr(msg->cm_fields['M'], "Content-type:"); + mptr = bmstrcasestr(msg->cm_fields[eMesageText], "Content-type:"); if (mptr != NULL) { char *aptr; safestrncpy(content_type, &mptr[13], sizeof content_type); @@ -3149,13 +2744,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* * If this message has no O (room) field, generate one. */ - if (msg->cm_fields['O'] == NULL) { - msg->cm_fields['O'] = strdup(CCC->room.QRname); + if (CM_IsEmpty(msg, eOriginalRoom)) { + CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname)); } /* 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 @@ -3238,176 +2833,60 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ CtdlPutUserLock(&CCC->user); /* 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['A'], msg->cm_fields['N']); + if ((recps != NULL) && (recps->bounce_to == NULL)) + { + 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]); + 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) { - 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 - */ - instr_alloc = 1024; - instr = malloc(instr_alloc); - snprintf(instr, instr_alloc, - "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n" - "bounceto|%s\n", - SPOOLMIME, newmsgid, (long)time(NULL), - 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; - imsg->cm_fields['U'] = strdup("QMSG"); - imsg->cm_fields['A'] = strdup("Citadel"); - imsg->cm_fields['J'] = strdup("do not journal"); - imsg->cm_fields['M'] = instr; /* imsg owns this memory now */ - imsg->cm_fields['2'] = strdup(recipient); - CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM, 0); - CtdlFreeMessage(imsg); - } + PerformMessageHooks(msg, recps, EVT_AFTERUSRMBOXSAVE); } else { MSG_syslog(LOG_DEBUG, "No user <%s>\n", recipient); CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); } } + recps->recp_local = pch; + } /* Perform "after save" hooks */ MSGM_syslog(LOG_DEBUG, "Performing after-save hooks\n"); - if (msg->cm_fields['3'] != NULL) free(msg->cm_fields['3']); - msg->cm_fields['3'] = malloc(20); - snprintf(msg->cm_fields['3'], 20, "%ld", newmsgid); - PerformMessageHooks(msg, EVT_AFTERSAVE); - free(msg->cm_fields['3']); - msg->cm_fields['3'] = NULL; - - /* 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['R']; - hold_D = msg->cm_fields['D']; - msg->cm_fields['R'] = malloc(SIZ); - msg->cm_fields['D'] = malloc(128); - extract_token(msg->cm_fields['R'], recipient, 0, '@', SIZ); - extract_token(msg->cm_fields['D'], recipient, 1, '@', 128); - - serialize_message(&smr, msg); - if (smr.len > 0) { - snprintf(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['R']); - free(msg->cm_fields['D']); - msg->cm_fields['R'] = hold_R; - msg->cm_fields['D'] = hold_D; - } + PerformMessageHooks(msg, recps, EVT_AFTERSAVE); + CM_FlushField(msg, eVltMsgNum); /* 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['U'] = strdup("QMSG"); - imsg->cm_fields['A'] = strdup("Citadel"); - imsg->cm_fields['J'] = strdup("do not journal"); - imsg->cm_fields['M'] = SmashStrBuf(&SpoolMsg); /* imsg owns this memory now */ - CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR); - CtdlFreeMessage(imsg); - } - /* * Any addresses to harvest for someone's address book? */ @@ -3431,7 +2910,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* * Determine whether this message qualifies for journaling. */ - if (msg->cm_fields['J'] != NULL) { + if (!CM_IsEmpty(msg, eJournal)) { qualified_for_journaling = 0; } else { @@ -3460,26 +2939,27 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } } + if ((recps != NULL) && (recps->bounce_to == bounce_to)) + recps->bounce_to = NULL; + /* Done. */ return(newmsgid); } - -void aide_message (char *text, char *subject) -{ - quickie_message("Citadel",NULL,NULL,AIDEROOM,text,FMT_CITADEL,subject); -} - - /* * Convenience function for generating small administrative messages. */ -void quickie_message(const char *from, const char *fromaddr, char *to, char *room, const char *text, - int format_type, const char *subject) +void quickie_message(const char *from, + const char *fromaddr, + const char *to, + char *room, + const char *text, + int format_type, + const char *subject) { struct CtdlMessage *msg; - struct recptypes *recp = NULL; + recptypes *recp = NULL; msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); @@ -3488,35 +2968,100 @@ void quickie_message(const char *from, const char *fromaddr, char *to, char *roo msg->cm_format_type = format_type; if (from != NULL) { - msg->cm_fields['A'] = strdup(from); + CM_SetField(msg, eAuthor, from, strlen(from)); } else if (fromaddr != NULL) { - msg->cm_fields['A'] = strdup(fromaddr); - if (strchr(msg->cm_fields['A'], '@')) { - *strchr(msg->cm_fields['A'], '@') = 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['A'] = strdup("Citadel"); + msg->cm_fields[eAuthor] = strdup("Citadel"); } - if (fromaddr != NULL) msg->cm_fields['F'] = strdup(fromaddr); - if (room != NULL) msg->cm_fields['O'] = strdup(room); - msg->cm_fields['N'] = 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, CFG_KEY(c_nodename)); if (to != NULL) { - msg->cm_fields['R'] = strdup(to); + CM_SetField(msg, eRecipient, to, strlen(to)); recp = validate_recipients(to, NULL, 0); } if (subject != NULL) { - msg->cm_fields['U'] = strdup(subject); + CM_SetField(msg, eMsgSubject, subject, strlen(subject)); } - msg->cm_fields['M'] = strdup(text); + CM_SetField(msg, eMesageText, text, strlen(text)); CtdlSubmitMsg(msg, recp, room, 0); - CtdlFreeMessage(msg); + CM_Free(msg); if (recp != NULL) free_recipients(recp); } +void flood_protect_quickie_message(const char *from, + const char *fromaddr, + const char *to, + char *room, + const char *text, + int format_type, + const char *subject, + int nCriterions, + const char **CritStr, + long *CritStrLen, + long ccid, + long ioid, + time_t NOW) +{ + int i; + u_char rawdigest[MD5_DIGEST_LEN]; + struct MD5Context md5context; + StrBuf *guid; + char timestamp[64]; + long tslen; + time_t tsday = NOW / (8*60*60); /* just care for a day... */ + + tslen = snprintf(timestamp, sizeof(timestamp), "%ld", tsday); + MD5Init(&md5context); + + for (i = 0; i < nCriterions; i++) + MD5Update(&md5context, + (const unsigned char*)CritStr[i], CritStrLen[i]); + MD5Update(&md5context, + (const unsigned char*)timestamp, tslen); + MD5Final(rawdigest, &md5context); + + guid = NewStrBufPlain(NULL, + MD5_DIGEST_LEN * 2 + 12); + StrBufHexEscAppend(guid, NULL, rawdigest, MD5_DIGEST_LEN); + StrBufAppendBufPlain(guid, HKEY("_fldpt"), 0); + if (StrLength(guid) > 40) + StrBufCutAt(guid, 40, NULL); + + if (CheckIfAlreadySeen("FPAideMessage", + guid, + NOW, + tsday, + eUpdate, + ccid, + ioid)!= 0) + { + FreeStrBuf(&guid); + /* yes, we did. flood protection kicks in. */ + syslog(LOG_DEBUG, + "not sending message again\n"); + return; + } + FreeStrBuf(&guid); + /* no, this message isn't sent recently; go ahead. */ + quickie_message(from, + fromaddr, + to, + room, + text, + format_type, + subject); +} /* @@ -3525,7 +3070,7 @@ void quickie_message(const char *from, const char *fromaddr, char *to, char *roo StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */ long tlen, size_t maxlen, /* maximum message length */ - char *exist, /* if non-null, append to it; + StrBuf *exist, /* if non-null, append to it; exist is ALWAYS freed */ int crlf, /* CRLF newlines instead of LF */ int *sock /* socket handle or 0 for this session's client socket */ @@ -3542,8 +3087,7 @@ StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */ Message = NewStrBufPlain(NULL, 4 * SIZ); } else { - Message = NewStrBufPlain(exist, -1); - free(exist); + Message = NewStrBufDup(exist); } /* Do we need to change leading ".." to "." for SMTP escaping? */ @@ -3606,7 +3150,7 @@ ReadAsyncMsg *NewAsyncMsg(const char *terminator, /* token signalling EOT */ long tlen, size_t maxlen, /* maximum message length */ size_t expectlen, /* if we expect a message, how long should it be? */ - char *exist, /* if non-null, append to it; + StrBuf *exist, /* if non-null, append to it; exist is ALWAYS freed */ long eLen, /* length of exist */ int crlf /* CRLF newlines instead of LF */ @@ -3629,8 +3173,7 @@ ReadAsyncMsg *NewAsyncMsg(const char *terminator, /* token signalling EOT */ NewMsg->MsgBuf = NewStrBufPlain(NULL, len); } else { - NewMsg->MsgBuf = NewStrBufPlain(exist, eLen); - free(exist); + NewMsg->MsgBuf = NewStrBufDup(exist); } /* Do we need to change leading ".." to "." for SMTP escaping? */ if ((tlen == 1) && (*terminator == '.')) { @@ -3763,7 +3306,7 @@ eReadState CtdlReadMessageBodyAsync(AsyncIO *IO) char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ long tlen, size_t maxlen, /* maximum message length */ - char *exist, /* if non-null, append to it; + StrBuf *exist, /* if non-null, append to it; exist is ALWAYS freed */ int crlf, /* CRLF newlines instead of LF */ int *sock /* socket handle or 0 for this session's client socket */ @@ -3783,30 +3326,82 @@ 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. * (NOTE: if you supply 'preformatted_text', the buffer you give it * will become part of the message. This means you are no longer * responsible for managing that memory -- it will be freed along with - * the rest of the fields when CtdlFreeMessage() is called.) + * 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; @@ -3818,68 +3413,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['P'] = strdup(my_email); + if (myelen > 0) { + CM_SetField(msg, eMessagePath, my_email, myelen); } else { - snprintf(buf, sizeof buf, "%s", author->fullname); - msg->cm_fields['P'] = strdup(buf); + CM_SetField(msg, eMessagePath, author->fullname, strlen(author->fullname)); } - convert_spaces_to_underscores(msg->cm_fields['P']); + convert_spaces_to_underscores(msg->cm_fields[eMessagePath]); - snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */ - msg->cm_fields['T'] = 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['A'] = SmashStrBuf(&FakeEncAuthor); + CM_SetAsFieldSB(msg, eAuthor, &FakeEncAuthor); FreeStrBuf(&FakeAuthor); - if (CC->room.QRflags & QR_MAILBOX) { /* room */ - msg->cm_fields['O'] = 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['O'] = strdup(CC->room.QRname); + CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname)); } - msg->cm_fields['N'] = strdup(NODENAME); /* nodename */ - msg->cm_fields['H'] = strdup(HUMANNODE); /* hnodename */ + CM_SetField(msg, eNodeName, CFG_KEY(c_nodename)); + CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode)); - if ((recipient != NULL) && (recipient[0] != 0)) { - msg->cm_fields['R'] = strdup(recipient); - } - if ((recp_cc != NULL) && (recp_cc[0] != 0)) { - msg->cm_fields['Y'] = strdup(recp_cc); + if (rcplen > 0) { + CM_SetField(msg, eRecipient, recipient, rcplen); } - if (dest_node[0] != 0) { - msg->cm_fields['D'] = strdup(dest_node); + if (cclen > 0) { + CM_SetField(msg, eCarbonCopY, recp_cc, cclen); } - if (!IsEmptyStr(my_email)) { - msg->cm_fields['F'] = 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['F'] = 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; @@ -3889,842 +3474,130 @@ struct CtdlMessage *CtdlMakeMessage( (IsAscii = isascii(subject[i]) != 0 )) i++; if (IsAscii != 0) - msg->cm_fields['U'] = strdup(subject); + CM_SetField(msg, eMsgSubject, subject, subjlen); else /* ok, we've got utf8 in the string. */ { - msg->cm_fields['U'] = rfc2047encode(subject, length); + char *rfc2047Subj; + rfc2047Subj = rfc2047encode(subject, length); + CM_SetAsField(msg, eMsgSubject, &rfc2047Subj, strlen(rfc2047Subj)); } } } - if (supplied_euid != NULL) { - msg->cm_fields['E'] = strdup(supplied_euid); + if (euidlen > 0) { + CM_SetField(msg, eExclusiveID, supplied_euid, euidlen); } - if ((references != NULL) && (!IsEmptyStr(references))) { - if (msg->cm_fields['W'] != NULL) - free(msg->cm_fields['W']); - msg->cm_fields['W'] = strdup(references); + if (reflen > 0) { + CM_SetField(msg, eWeferences, references, reflen); } if (preformatted_text != NULL) { - msg->cm_fields['M'] = preformatted_text; + CM_SetField(msg, eMesageText, preformatted_text, textlen); } else { - msg->cm_fields['M'] = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0); + StrBuf *MsgBody; + MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), config.c_maxmsglen, NULL, 0, 0); + if (MsgBody != NULL) { + CM_SetAsFieldSB(msg, eMesageText, &MsgBody); + } } return(msg); } -extern int netconfig_check_roomaccess( - char *errmsgbuf, - size_t n, - const char* RemoteIdentifier); /* TODO: find a smarter way */ + + /* - * Check to see whether we have permission to post a message in the current - * room. Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or - * returns 0 on success. + * API function to delete messages which match a set of criteria + * (returns the actual number of messages deleted) */ -int CtdlDoIHavePermissionToPostInThisRoom( - char *errmsgbuf, - size_t n, - const char* RemoteIdentifier, - int PostPublic, - int is_reply - ) { - int ra; - - if (!(CC->logged_in) && - (PostPublic == POST_LOGGED_IN)) { - snprintf(errmsgbuf, n, "Not logged in."); - return (ERROR + NOT_LOGGED_IN); - } - else if (PostPublic == CHECK_EXISTANCE) { - return (0); // We're Evaling whether a recipient exists - } - else if (!(CC->logged_in)) { - - if ((CC->room.QRflags & QR_READONLY)) { - snprintf(errmsgbuf, n, "Not logged in."); - return (ERROR + NOT_LOGGED_IN); - } - if (CC->room.QRflags2 & QR2_MODERATED) { - snprintf(errmsgbuf, n, "Not logged in Moderation feature not yet implemented!"); - return (ERROR + NOT_LOGGED_IN); - } - if ((PostPublic!=POST_LMTP) &&(CC->room.QRflags2 & QR2_SMTP_PUBLIC) == 0) { +int CtdlDeleteMessages(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. */ + ) +{ + struct CitContext *CCC = CC; + struct ctdlroom qrbuf; + struct cdbdata *cdbfr; + long *msglist = NULL; + long *dellist = NULL; + int num_msgs = 0; + int i, j; + int num_deleted = 0; + int delete_this; + struct MetaData smi; + regex_t re; + regmatch_t pm; + int need_to_free_re = 0; - return netconfig_check_roomaccess(errmsgbuf, n, RemoteIdentifier); + if (content_type) if (!IsEmptyStr(content_type)) { + regcomp(&re, content_type, 0); + need_to_free_re = 1; } - return (0); - - } - - if ((CC->user.axlevel < AxProbU) - && ((CC->room.QRflags & QR_MAILBOX) == 0)) { - snprintf(errmsgbuf, n, "Need to be validated to enter (except in %s> to sysop)", MAILROOM); - return (ERROR + HIGHER_ACCESS_REQUIRED); - } - - CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL); - - if (ra & UA_POSTALLOWED) { - strcpy(errmsgbuf, "OK to post or reply here"); - return(0); - } + MSG_syslog(LOG_DEBUG, " CtdlDeleteMessages(%s, %d msgs, %s)\n", + room_name, num_dmsgnums, content_type); - if ( (ra & UA_REPLYALLOWED) && (is_reply) ) { - /* - * To be thorough, we ought to check to see if the message they are - * replying to is actually a valid one in this room, but unless this - * actually becomes a problem we'll go with high performance instead. - */ - strcpy(errmsgbuf, "OK to reply here"); - return(0); + /* get room record, obtaining a lock... */ + if (CtdlGetRoomLock(&qrbuf, room_name) != 0) { + MSG_syslog(LOG_ERR, " CtdlDeleteMessages(): Room <%s> not found\n", + room_name); + if (need_to_free_re) regfree(&re); + return (0); /* room not found */ } + cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long)); - if ( (ra & UA_REPLYALLOWED) && (!is_reply) ) { - /* Clarify what happened with a better error message */ - snprintf(errmsgbuf, n, "You may only reply to existing messages here."); - return (ERROR + HIGHER_ACCESS_REQUIRED); + if (cdbfr != NULL) { + dellist = malloc(cdbfr->len); + msglist = (long *) cdbfr->ptr; + cdbfr->ptr = NULL; /* CtdlDeleteMessages() now owns this memory */ + num_msgs = cdbfr->len / sizeof(long); + cdb_free(cdbfr); } + if (num_msgs > 0) { + int have_contenttype = (content_type != NULL) && !IsEmptyStr(content_type); + int have_delmsgs = (num_dmsgnums == 0) || (dmsgnums == NULL); + int have_more_del = 1; - snprintf(errmsgbuf, n, "Higher access is required to post in this room."); - return (ERROR + HIGHER_ACCESS_REQUIRED); - -} - - + num_msgs = sort_msglist(msglist, num_msgs); + if (num_dmsgnums > 1) + num_dmsgnums = sort_msglist(dmsgnums, num_dmsgnums); /* - * Check to see if the specified user has Internet mail permission - * (returns nonzero if permission is granted) - */ -int CtdlCheckInternetMailPermission(struct ctdluser *who) { - - /* Do not allow twits to send Internet mail */ - if (who->axlevel <= AxProbU) return(0); - - /* Globally enabled? */ - if (config.c_restrict == 0) return(1); + { + StrBuf *dbg = NewStrBuf(); + for (i = 0; i < num_dmsgnums; i++) + StrBufAppendPrintf(dbg, ", %ld", dmsgnums[i]); + MSG_syslog(LOG_DEBUG, " Deleting before: %s", ChrPtr(dbg)); + FreeStrBuf(&dbg); + } +*/ + i = 0; j = 0; + while ((i < num_msgs) && (have_more_del)) { + delete_this = 0x00; - /* User flagged ok? */ - if (who->flags & US_INTERNET) return(2); + /* Set/clear a bit for each criterion */ - /* Aide level access? */ - if (who->axlevel >= AxAideU) return(3); + /* 0 messages in the list or a null list means that we are + * interested in deleting any messages which meet the other criteria. + */ + if (have_delmsgs) { + delete_this |= 0x01; + } + else { + while ((i < num_msgs) && (msglist[i] < dmsgnums[j])) i++; - /* No mail for you! */ - return(0); -} + if (i >= num_msgs) + continue; - -/* - * Validate recipients, count delivery types and errors, and handle aliasing - * FIXME check for dupes!!!!! - * - * Returns 0 if all addresses are ok, ret->num_error = -1 if no addresses - * were specified, or the number of addresses found invalid. - * - * Caller needs to free the result using free_recipients() - */ -struct recptypes *validate_recipients(const char *supplied_recipients, - const char *RemoteIdentifier, - int Flags) { - struct CitContext *CCC = CC; - struct recptypes *ret; - char *recipients = NULL; - char *org_recp; - char this_recp[256]; - char this_recp_cooked[256]; - char append[SIZ]; - long len; - int num_recps = 0; - int i, j; - int mailtype; - int invalid; - struct ctdluser tempUS; - struct ctdlroom tempQR; - struct ctdlroom tempQR2; - int err = 0; - char errmsg[SIZ]; - int in_quotes = 0; - - /* Initialize */ - ret = (struct recptypes *) malloc(sizeof(struct recptypes)); - if (ret == NULL) return(NULL); - - /* Set all strings to null and numeric values to zero */ - memset(ret, 0, sizeof(struct recptypes)); - - if (supplied_recipients == NULL) { - recipients = strdup(""); - } - else { - recipients = strdup(supplied_recipients); - } - - /* Allocate some memory. Yes, this allocates 500% more memory than we will - * actually need, but it's healthier for the heap than doing lots of tiny - * realloc() calls instead. - */ - len = strlen(recipients) + 1024; - ret->errormsg = malloc(len); - ret->recp_local = malloc(len); - ret->recp_internet = malloc(len); - ret->recp_ignet = malloc(len); - ret->recp_room = malloc(len); - ret->display_recp = malloc(len); - ret->recp_orgroom = malloc(len); - org_recp = malloc(len); - - ret->errormsg[0] = 0; - ret->recp_local[0] = 0; - ret->recp_internet[0] = 0; - ret->recp_ignet[0] = 0; - ret->recp_room[0] = 0; - ret->recp_orgroom[0] = 0; - ret->display_recp[0] = 0; - - ret->recptypes_magic = RECPTYPES_MAGIC; - - /* Change all valid separator characters to commas */ - for (i=0; !IsEmptyStr(&recipients[i]); ++i) { - if ((recipients[i] == ';') || (recipients[i] == '|')) { - recipients[i] = ','; - } - } - - /* Now start extracting recipients... */ - - while (!IsEmptyStr(recipients)) { - 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); - if (IsEmptyStr(this_recp)) - break; - MSG_syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); - ++num_recps; - - strcpy(org_recp, this_recp); - alias(this_recp); - alias(this_recp); - mailtype = alias(this_recp); - - for (j = 0; !IsEmptyStr(&this_recp[j]); ++j) { - if (this_recp[j]=='_') { - this_recp_cooked[j] = ' '; - } - else { - this_recp_cooked[j] = this_recp[j]; - } - } - this_recp_cooked[j] = '\0'; - invalid = 0; - errmsg[0] = 0; - switch(mailtype) { - case MES_LOCAL: - if (!strcasecmp(this_recp, "sysop")) { - ++ret->num_room; - strcpy(this_recp, config.c_aideroom); - if (!IsEmptyStr(ret->recp_room)) { - strcat(ret->recp_room, "|"); - } - strcat(ret->recp_room, this_recp); - } - else if ( (!strncasecmp(this_recp, "room_", 5)) - && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) { - - /* Save room so we can restore it later */ - tempQR2 = CCC->room; - CCC->room = tempQR; - - /* Check permissions to send mail to this room */ - err = CtdlDoIHavePermissionToPostInThisRoom( - errmsg, - sizeof errmsg, - RemoteIdentifier, - Flags, - 0 /* 0 = not a reply */ - ); - if (err) - { - ++ret->num_error; - invalid = 1; - } - else { - ++ret->num_room; - if (!IsEmptyStr(ret->recp_room)) { - strcat(ret->recp_room, "|"); - } - strcat(ret->recp_room, &this_recp_cooked[5]); - - if (!IsEmptyStr(ret->recp_orgroom)) { - strcat(ret->recp_orgroom, "|"); - } - strcat(ret->recp_orgroom, org_recp); - - } - - /* Restore room in case something needs it */ - CCC->room = tempQR2; - - } - else if (CtdlGetUser(&tempUS, this_recp) == 0) { - ++ret->num_local; - strcpy(this_recp, tempUS.fullname); - if (!IsEmptyStr(ret->recp_local)) { - strcat(ret->recp_local, "|"); - } - strcat(ret->recp_local, this_recp); - } - else if (CtdlGetUser(&tempUS, this_recp_cooked) == 0) { - ++ret->num_local; - strcpy(this_recp, tempUS.fullname); - if (!IsEmptyStr(ret->recp_local)) { - strcat(ret->recp_local, "|"); - } - strcat(ret->recp_local, this_recp); - } - else { - ++ret->num_error; - invalid = 1; - } - break; - case MES_INTERNET: - /* Yes, you're reading this correctly: if the target - * domain points back to the local system or an attached - * Citadel directory, the address is invalid. That's - * because if the address were valid, we would have - * already translated it to a local address by now. - */ - if (IsDirectory(this_recp, 0)) { - ++ret->num_error; - invalid = 1; - } - else { - ++ret->num_internet; - if (!IsEmptyStr(ret->recp_internet)) { - strcat(ret->recp_internet, "|"); - } - strcat(ret->recp_internet, this_recp); - } - break; - case MES_IGNET: - ++ret->num_ignet; - if (!IsEmptyStr(ret->recp_ignet)) { - strcat(ret->recp_ignet, "|"); - } - strcat(ret->recp_ignet, this_recp); - break; - case MES_ERROR: - ++ret->num_error; - invalid = 1; - break; - } - if (invalid) { - if (IsEmptyStr(errmsg)) { - snprintf(append, sizeof append, "Invalid recipient: %s", this_recp); - } - else { - snprintf(append, sizeof append, "%s", errmsg); - } - if ( (strlen(ret->errormsg) + strlen(append) + 3) < SIZ) { - if (!IsEmptyStr(ret->errormsg)) { - strcat(ret->errormsg, "; "); - } - strcat(ret->errormsg, append); - } - } - else { - if (IsEmptyStr(ret->display_recp)) { - strcpy(append, this_recp); - } - else { - snprintf(append, sizeof append, ", %s", this_recp); - } - if ( (strlen(ret->display_recp)+strlen(append)) < SIZ) { - strcat(ret->display_recp, append); - } - } - } - free(org_recp); - - if ((ret->num_local + ret->num_internet + ret->num_ignet + - ret->num_room + ret->num_error) == 0) { - ret->num_error = (-1); - strcpy(ret->errormsg, "No recipients specified."); - } - - MSGM_syslog(LOG_DEBUG, "validate_recipients()\n"); - MSG_syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); - MSG_syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); - MSG_syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); - MSG_syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); - MSG_syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); - - free(recipients); - return(ret); -} - - -/* - * Destructor for struct recptypes - */ -void free_recipients(struct recptypes *valid) { - - if (valid == NULL) { - return; - } - - if (valid->recptypes_magic != RECPTYPES_MAGIC) { - struct CitContext *CCC = CC; - MSGM_syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n"); - abort(); - } - - if (valid->errormsg != NULL) free(valid->errormsg); - if (valid->recp_local != NULL) free(valid->recp_local); - if (valid->recp_internet != NULL) free(valid->recp_internet); - if (valid->recp_ignet != NULL) free(valid->recp_ignet); - if (valid->recp_room != NULL) free(valid->recp_room); - if (valid->recp_orgroom != NULL) free(valid->recp_orgroom); - if (valid->display_recp != NULL) free(valid->display_recp); - if (valid->bounce_to != NULL) free(valid->bounce_to); - if (valid->envelope_from != NULL) free(valid->envelope_from); - if (valid->sending_room != NULL) free(valid->sending_room); - free(valid); -} - - - -/* - * 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['V'] = 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 (msg->cm_fields['E'] != NULL) { - cprintf("%s\n", msg->cm_fields['E']); - } else { - cprintf("\n"); - } - cprintf("000\n"); - } - - CtdlFreeMessage(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 */ - 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. */ - ) -{ - struct CitContext *CCC = CC; - struct ctdlroom qrbuf; - struct cdbdata *cdbfr; - long *msglist = NULL; - long *dellist = NULL; - int num_msgs = 0; - int i, j; - int num_deleted = 0; - int delete_this; - struct MetaData smi; - regex_t re; - regmatch_t pm; - int need_to_free_re = 0; - - if (content_type) if (!IsEmptyStr(content_type)) { - regcomp(&re, content_type, 0); - need_to_free_re = 1; - } - MSG_syslog(LOG_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n", - room_name, num_dmsgnums, content_type); - - /* get room record, obtaining a lock... */ - if (CtdlGetRoomLock(&qrbuf, room_name) != 0) { - MSG_syslog(LOG_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", - room_name); - if (need_to_free_re) regfree(&re); - return (0); /* room not found */ - } - cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long)); - - if (cdbfr != NULL) { - dellist = malloc(cdbfr->len); - msglist = (long *) cdbfr->ptr; - cdbfr->ptr = NULL; /* CtdlDeleteMessages() now owns this memory */ - num_msgs = cdbfr->len / sizeof(long); - cdb_free(cdbfr); - } - if (num_msgs > 0) { - int have_contenttype = (content_type != NULL) && !IsEmptyStr(content_type); - int have_delmsgs = (num_dmsgnums == 0) || (dmsgnums == NULL); - int have_more_del = 1; - - num_msgs = sort_msglist(msglist, num_msgs); - if (num_dmsgnums > 1) - num_dmsgnums = sort_msglist(dmsgnums, num_dmsgnums); -/* - { - StrBuf *dbg = NewStrBuf(); - for (i = 0; i < num_dmsgnums; i++) - StrBufAppendPrintf(dbg, ", %ld", dmsgnums[i]); - MSG_syslog(LOG_DEBUG, "Deleting before: %s", ChrPtr(dbg)); - FreeStrBuf(&dbg); - } -*/ - i = 0; j = 0; - while ((i < num_msgs) && (have_more_del)) { - delete_this = 0x00; - - - /* Set/clear a bit for each criterion */ - - /* 0 messages in the list or a null list means that we are - * interested in deleting any messages which meet the other criteria. - */ - if (have_delmsgs) { - delete_this |= 0x01; - } - else { - while ((i < num_msgs) && (msglist[i] < dmsgnums[j])) i++; - if (msglist[i] == dmsgnums[j]) { - delete_this |= 0x01; - } - j++; - have_more_del = (j < num_dmsgnums); - } + if (msglist[i] == dmsgnums[j]) { + delete_this |= 0x01; + } + j++; + have_more_del = (j < num_dmsgnums); + } if (have_contenttype) { GetMetaData(&smi, msglist[i]); @@ -4747,7 +3620,7 @@ int CtdlDeleteMessages(char *room_name, /* which room */ StrBuf *dbg = NewStrBuf(); for (i = 0; i < num_deleted; i++) StrBufAppendPrintf(dbg, ", %ld", dellist[i]); - MSG_syslog(LOG_DEBUG, "Deleting: %s", ChrPtr(dbg)); + MSG_syslog(LOG_DEBUG, " Deleting: %s", ChrPtr(dbg)); FreeStrBuf(&dbg); } */ @@ -4779,186 +3652,13 @@ int CtdlDeleteMessages(char *room_name, /* which room */ /* Now free the memory we used, and go away. */ if (msglist != NULL) free(msglist); if (dellist != NULL) free(dellist); - MSG_syslog(LOG_DEBUG, "%d message(s) deleted.\n", num_deleted); + MSG_syslog(LOG_DEBUG, " %d message(s) deleted.\n", num_deleted); if (need_to_free_re) regfree(&re); return (num_deleted); } -/* - * Check whether the current user has permission to delete messages from - * the current room (returns 1 for yes, 0 for no) - */ -int CtdlDoIHavePermissionToDeleteMessagesFromThisRoom(void) { - int ra; - CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL); - if (ra & UA_DELETEALLOWED) return(1); - return(0); -} - - - - -/* - * 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; - - /* Aides 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") ); -} - - /* * GetMetaData() - Get the supplementary record for a message @@ -5235,7 +3935,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); @@ -5247,39 +3947,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"); @@ -5288,13 +3977,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['A'] = strdup(CCC->user.fullname); - msg->cm_fields['O'] = strdup(req_room); - msg->cm_fields['N'] = strdup(config.c_nodename); - msg->cm_fields['H'] = 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, CFG_KEY(c_nodename)); + CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode)); msg->cm_flags = flags; - msg->cm_fields['M'] = encoded_message; + CM_SetAsFieldSB(msg, eMesageText, &encoded_message); /* Create the requested room if we have to. */ if (CtdlGetRoom(&qrbuf, roomname) != 0) { @@ -5312,119 +4001,11 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ } /* Now write the data */ CtdlSubmitMsg(msg, NULL, roomname, 0); - CtdlFreeMessage(msg); + CM_Free(msg); } - - - -void CtdlGetSysConfigBackend(long msgnum, void *userdata) { - config_msgnum = msgnum; -} - - -char *CtdlGetSysConfig(char *sysconfname) { - char hold_rm[ROOMNAMELEN]; - long msgnum; - char *conf; - struct CtdlMessage *msg; - char buf[SIZ]; - - strcpy(hold_rm, CC->room.QRname); - if (CtdlGetRoom(&CC->room, SYSCONFIGROOM) != 0) { - CtdlGetRoom(&CC->room, hold_rm); - return NULL; - } - - - /* We want the last (and probably only) config in this room */ - begin_critical_section(S_CONFIG); - config_msgnum = (-1L); - CtdlForEachMessage(MSGS_LAST, 1, NULL, sysconfname, NULL, - CtdlGetSysConfigBackend, NULL); - msgnum = config_msgnum; - end_critical_section(S_CONFIG); - - if (msgnum < 0L) { - conf = NULL; - } - else { - msg = CtdlFetchMessage(msgnum, 1); - if (msg != NULL) { - conf = strdup(msg->cm_fields['M']); - CtdlFreeMessage(msg); - } - else { - conf = NULL; - } - } - - CtdlGetRoom(&CC->room, hold_rm); - - if (conf != NULL) do { - extract_token(buf, conf, 0, '\n', sizeof buf); - strcpy(conf, &conf[strlen(buf)+1]); - } while ( (!IsEmptyStr(conf)) && (!IsEmptyStr(buf)) ); - - return(conf); -} - - -void CtdlPutSysConfig(char *sysconfname, char *sysconfdata) { - CtdlWriteObject(SYSCONFIGROOM, sysconfname, sysconfdata, (strlen(sysconfdata)+1), NULL, 0, 1, 0); -} - - -/* - * Determine whether a given Internet address belongs to the current user - */ -int CtdlIsMe(char *addr, int addr_buf_len) -{ - struct recptypes *recp; - int i; - - recp = validate_recipients(addr, NULL, 0); - if (recp == NULL) return(0); - - if (recp->num_local == 0) { - free_recipients(recp); - return(0); - } - - for (i=0; inum_local; ++i) { - extract_token(addr, recp->recp_local, i, '|', addr_buf_len); - if (!strcasecmp(addr, CC->user.fullname)) { - free_recipients(recp); - return(1); - } - } - - free_recipients(recp); - return(0); -} - - -/* - * Citadel protocol command to do the same - */ -void cmd_isme(char *argbuf) { - char addr[256]; - - if (CtdlAccessCheck(ac_logged_in)) return; - extract_token(addr, argbuf, 0, '|', sizeof addr); - - if (CtdlIsMe(addr, sizeof addr)) { - cprintf("%d %s\n", CIT_OK, addr); - } - else { - cprintf("%d Not you.\n", ERROR + ILLEGAL_VALUE); - } - -} - - /*****************************************************************************/ /* MODULE INITIALIZATION STUFF */ /*****************************************************************************/ @@ -5436,19 +4017,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"); - CtdlRegisterProtoHook(cmd_isme, "ISME", "Determine whether an email address belongs to a user"); } /* return our Subversion id for the Log */