* GNU General Public License for more details.
*/
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
-#include <sys/types.h>
+#include <stdio.h>
#include <regex.h>
+#include <libcitadel.h>
#include "md5.h"
-#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+#include "ctdl_module.h"
#include "citserver.h"
-#include "room_ops.h"
-#include "user_ops.h"
-#include "file_ops.h"
-#include "config.h"
#include "control.h"
+#include "clientsocket.h"
#include "genstamp.h"
+#include "room_ops.h"
+#include "user_ops.h"
+
#include "internet_addressing.h"
#include "euidindex.h"
+#include "msgbase.h"
#include "journaling.h"
-#include "citadel_dirs.h"
-#include "clientsocket.h"
-#include "threads.h"
-
-#include "ctdl_module.h"
struct addresses_to_be_filed *atbf = NULL;
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)
if (Msg->cm_fields[WhichToCut] == NULL)
return;
- if (strlen(Msg->cm_fields[WhichToCut]) > maxlen)
+ if (Msg->cm_lengths[WhichToCut] > maxlen)
+ {
Msg->cm_fields[WhichToCut][maxlen] = '\0';
+ Msg->cm_lengths[WhichToCut] = maxlen;
+ }
}
void CM_FlushField(struct CtdlMessage *Msg, eMsgField which)
if (Msg->cm_fields[which] != NULL)
free (Msg->cm_fields[which]);
Msg->cm_fields[which] = NULL;
+ Msg->cm_lengths[which] = 0;
+}
+void CM_Flush(struct CtdlMessage *Msg)
+{
+ int i;
+
+ if (CM_IsValidMsg(Msg) == 0)
+ return;
+
+ for (i = 0; i < 256; ++i)
+ {
+ CM_FlushField(Msg, i);
+ }
}
void CM_CopyField(struct CtdlMessage *Msg, eMsgField WhichToPutTo, eMsgField WhichtToCopy)
if (Msg->cm_fields[WhichtToCopy] != NULL)
{
- len = strlen(Msg->cm_fields[WhichtToCopy]);
+ len = Msg->cm_lengths[WhichtToCopy];
Msg->cm_fields[WhichToPutTo] = malloc(len + 1);
- memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichToPutTo], len);
+ memcpy(Msg->cm_fields[WhichToPutTo], Msg->cm_fields[WhichtToCopy], len);
Msg->cm_fields[WhichToPutTo][len] = '\0';
+ Msg->cm_lengths[WhichToPutTo] = len;
}
else
+ {
Msg->cm_fields[WhichToPutTo] = NULL;
+ Msg->cm_lengths[WhichToPutTo] = 0;
+ }
}
long newmsgsize;
char *new;
- oldmsgsize = strlen(Msg->cm_fields[which]) + 1;
+ oldmsgsize = Msg->cm_lengths[which] + 1;
newmsgsize = length + oldmsgsize;
new = malloc(newmsgsize);
memcpy(new + length, Msg->cm_fields[which], oldmsgsize);
free(Msg->cm_fields[which]);
Msg->cm_fields[which] = new;
+ Msg->cm_lengths[which] = newmsgsize - 1;
}
else {
Msg->cm_fields[which] = malloc(length + 1);
memcpy(Msg->cm_fields[which], buf, length);
Msg->cm_fields[which][length] = '\0';
+ Msg->cm_lengths[which] = length;
}
}
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]);
+ Msg->cm_lengths[which] = StrLength(*buf);
Msg->cm_fields[which] = SmashStrBuf(buf);
}
{
if (Msg->cm_fields[which] != NULL)
{
- *retlen = strlen(Msg->cm_fields[which]);
+ *retlen = Msg->cm_lengths[which];
*ret = Msg->cm_fields[which];
Msg->cm_fields[which] = NULL;
+ Msg->cm_lengths[which] = 0;
}
else
{
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 */
int CM_DupField(eMsgField i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg)
{
long len;
- len = strlen(OrgMsg->cm_fields[i]);
+ len = OrgMsg->cm_lengths[i];
NewMsg->cm_fields[i] = malloc(len + 1);
if (NewMsg->cm_fields[i] == NULL)
return 0;
memcpy(NewMsg->cm_fields[i], OrgMsg->cm_fields[i], len);
NewMsg->cm_fields[i][len] = '\0';
+ NewMsg->cm_lengths[i] = len;
return 1;
}
-/*
- * Back end for the MSGS command: output message number only.
- */
-void simple_listing(long msgnum, void *userdata)
-{
- cprintf("%ld\n", msgnum);
-}
-
-
-
-/*
- * Back end for the MSGS command: output header summary.
- */
-void headers_listing(long msgnum, void *userdata)
-{
- struct CtdlMessage *msg;
-
- msg = CtdlFetchMessage(msgnum, 0);
- if (msg == NULL) {
- cprintf("%ld|0|||||\n", msgnum);
- return;
- }
-
- cprintf("%ld|%s|%s|%s|%s|%s|\n",
- msgnum,
- (!CM_IsEmpty(msg, eTimestamp) ? msg->cm_fields[eTimestamp] : "0"),
- (!CM_IsEmpty(msg, eAuthor) ? msg->cm_fields[eAuthor] : ""),
- (!CM_IsEmpty(msg, eNodeName) ? msg->cm_fields[eNodeName] : ""),
- (!CM_IsEmpty(msg, erFc822Addr) ? msg->cm_fields[erFc822Addr] : ""),
- (!CM_IsEmpty(msg, eMsgSubject) ? msg->cm_fields[eMsgSubject] : "")
- );
- CM_Free(msg);
-}
-
-/*
- * Back end for the MSGS command: output EUID header.
- */
-void headers_euid(long msgnum, void *userdata)
-{
- struct CtdlMessage *msg;
-
- msg = CtdlFetchMessage(msgnum, 0);
- if (msg == NULL) {
- cprintf("%ld||\n", msgnum);
- return;
- }
-
- cprintf("%ld|%s|%s\n",
- msgnum,
- (!CM_IsEmpty(msg, eExclusiveID) ? msg->cm_fields[eExclusiveID] : ""),
- (!CM_IsEmpty(msg, eTimestamp) ? msg->cm_fields[eTimestamp] : "0"));
- CM_Free(msg);
-}
-
-
-
/* Determine if a given message matches the fields in a message template.
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;
}
}
-/*
- * cmd_msgs() - get list of message #'s in this room
- * implements the MSGS server command using CtdlForEachMessage()
- */
-void cmd_msgs(char *cmdbuf)
-{
- int mode = 0;
- char which[16];
- char buf[256];
- char tfield[256];
- char tvalue[256];
- int cm_ref = 0;
- int i;
- int with_template = 0;
- struct CtdlMessage *template = NULL;
- char search_string[1024];
- ForEachMsgCallback CallBack;
-
- if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
-
- extract_token(which, cmdbuf, 0, '|', sizeof which);
- cm_ref = extract_int(cmdbuf, 1);
- extract_token(search_string, cmdbuf, 1, '|', sizeof search_string);
- with_template = extract_int(cmdbuf, 2);
- switch (extract_int(cmdbuf, 3))
- {
- default:
- case MSG_HDRS_BRIEF:
- CallBack = simple_listing;
- break;
- case MSG_HDRS_ALL:
- CallBack = headers_listing;
- break;
- case MSG_HDRS_EUID:
- CallBack = headers_euid;
- break;
- }
-
- strcat(which, " ");
- if (!strncasecmp(which, "OLD", 3))
- mode = MSGS_OLD;
- else if (!strncasecmp(which, "NEW", 3))
- mode = MSGS_NEW;
- else if (!strncasecmp(which, "FIRST", 5))
- mode = MSGS_FIRST;
- else if (!strncasecmp(which, "LAST", 4))
- mode = MSGS_LAST;
- else if (!strncasecmp(which, "GT", 2))
- mode = MSGS_GT;
- else if (!strncasecmp(which, "LT", 2))
- mode = MSGS_LT;
- else if (!strncasecmp(which, "SEARCH", 6))
- mode = MSGS_SEARCH;
- else
- mode = MSGS_ALL;
-
- if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) {
- cprintf("%d Full text index is not enabled on this server.\n",
- ERROR + CMD_NOT_SUPPORTED);
- return;
- }
-
- if (with_template) {
- unbuffer_output();
- cprintf("%d Send template then receive message list\n",
- START_CHAT_MODE);
- template = (struct CtdlMessage *)
- malloc(sizeof(struct CtdlMessage));
- memset(template, 0, sizeof(struct CtdlMessage));
- template->cm_magic = CTDLMESSAGE_MAGIC;
- template->cm_anon_type = MES_NORMAL;
-
- while(client_getln(buf, sizeof buf) >= 0 && strcmp(buf,"000")) {
- long tValueLen;
- extract_token(tfield, buf, 0, '|', sizeof tfield);
- tValueLen = extract_token(tvalue, buf, 1, '|', sizeof tvalue);
- for (i='A'; i<='Z'; ++i) if (msgkeys[i]!=NULL) {
- if (!strcasecmp(tfield, msgkeys[i])) {
- CM_SetField(template, i, tvalue, tValueLen);
- }
- }
- }
- buffer_output();
- }
- else {
- cprintf("%d \n", LISTING_FOLLOWS);
- }
-
- CtdlForEachMessage(mode,
- ( (mode == MSGS_SEARCH) ? 0 : cm_ref ),
- ( (mode == MSGS_SEARCH) ? search_string : NULL ),
- NULL,
- template,
- CallBack,
- NULL);
- if (template != NULL) CM_Free(template);
- cprintf("000\n");
-}
-
-
/*
* memfmout() - Citadel text formatter and paginator.
* Although the original purpose of this routine was to format
MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
- len = 0;
client_write(nl, nllen);
column = 0;
}
/*
* 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)
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));
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
break;
}
field_header = *mptr++;
+ which = field_header;
len = strlen(mptr);
- CM_SetField(ret, field_header, mptr, len);
+ CM_SetField(ret, which, mptr, len);
mptr += len + 1; /* advance to next field */
if ( (CM_IsEmpty(ret, eMesageText)) && (with_body) ) {
dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long));
if (dmsgtext != NULL) {
- CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len);
+ CM_SetAsField(ret, eMesageText, &dmsgtext->ptr, dmsgtext->len - 1);
cdb_free(dmsgtext);
}
}
}
/* Perform "before read" hooks (aborting if any return nonzero) */
- if (PerformMessageHooks(ret, EVT_BEFOREREAD) > 0) {
+ if (PerformMessageHooks(ret, NULL, EVT_BEFOREREAD) > 0) {
CM_Free(ret);
return NULL;
}
if (section) if (!IsEmptyStr(section)) if (strcmp(section, "0")) {
memset(&encap, 0, sizeof encap);
safestrncpy(encap.desired_section, section, sizeof encap.desired_section);
- mime_parser(TheMessage->cm_fields[eMesageText],
- NULL,
- *extract_encapsulated_message,
- NULL, NULL, (void *)&encap, 0
- );
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *extract_encapsulated_message,
+ NULL, NULL, (void *)&encap, 0
+ );
if ((Author != NULL) && (*Author == NULL))
{
- *Author = TheMessage->cm_fields[eAuthor];
- TheMessage->cm_fields[eAuthor] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, eAuthor, Author, &len);
}
if ((Address != NULL) && (*Address == NULL))
{
- *Address = TheMessage->cm_fields[erFc822Addr];
- TheMessage->cm_fields[erFc822Addr] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
}
CM_Free(TheMessage);
TheMessage = NULL;
retcode = CtdlOutputPreLoadedMsg(TheMessage, mode, headers_only, do_proto, crlf, flags);
if ((Author != NULL) && (*Author == NULL))
{
- *Author = TheMessage->cm_fields[eAuthor];
- TheMessage->cm_fields[eAuthor] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, eAuthor, Author, &len);
}
if ((Address != NULL) && (*Address == NULL))
{
- *Address = TheMessage->cm_fields[erFc822Addr];
- TheMessage->cm_fields[erFc822Addr] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
}
CM_Free(TheMessage);
) {
struct CitContext *CCC = CC;
int i;
- char *mptr = NULL;
const char *nl; /* newline string */
struct ma_info ma;
* Pad it with spaces in order to avoid changing the RFC822 length of the message.
*/
if ( (flags & SUPPRESS_ENV_TO) && (!CM_IsEmpty(TheMessage, eenVelopeTo)) ) {
- memset(TheMessage->cm_fields[eenVelopeTo], ' ', strlen(TheMessage->cm_fields[eenVelopeTo]));
+ memset(TheMessage->cm_fields[eenVelopeTo], ' ', TheMessage->cm_lengths[eenVelopeTo]);
}
/* Are we downloading a MIME component? */
ERROR + RESOURCE_BUSY);
} else {
/* Parse the message text component */
- mptr = TheMessage->cm_fields[eMesageText];
- mime_parser(mptr, NULL, *mime_download, NULL, NULL, NULL, 0);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *mime_download, NULL, NULL, NULL, 0);
/* If there's no file open by this time, the requested
* section wasn't found, so print an error
*/
/* Parse the message text component */
int found_it = 0;
- mptr = TheMessage->cm_fields[eMesageText];
- mime_parser(mptr, NULL, *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *mime_spew_section, NULL, NULL, (void *)&found_it, 0);
/* If section wasn't found, print an error
*/
if (!found_it) {
strcpy(suser, "");
strcpy(luser, "");
strcpy(fuser, "");
- strcpy(snode, NODENAME);
+ memcpy(snode, CFG_KEY(c_nodename) + 1);
if (mode == MT_RFC822)
OutputRFC822MsgHeaders(
TheMessage,
/* Tell the client about the MIME parts in this message */
if (TheMessage->cm_format_type == FMT_RFC822) {
if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) {
- mptr = TheMessage->cm_fields[eMesageText];
memset(&ma, 0, sizeof(struct ma_info));
- mime_parser(mptr, NULL,
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
(do_proto ? *list_this_part : NULL),
(do_proto ? *list_this_pref : NULL),
(do_proto ? *list_this_suff : NULL),
* message to the reader's screen width.
*/
if (TheMessage->cm_format_type == FMT_CITADEL) {
- mptr = TheMessage->cm_fields[eMesageText];
-
if (mode == MT_MIME) {
cprintf("Content-type: text/x-citadel-variformat\n\n");
}
- memfmout(mptr, nl);
+ memfmout(TheMessage->cm_fields[eMesageText], nl);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
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);
}
}
return(om_ok);
}
-
-/*
- * display a message (mode 0 - Citadel proprietary)
- */
-void cmd_msg0(char *cmdbuf)
-{
- long msgid;
- int headers_only = HEADERS_ALL;
-
- msgid = extract_long(cmdbuf, 0);
- headers_only = extract_int(cmdbuf, 1);
-
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0, NULL, 0, NULL, NULL);
- return;
-}
-
-
-/*
- * display a message (mode 2 - RFC822)
- */
-void cmd_msg2(char *cmdbuf)
-{
- long msgid;
- int headers_only = HEADERS_ALL;
-
- msgid = extract_long(cmdbuf, 0);
- headers_only = extract_int(cmdbuf, 1);
-
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL, 0, NULL, NULL);
-}
-
-
-
-/*
- * display a message (mode 3 - IGnet raw format - internal programs only)
- */
-void cmd_msg3(char *cmdbuf)
-{
- long msgnum;
- struct CtdlMessage *msg = NULL;
- struct ser_ret smr;
-
- if (CC->internal_pgm == 0) {
- cprintf("%d This command is for internal programs only.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
-
- msgnum = extract_long(cmdbuf, 0);
- msg = CtdlFetchMessage(msgnum, 1);
- if (msg == NULL) {
- cprintf("%d Message %ld not found.\n",
- ERROR + MESSAGE_NOT_FOUND, msgnum);
- return;
- }
-
- serialize_message(&smr, msg);
- CM_Free(msg);
-
- if (smr.len == 0) {
- cprintf("%d Unable to serialize message\n",
- ERROR + INTERNAL_ERROR);
- return;
- }
-
- cprintf("%d %ld\n", BINARY_FOLLOWS, (long)smr.len);
- client_write((char *)smr.ser, (int)smr.len);
- free(smr.ser);
-}
-
-
-
-/*
- * Display a message using MIME content types
- */
-void cmd_msg4(char *cmdbuf)
-{
- long msgid;
- char section[64];
-
- msgid = extract_long(cmdbuf, 0);
- extract_token(section, cmdbuf, 1, '|', sizeof section);
- CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0, (section[0] ? section : NULL) , 0, NULL, NULL);
-}
-
-
-
-/*
- * Client tells us its preferred message format(s)
- */
-void cmd_msgp(char *cmdbuf)
-{
- if (!strcasecmp(cmdbuf, "dont_decode")) {
- CC->msg4_dont_decode = 1;
- cprintf("%d MSG4 will not pre-decode messages.\n", CIT_OK);
- }
- else {
- safestrncpy(CC->preferred_formats, cmdbuf, sizeof(CC->preferred_formats));
- cprintf("%d Preferred MIME formats have been set.\n", CIT_OK);
- }
-}
-
-
-/*
- * Open a component of a MIME message as a download file
- */
-void cmd_opna(char *cmdbuf)
-{
- long msgid;
- char desired_section[128];
-
- msgid = extract_long(cmdbuf, 0);
- extract_token(desired_section, cmdbuf, 1, '|', sizeof desired_section);
- safestrncpy(CC->download_desired_section, desired_section,
- sizeof CC->download_desired_section);
- CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1, NULL, 0, NULL, NULL);
-}
-
-
-/*
- * Open a component of a MIME message and transmit it all at once
- */
-void cmd_dlat(char *cmdbuf)
-{
- long msgid;
- char desired_section[128];
-
- msgid = extract_long(cmdbuf, 0);
- extract_token(desired_section, cmdbuf, 1, '|', sizeof desired_section);
- safestrncpy(CC->download_desired_section, desired_section,
- sizeof CC->download_desired_section);
- CtdlOutputMsg(msgid, MT_SPEW_SECTION, 0, 1, 1, NULL, 0, NULL, NULL);
-}
-
-
/*
* Save one or more message pointers into a specified room
* (Returns 0 for success, nonzero for failure)
struct ser_ret smr;
int is_bigmsg = 0;
char *holdM = NULL;
+ long holdMLen = 0;
/* Get a new message number */
newmsgid = get_new_message_number();
/* If the message is big, set its body aside for storage elsewhere */
if (!CM_IsEmpty(msg, eMesageText)) {
- if (strlen(msg->cm_fields[eMesageText]) > BIGMSG) {
+ if (msg->cm_lengths[eMesageText] > BIGMSG) {
is_bigmsg = 1;
holdM = msg->cm_fields[eMesageText];
msg->cm_fields[eMesageText] = NULL;
+ holdMLen = msg->cm_lengths[eMesageText];
+ msg->cm_lengths[eMesageText] = 0;
}
}
/* Serialize our data structure for storage in the database */
- serialize_message(&smr, msg);
+ CtdlSerializeMessage(&smr, msg);
if (is_bigmsg) {
msg->cm_fields[eMesageText] = holdM;
+ msg->cm_lengths[eMesageText] = holdMLen;
}
if (smr.len == 0) {
&newmsgid,
(int)sizeof(long),
holdM,
- (strlen(holdM) + 1)
+ (holdMLen + 1)
);
}
retval = newmsgid;
* 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;
- long lengths[NDiskFields];
-
- memset(lengths, 0, sizeof(lengths));
/*
* Check for valid message format
*/
if (CM_IsValidMsg(msg) == 0) {
- MSGM_syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n");
+ MSGM_syslog(LOG_ERR, "CtdlSerializeMessage() aborting due to invalid message\n");
ret->len = 0;
ret->ser = NULL;
return;
ret->len = 3;
for (i=0; i < NDiskFields; ++i)
if (msg->cm_fields[FieldOrder[i]] != NULL)
- {
- lengths[i] = strlen(msg->cm_fields[FieldOrder[i]]);
- ret->len += lengths[i] + 2;
- }
+ ret->len += msg->cm_lengths[FieldOrder[i]] + 2;
ret->ser = malloc(ret->len);
if (ret->ser == NULL) {
- MSG_syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n",
+ MSG_syslog(LOG_ERR, "CtdlSerializeMessage() malloc(%ld) failed: %s\n",
(long)ret->len, strerror(errno));
ret->len = 0;
ret->ser = NULL;
for (i=0; i < NDiskFields; ++i)
if (msg->cm_fields[FieldOrder[i]] != NULL)
{
- fieldlen = lengths[i];
ret->ser[wlen++] = (char)FieldOrder[i];
memcpy(&ret->ser[wlen],
msg->cm_fields[FieldOrder[i]],
- fieldlen+1);
+ msg->cm_lengths[FieldOrder[i]] + 1);
- wlen = wlen + fieldlen + 1;
+ wlen = wlen + msg->cm_lengths[FieldOrder[i]] + 1;
}
if (ret->len != wlen) {
* Save a message to disk and submit it into the delivery system.
*/
long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */
- struct recptypes *recps, /* recipients (if mail) */
+ recptypes *recps, /* recipients (if mail) */
const char *force, /* force a particular room? */
int flags /* should the message be exported clean? */
)
{
- char submit_filename[128];
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
char force_room[ROOMNAMELEN];
char content_type[SIZ]; /* We have to learn this */
char recipient[SIZ];
+ char bounce_to[1024];
const char *room;
long newmsgid;
const char *mptr = NULL;
struct ctdluser userbuf;
int a, i;
struct MetaData smi;
- FILE *network_fp = NULL;
- static int seqnum = 1;
- struct CtdlMessage *imsg = NULL;
- char *instr = NULL;
- size_t instr_alloc = 0;
- struct ser_ret smr;
- char *hold_R, *hold_D;
char *collected_addresses = NULL;
struct addresses_to_be_filed *aptr = NULL;
StrBuf *saved_rfc822_version = NULL;
int qualified_for_journaling = 0;
CitContext *CCC = MyContext();
- char bounce_to[1024] = "";
- int rv = 0;
MSGM_syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n");
if (CM_IsValidMsg(msg) == 0) return(-1); /* self check */
/* 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
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[eAuthor], msg->cm_fields[eNodeName]);
+ if ((recps != NULL) && (recps->bounce_to == NULL))
+ {
+ if (CCC->logged_in)
+ snprintf(bounce_to, sizeof bounce_to, "%s@%s",
+ CCC->user.fullname, 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; i<num_tokens(recps->recp_local, '|'); ++i) {
- long recipientlen;
- recipientlen = extract_token(recipient,
- recps->recp_local, i,
- '|', sizeof recipient);
- MSG_syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n",
- recipient);
+ {
+ char *pch;
+ int ntokens;
+
+ pch = recps->recp_local;
+ recps->recp_local = recipient;
+ ntokens = num_tokens(pch, '|');
+ for (i=0; i<ntokens; ++i)
+ {
+ extract_token(recipient, pch, i, '|', sizeof recipient);
+ MSG_syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n", recipient);
if (CtdlGetUser(&userbuf, recipient) == 0) {
CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg);
CtdlBumpNewMailCounter(userbuf.usernum);
- if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) {
- /* Generate a instruction message for the Funambol notification
- * server, in the same style as the SMTP queue
- */
- long instrlen;
- instr_alloc = 1024;
- instr = malloc(instr_alloc);
- instrlen = snprintf(
- instr, instr_alloc,
- "Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
- "bounceto|%s\n",
- SPOOLMIME,
- newmsgid,
- (long)time(NULL), //todo: time() is expensive!
- bounce_to
- );
-
- imsg = malloc(sizeof(struct CtdlMessage));
- memset(imsg, 0, sizeof(struct CtdlMessage));
- imsg->cm_magic = CTDLMESSAGE_MAGIC;
- imsg->cm_anon_type = MES_NORMAL;
- imsg->cm_format_type = FMT_RFC822;
- CM_SetField(imsg, eMsgSubject, HKEY("QMSG"));
- CM_SetField(imsg, eAuthor, HKEY("Citadel"));
- CM_SetField(imsg, eJournal, HKEY("do not journal"));
- CM_SetAsField(imsg, eMesageText, &instr, instrlen);
- CM_SetField(imsg, eExtnotify, recipient, recipientlen);
- CtdlSubmitMsg(imsg, NULL, FNBL_QUEUE_ROOM, 0);
- CM_Free(imsg);
- }
+ PerformMessageHooks(msg, recps, EVT_AFTERUSRMBOXSAVE);
}
else {
MSG_syslog(LOG_DEBUG, "No user <%s>\n", recipient);
CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
+ recps->recp_local = pch;
+ }
/* Perform "after save" hooks */
MSGM_syslog(LOG_DEBUG, "Performing after-save hooks\n");
- CM_SetFieldLONG(msg, eVltMsgNum, newmsgid);
- PerformMessageHooks(msg, EVT_AFTERSAVE);
+ PerformMessageHooks(msg, recps, EVT_AFTERSAVE);
CM_FlushField(msg, eVltMsgNum);
- /* For IGnet mail, we have to save a new copy into the spooler for
- * each recipient, with the R and D fields set to the recipient and
- * destination-node. This has two ugly side effects: all other
- * recipients end up being unlisted in this recipient's copy of the
- * message, and it has to deliver multiple messages to the same
- * node. We'll revisit this again in a year or so when everyone has
- * a network spool receiver that can handle the new style messages.
- */
- if ((recps != NULL) && (recps->num_ignet > 0))
- for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
- extract_token(recipient, recps->recp_ignet, i,
- '|', sizeof recipient);
-
- hold_R = msg->cm_fields[eRecipient];
- hold_D = msg->cm_fields[eDestination];
- msg->cm_fields[eRecipient] = malloc(SIZ);
- msg->cm_fields[eDestination] = malloc(128);
- extract_token(msg->cm_fields[eRecipient], recipient, 0, '@', SIZ);
- extract_token(msg->cm_fields[eDestination], recipient, 1, '@', 128);
-
- serialize_message(&smr, msg);
- if (smr.len > 0) {
- snprintf(submit_filename, sizeof submit_filename,
- "%s/netmail.%04lx.%04x.%04x",
- ctdl_netin_dir,
- (long) getpid(), CCC->cs_pid, ++seqnum);
- network_fp = fopen(submit_filename, "wb+");
- if (network_fp != NULL) {
- rv = fwrite(smr.ser, smr.len, 1, network_fp);
- if (rv == -1) {
- MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n",
- strerror(errno));
- }
- fclose(network_fp);
- }
- free(smr.ser);
- }
-
- free(msg->cm_fields[eRecipient]);
- free(msg->cm_fields[eDestination]);
- msg->cm_fields[eRecipient] = hold_R;
- msg->cm_fields[eDestination] = hold_D;
- }
-
/* Go back to the room we started from */
MSG_syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm);
if (strcasecmp(hold_rm, CCC->room.QRname))
CtdlUserGoto(hold_rm, 0, 1, NULL, NULL);
- /* For internet mail, generate delivery instructions.
- * Yes, this is recursive. Deal with it. Infinite recursion does
- * not happen because the delivery instructions message does not
- * contain a recipient.
- */
- if ((recps != NULL) && (recps->num_internet > 0)) {
- StrBuf *SpoolMsg = NewStrBuf();
- long nTokens;
-
- MSGM_syslog(LOG_DEBUG, "Generating delivery instructions\n");
-
- StrBufPrintf(SpoolMsg,
- "Content-type: "SPOOLMIME"\n"
- "\n"
- "msgid|%ld\n"
- "submitted|%ld\n"
- "bounceto|%s\n",
- newmsgid,
- (long)time(NULL),
- bounce_to);
-
- if (recps->envelope_from != NULL) {
- StrBufAppendBufPlain(SpoolMsg, HKEY("envelope_from|"), 0);
- StrBufAppendBufPlain(SpoolMsg, recps->envelope_from, -1, 0);
- StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0);
- }
- if (recps->sending_room != NULL) {
- StrBufAppendBufPlain(SpoolMsg, HKEY("source_room|"), 0);
- StrBufAppendBufPlain(SpoolMsg, recps->sending_room, -1, 0);
- StrBufAppendBufPlain(SpoolMsg, HKEY("\n"), 0);
- }
-
- nTokens = num_tokens(recps->recp_internet, '|');
- for (i = 0; i < nTokens; i++) {
- long len;
- len = extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient);
- if (len > 0) {
- StrBufAppendBufPlain(SpoolMsg, HKEY("remote|"), 0);
- StrBufAppendBufPlain(SpoolMsg, recipient, len, 0);
- StrBufAppendBufPlain(SpoolMsg, HKEY("|0||\n"), 0);
- }
- }
-
- imsg = malloc(sizeof(struct CtdlMessage));
- memset(imsg, 0, sizeof(struct CtdlMessage));
- imsg->cm_magic = CTDLMESSAGE_MAGIC;
- imsg->cm_anon_type = MES_NORMAL;
- imsg->cm_format_type = FMT_RFC822;
- imsg->cm_fields[eMsgSubject] = strdup("QMSG");
- imsg->cm_fields[eAuthor] = strdup("Citadel");
- imsg->cm_fields[eJournal] = strdup("do not journal");
- imsg->cm_fields[eMesageText] = SmashStrBuf(&SpoolMsg); /* imsg owns this memory now */
- CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM, QP_EADDR);
- CM_Free(imsg);
- }
-
/*
* Any addresses to harvest for someone's address book?
*/
}
}
+ if ((recps != NULL) && (recps->bounce_to == bounce_to))
+ recps->bounce_to = NULL;
+
/* Done. */
return(newmsgid);
}
const char *subject)
{
struct CtdlMessage *msg;
- struct recptypes *recp = NULL;
+ recptypes *recp = NULL;
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_format_type = format_type;
if (from != NULL) {
- msg->cm_fields[eAuthor] = strdup(from);
+ CM_SetField(msg, eAuthor, from, strlen(from));
}
else if (fromaddr != NULL) {
- msg->cm_fields[eAuthor] = strdup(fromaddr);
- if (strchr(msg->cm_fields[eAuthor], '@')) {
- *strchr(msg->cm_fields[eAuthor], '@') = 0;
+ char *pAt;
+ CM_SetField(msg, eAuthor, fromaddr, strlen(fromaddr));
+ pAt = strchr(msg->cm_fields[eAuthor], '@');
+ if (pAt != NULL) {
+ CM_CutFieldAt(msg, eAuthor, pAt - msg->cm_fields[eAuthor]);
}
}
else {
msg->cm_fields[eAuthor] = strdup("Citadel");
}
- if (fromaddr != NULL) msg->cm_fields[erFc822Addr] = strdup(fromaddr);
- if (room != NULL) msg->cm_fields[eOriginalRoom] = strdup(room);
- msg->cm_fields[eNodeName] = strdup(NODENAME);
+ if (fromaddr != NULL) CM_SetField(msg, erFc822Addr, fromaddr, strlen(fromaddr));
+ if (room != NULL) CM_SetField(msg, eOriginalRoom, room, strlen(room));
+ CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
if (to != NULL) {
- msg->cm_fields[eRecipient] = strdup(to);
+ CM_SetField(msg, eRecipient, to, strlen(to));
recp = validate_recipients(to, NULL, 0);
}
if (subject != NULL) {
- msg->cm_fields[eMsgSubject] = strdup(subject);
+ CM_SetField(msg, eMsgSubject, subject, strlen(subject));
}
- msg->cm_fields[eMesageText] = strdup(text);
+ CM_SetField(msg, eMesageText, text, strlen(text));
CtdlSubmitMsg(msg, recp, room, 0);
CM_Free(msg);
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.
* 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;
msg->cm_anon_type = type;
msg->cm_format_type = format_type;
- /* Don't confuse the poor folks if it's not routed mail. */
- strcpy(dest_node, "");
-
- if (recipient != NULL) striplt(recipient);
- if (recp_cc != NULL) striplt(recp_cc);
+ if (recipient != NULL) rcplen = striplt(recipient);
+ if (recp_cc != NULL) cclen = striplt(recp_cc);
/* Path or Return-Path */
- if (my_email == NULL) my_email = "";
-
- if (!IsEmptyStr(my_email)) {
- msg->cm_fields[eMessagePath] = strdup(my_email);
+ if (myelen > 0) {
+ CM_SetField(msg, eMessagePath, my_email, myelen);
}
else {
- snprintf(buf, sizeof buf, "%s", author->fullname);
- msg->cm_fields[eMessagePath] = strdup(buf);
+ CM_SetField(msg, eMessagePath, author->fullname, strlen(author->fullname));
}
convert_spaces_to_underscores(msg->cm_fields[eMessagePath]);
- snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */
- msg->cm_fields[eTimestamp] = strdup(buf);
+ blen = snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
+ CM_SetField(msg, eTimestamp, buf, blen);
- if ((fake_name != NULL) && (fake_name[0])) { /* author */
- FakeAuthor = NewStrBufPlain (fake_name, -1);
+ if (fnlen > 0) {
+ FakeAuthor = NewStrBufPlain (fake_name, fnlen);
}
else {
FakeAuthor = NewStrBufPlain (author->fullname, -1);
}
StrBufRFC2047encode(&FakeEncAuthor, FakeAuthor);
- msg->cm_fields[eAuthor] = SmashStrBuf(&FakeEncAuthor);
+ CM_SetAsFieldSB(msg, eAuthor, &FakeEncAuthor);
FreeStrBuf(&FakeAuthor);
- if (CC->room.QRflags & QR_MAILBOX) { /* room */
- msg->cm_fields[eOriginalRoom] = strdup(&CC->room.QRname[11]);
+ if (CCC->room.QRflags & QR_MAILBOX) { /* room */
+ CM_SetField(msg, eOriginalRoom, &CCC->room.QRname[11], strlen(&CCC->room.QRname[11]));
}
else {
- msg->cm_fields[eOriginalRoom] = strdup(CC->room.QRname);
+ CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
}
- msg->cm_fields[eNodeName] = strdup(NODENAME); /* nodename */
- msg->cm_fields[eHumanNode] = strdup(HUMANNODE); /* hnodename */
+ CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
+ CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
- if ((recipient != NULL) && (recipient[0] != 0)) {
- msg->cm_fields[eRecipient] = strdup(recipient);
- }
- if ((recp_cc != NULL) && (recp_cc[0] != 0)) {
- msg->cm_fields[eCarbonCopY] = strdup(recp_cc);
+ if (rcplen > 0) {
+ CM_SetField(msg, eRecipient, recipient, rcplen);
}
- if (dest_node[0] != 0) {
- msg->cm_fields[eDestination] = strdup(dest_node);
+ if (cclen > 0) {
+ CM_SetField(msg, eCarbonCopY, recp_cc, cclen);
}
- if (!IsEmptyStr(my_email)) {
- msg->cm_fields[erFc822Addr] = strdup(my_email);
+ if (myelen > 0) {
+ CM_SetField(msg, erFc822Addr, my_email, myelen);
}
- else if ( (author == &CC->user) && (!IsEmptyStr(CC->cs_inet_email)) ) {
- msg->cm_fields[erFc822Addr] = strdup(CC->cs_inet_email);
+ else if ( (author == &CCC->user) && (!IsEmptyStr(CCC->cs_inet_email)) ) {
+ CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
}
if (subject != NULL) {
long length;
- striplt(subject);
- length = strlen(subject);
+ length = striplt(subject);
if (length > 0) {
long i;
long IsAscii;
(IsAscii = isascii(subject[i]) != 0 ))
i++;
if (IsAscii != 0)
- msg->cm_fields[eMsgSubject] = strdup(subject);
+ CM_SetField(msg, eMsgSubject, subject, subjlen);
else /* ok, we've got utf8 in the string. */
{
- msg->cm_fields[eMsgSubject] = rfc2047encode(subject, length);
+ char *rfc2047Subj;
+ rfc2047Subj = rfc2047encode(subject, length);
+ CM_SetAsField(msg, eMsgSubject, &rfc2047Subj, strlen(rfc2047Subj));
}
}
}
- if (supplied_euid != NULL) {
- msg->cm_fields[eExclusiveID] = strdup(supplied_euid);
+ if (euidlen > 0) {
+ CM_SetField(msg, eExclusiveID, supplied_euid, euidlen);
}
- if ((references != NULL) && (!IsEmptyStr(references))) {
- if (msg->cm_fields[eWeferences] != NULL)
- free(msg->cm_fields[eWeferences]);
- msg->cm_fields[eWeferences] = strdup(references);
+ if (reflen > 0) {
+ CM_SetField(msg, eWeferences, references, reflen);
}
if (preformatted_text != NULL) {
- msg->cm_fields[eMesageText] = preformatted_text;
+ CM_SetField(msg, eMesageText, preformatted_text, textlen);
}
else {
- msg->cm_fields[eMesageText] = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+ StrBuf *MsgBody;
+ MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
+ if (MsgBody != NULL) {
+ CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
+ }
}
return(msg);
-/*
- * 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; i<j; ++i) {
- extract_token(buf, CCC->cs_inet_other_emails, i, '|', sizeof buf);
- if (!strcasecmp(newuseremail, buf)) {
- newuseremail_ok = 1;
- }
- }
- }
- }
-
- if (!newuseremail_ok) {
- cprintf("%d You don't have permission to author messages as '%s'.\n",
- ERROR + HIGHER_ACCESS_REQUIRED,
- newuseremail
- );
- return;
- }
-
- CCC->cs_flags |= CS_POSTING;
-
- /* In mailbox rooms we have to behave a little differently --
- * make sure the user has specified at least one recipient. Then
- * validate the recipient(s). We do this for the Mail> room, as
- * well as any room which has the "Mailbox" view set - unless it
- * is the DRAFTS room which does not require recipients
- */
-
- if ( ( ( (CCC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CCC->room.QRname[11], MAILROOM)) )
- || ( (CCC->room.QRflags & QR_MAILBOX) && (CCC->curr_view == VIEW_MAILBOX) )
- ) && (strcasecmp(&CCC->room.QRname[11], USERDRAFTROOM)) !=0 ) {
- if (CCC->user.axlevel < AxProbU) {
- strcpy(recp, "sysop");
- strcpy(cc, "");
- strcpy(bcc, "");
- }
-
- valid_to = validate_recipients(recp, NULL, 0);
- if (valid_to->num_error > 0) {
- cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_to->errormsg);
- free_recipients(valid_to);
- return;
- }
-
- valid_cc = validate_recipients(cc, NULL, 0);
- if (valid_cc->num_error > 0) {
- cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_cc->errormsg);
- free_recipients(valid_to);
- free_recipients(valid_cc);
- return;
- }
-
- valid_bcc = validate_recipients(bcc, NULL, 0);
- if (valid_bcc->num_error > 0) {
- cprintf("%d %s\n", ERROR + NO_SUCH_USER, valid_bcc->errormsg);
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
- return;
- }
-
- /* Recipient required, but none were specified */
- if ( (valid_to->num_error < 0) && (valid_cc->num_error < 0) && (valid_bcc->num_error < 0) ) {
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
- cprintf("%d At least one recipient is required.\n", ERROR + NO_SUCH_USER);
- return;
- }
-
- if (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0) {
- if (CtdlCheckInternetMailPermission(&CCC->user)==0) {
- cprintf("%d You do not have permission "
- "to send Internet mail.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
- return;
- }
- }
-
- if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0)
- && (CCC->user.axlevel < AxNetU) ) {
- cprintf("%d Higher access required for network mail.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
- return;
- }
-
- if ((RESTRICT_INTERNET == 1)
- && (valid_to->num_internet + valid_cc->num_internet + valid_bcc->num_internet > 0)
- && ((CCC->user.flags & US_INTERNET) == 0)
- && (!CCC->internal_pgm)) {
- cprintf("%d You don't have access to Internet mail.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
- return;
- }
-
- }
-
- /* Is this a room which has anonymous-only or anonymous-option? */
- anonymous = MES_NORMAL;
- if (CCC->room.QRflags & QR_ANONONLY) {
- anonymous = MES_ANONONLY;
- }
- if (CCC->room.QRflags & QR_ANONOPT) {
- if (anon_flag == 1) { /* only if the user requested it */
- anonymous = MES_ANONOPT;
- }
- }
-
- if ((CCC->room.QRflags & QR_MAILBOX) == 0) {
- recp[0] = 0;
- }
-
- /* Recommend to the client that the use of a message subject is
- * strongly recommended in this room, if either the SUBJECTREQ flag
- * is set, or if there is one or more Internet email recipients.
- */
- if (CCC->room.QRflags2 & QR2_SUBJECTREQ) subject_required = 1;
- if ((valid_to) && (valid_to->num_internet > 0)) subject_required = 1;
- if ((valid_cc) && (valid_cc->num_internet > 0)) subject_required = 1;
- if ((valid_bcc) && (valid_bcc->num_internet > 0)) subject_required = 1;
-
- /* If we're only checking the validity of the request, return
- * success without creating the message.
- */
- if (post == 0) {
- cprintf("%d %s|%d\n", CIT_OK,
- ((valid_to != NULL) ? valid_to->display_recp : ""),
- subject_required);
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
- return;
- }
-
- /* We don't need these anymore because we'll do it differently below */
- free_recipients(valid_to);
- free_recipients(valid_cc);
- free_recipients(valid_bcc);
-
- /* Read in the message from the client. */
- if (do_confirm) {
- cprintf("%d send message\n", START_CHAT_MODE);
- } else {
- cprintf("%d send message\n", SEND_LISTING);
- }
-
- msg = CtdlMakeMessage(&CCC->user, recp, cc,
- CCC->room.QRname, anonymous, format_type,
- newusername, newuseremail, subject,
- ((!IsEmptyStr(supplied_euid)) ? supplied_euid : NULL),
- NULL, references);
-
- /* Put together one big recipients struct containing to/cc/bcc all in
- * one. This is for the envelope.
- */
- char *all_recps = malloc(SIZ * 3);
- strcpy(all_recps, recp);
- if (!IsEmptyStr(cc)) {
- if (!IsEmptyStr(all_recps)) {
- strcat(all_recps, ",");
- }
- strcat(all_recps, cc);
- }
- if (!IsEmptyStr(bcc)) {
- if (!IsEmptyStr(all_recps)) {
- strcat(all_recps, ",");
- }
- strcat(all_recps, bcc);
- }
- if (!IsEmptyStr(all_recps)) {
- valid = validate_recipients(all_recps, NULL, 0);
- }
- else {
- valid = NULL;
- }
- free(all_recps);
-
- if ((valid != NULL) && (valid->num_room == 1))
- {
- /* posting into an ML room? set the envelope from
- * to the actual mail address so others get a valid
- * reply-to-header.
- */
- msg->cm_fields[eenVelopeTo] = strdup(valid->recp_orgroom);
- }
-
- if (msg != NULL) {
- msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR);
- if (do_confirm) {
- cprintf("%ld\n", msgnum);
-
- if (StrLength(CCC->StatusMessage) > 0) {
- cprintf("%s\n", ChrPtr(CCC->StatusMessage));
- }
- else if (msgnum >= 0L) {
- client_write(HKEY("Message accepted.\n"));
- }
- else {
- client_write(HKEY("Internal error.\n"));
- }
-
- if (!CM_IsEmpty(msg, eExclusiveID)) {
- cprintf("%s\n", msg->cm_fields[eExclusiveID]);
- } else {
- cprintf("\n");
- }
- cprintf("000\n");
- }
-
- CM_Free(msg);
- }
- if (valid != NULL) {
- free_recipients(valid);
- }
- return;
-}
-
-
/*
* API function to delete messages which match a set of criteria
return (num_deleted);
}
-/*
- * Delete message from current room
- */
-void cmd_dele(char *args)
-{
- int num_deleted;
- int i;
- char msgset[SIZ];
- char msgtok[32];
- long *msgs;
- int num_msgs = 0;
-
- extract_token(msgset, args, 0, '|', sizeof msgset);
- num_msgs = num_tokens(msgset, ',');
- if (num_msgs < 1) {
- cprintf("%d Nothing to do.\n", CIT_OK);
- return;
- }
-
- if (CtdlDoIHavePermissionToDeleteMessagesFromThisRoom() == 0) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
-
- /*
- * Build our message set to be moved/copied
- */
- msgs = malloc(num_msgs * sizeof(long));
- for (i=0; i<num_msgs; ++i) {
- extract_token(msgtok, msgset, i, ',', sizeof msgtok);
- msgs[i] = atol(msgtok);
- }
-
- num_deleted = CtdlDeleteMessages(CC->room.QRname, msgs, num_msgs, "");
- free(msgs);
-
- if (num_deleted) {
- cprintf("%d %d message%s deleted.\n", CIT_OK,
- num_deleted, ((num_deleted != 1) ? "s" : ""));
- } else {
- cprintf("%d Message not found.\n", ERROR + MESSAGE_NOT_FOUND);
- }
-}
-
-
-
-
-/*
- * move or copy a message to another room
- */
-void cmd_move(char *args)
-{
- char msgset[SIZ];
- char msgtok[32];
- long *msgs;
- int num_msgs = 0;
-
- char targ[ROOMNAMELEN];
- struct ctdlroom qtemp;
- int err;
- int is_copy = 0;
- int ra;
- int permit = 0;
- int i;
-
- extract_token(msgset, args, 0, '|', sizeof msgset);
- num_msgs = num_tokens(msgset, ',');
- if (num_msgs < 1) {
- cprintf("%d Nothing to do.\n", CIT_OK);
- return;
- }
-
- extract_token(targ, args, 1, '|', sizeof targ);
- convert_room_name_macros(targ, sizeof targ);
- targ[ROOMNAMELEN - 1] = 0;
- is_copy = extract_int(args, 2);
-
- if (CtdlGetRoom(&qtemp, targ) != 0) {
- cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, targ);
- return;
- }
-
- if (!strcasecmp(qtemp.QRname, CC->room.QRname)) {
- cprintf("%d Source and target rooms are the same.\n", ERROR + ALREADY_EXISTS);
- return;
- }
-
- CtdlGetUser(&CC->user, CC->curr_user);
- CtdlRoomAccess(&qtemp, &CC->user, &ra, NULL);
-
- /* Check for permission to perform this operation.
- * Remember: "CC->room" is source, "qtemp" is target.
- */
- permit = 0;
-
- /* Admins can move/copy */
- if (CC->user.axlevel >= AxAideU) permit = 1;
-
- /* Room aides can move/copy */
- if (CC->user.usernum == CC->room.QRroomaide) permit = 1;
-
- /* Permit move/copy from personal rooms */
- if ((CC->room.QRflags & QR_MAILBOX)
- && (qtemp.QRflags & QR_MAILBOX)) permit = 1;
-
- /* Permit only copy from public to personal room */
- if ( (is_copy)
- && (!(CC->room.QRflags & QR_MAILBOX))
- && (qtemp.QRflags & QR_MAILBOX)) permit = 1;
-
- /* Permit message removal from collaborative delete rooms */
- if (CC->room.QRflags2 & QR2_COLLABDEL) permit = 1;
-
- /* Users allowed to post into the target room may move into it too. */
- if ((CC->room.QRflags & QR_MAILBOX) &&
- (qtemp.QRflags & UA_POSTALLOWED)) permit = 1;
-
- /* User must have access to target room */
- if (!(ra & UA_KNOWN)) permit = 0;
-
- if (!permit) {
- cprintf("%d Higher access required.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
-
- /*
- * Build our message set to be moved/copied
- */
- msgs = malloc(num_msgs * sizeof(long));
- for (i=0; i<num_msgs; ++i) {
- extract_token(msgtok, msgset, i, ',', sizeof msgtok);
- msgs[i] = atol(msgtok);
- }
-
- /*
- * Do the copy
- */
- err = CtdlSaveMsgPointersInRoom(targ, msgs, num_msgs, 1, NULL, 0);
- if (err != 0) {
- cprintf("%d Cannot store message(s) in %s: error %d\n",
- err, targ, err);
- free(msgs);
- return;
- }
-
- /* Now delete the message from the source room,
- * if this is a 'move' rather than a 'copy' operation.
- */
- if (is_copy == 0) {
- CtdlDeleteMessages(CC->room.QRname, msgs, num_msgs, "");
- }
- free(msgs);
-
- cprintf("%d Message(s) %s.\n", CIT_OK, (is_copy ? "copied" : "moved") );
-}
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);
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");
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg->cm_anon_type = MES_NORMAL;
msg->cm_format_type = 4;
- msg->cm_fields[eAuthor] = strdup(CCC->user.fullname);
- msg->cm_fields[eOriginalRoom] = strdup(req_room);
- msg->cm_fields[eNodeName] = strdup(config.c_nodename);
- msg->cm_fields[eHumanNode] = strdup(config.c_humannode);
+ CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
+ CM_SetField(msg, eOriginalRoom, req_room, strlen(req_room));
+ CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
+ CM_SetField(msg, eHumanNode, CFG_KEY(c_humannode));
msg->cm_flags = flags;
- msg->cm_fields[eMesageText] = encoded_message;
+ CM_SetAsFieldSB(msg, eMesageText, &encoded_message);
/* Create the requested room if we have to. */
if (CtdlGetRoom(&qrbuf, roomname) != 0) {
{
if (!threading) {
CtdlRegisterDebugFlagHook(HKEY("messages"), SetMessageDebugEnabled, &MessageDebugEnabled);
-
- CtdlRegisterProtoHook(cmd_msgs, "MSGS", "Output a list of messages in the current room");
- CtdlRegisterProtoHook(cmd_msg0, "MSG0", "Output a message in plain text format");
- CtdlRegisterProtoHook(cmd_msg2, "MSG2", "Output a message in RFC822 format");
- CtdlRegisterProtoHook(cmd_msg3, "MSG3", "Output a message in raw format (deprecated)");
- CtdlRegisterProtoHook(cmd_msg4, "MSG4", "Output a message in the client's preferred format");
- CtdlRegisterProtoHook(cmd_msgp, "MSGP", "Select preferred format for MSG4 output");
- CtdlRegisterProtoHook(cmd_opna, "OPNA", "Open an attachment for download");
- CtdlRegisterProtoHook(cmd_dlat, "DLAT", "Download an attachment");
- CtdlRegisterProtoHook(cmd_ent0, "ENT0", "Enter a message");
- CtdlRegisterProtoHook(cmd_dele, "DELE", "Delete a message");
- CtdlRegisterProtoHook(cmd_move, "MOVE", "Move or copy a message to another room");
}
/* return our Subversion id for the Log */
projects / citadel.git / blobdiff