/*
* Implements the message store.
*
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 3.
* 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 <regex.h>
-
-#include "md5.h"
-
+#include <sys/stat.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 "config.h"
+#include "clientsocket.h"
#include "genstamp.h"
+#include "room_ops.h"
+#include "user_ops.h"
#include "internet_addressing.h"
#include "euidindex.h"
+#include "msgbase.h"
#include "journaling.h"
-#include "citadel_dirs.h"
-#include "clientsocket.h"
-#include "threads.h"
-
-#include "ctdl_module.h"
-long config_msgnum;
struct addresses_to_be_filed *atbf = NULL;
-/* This temp file holds the queue of operations for AdjRefCount() */
-static FILE *arcfp = NULL;
-void AdjRefCountList(long *msgnum, long nmsg, int incr);
-
-int MessageDebugEnabled = 0;
-
/*
* These are the four-character field headers we use when outputting
* messages in Citadel format (as opposed to RFC822 format).
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
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 */
+ "from", // A -> eAuthor
+ NULL, // B -> eBig_message
+ NULL, // C (formerly used as eRemoteRoom)
+ NULL, // D (formerly used as eDestination)
+ "exti", // E -> eXclusivID
+ "rfca", // F -> erFc822Addr
+ NULL, // G
+ "hnod", // H (formerly used as eHumanNode)
+ "msgn", // I -> emessageId
+ "jrnl", // J -> eJournal
+ "rep2", // K -> eReplyTo
+ "list", // L -> eListID
+ "text", // M -> eMesageText
+ NULL, // N (formerly used as eNodeName)
+ "room", // O -> eOriginalRoom
+ "path", // P -> eMessagePath
+ NULL, // Q
+ "rcpt", // R -> eRecipient
+ NULL, // S (formerly used as eSpecialField)
+ "time", // T -> eTimestamp
+ "subj", // U -> eMsgSubject
+ "nvto", // V -> eenVelopeTo
+ "wefw", // W -> eWeferences
+ NULL, // X
+ "cccc", // Y -> eCarbonCopY
+ NULL // Z
};
+HashList *msgKeyLookup = NULL;
+
+int GetFieldFromMnemonic(eMsgField *f, const char* c)
+{
+ void *v = NULL;
+ if (GetHash(msgKeyLookup, c, 4, &v)) {
+ *f = (eMsgField) v;
+ return 1;
+ }
+ return 0;
+}
+
+void FillMsgKeyLookupTable(void)
+{
+ long i;
+
+ msgKeyLookup = NewHash (1, FourHash);
+
+ for (i=0; i < 91; i++) {
+ if (msgkeys[i] != NULL) {
+ Put(msgKeyLookup, msgkeys[i], 4, (void*)i, reference_free_handler);
+ }
+ }
+}
+
eMsgField FieldOrder[] = {
/* Important fields */
emessageId ,
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*/
+/* G is not used yet */
eReplyTo ,
eListID ,
/* Q is not used yet */
- eSpecialField,
eenVelopeTo ,
/* X is not used yet */
/* Z is not used yet */
};
static const long NDiskFields = sizeof(FieldOrder) / sizeof(eMsgField);
-void CtdlMsgSetCM_Fields(struct CtdlMessage *Msg, eMsgField which, const char *buf, long length)
+
+
+int CM_IsEmpty(struct CtdlMessage *Msg, eMsgField which)
{
- if (Msg->cm_fields[which] != NULL)
+ return !((Msg->cm_fields[which] != NULL) && (Msg->cm_fields[which][0] != '\0'));
+}
+
+
+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;
}
-/*
- * 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)
+
+void CM_SetFieldLONG(struct CtdlMessage *Msg, eMsgField which, long lvalue)
{
- int i;
+ char buf[128];
+ long len;
+ len = snprintf(buf, sizeof(buf), "%ld", lvalue);
+ CM_SetField(Msg, which, buf, len);
+}
- 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_CutFieldAt(struct CtdlMessage *Msg, eMsgField WhichToCut, long maxlen)
+{
+ if (Msg->cm_fields[WhichToCut] == NULL)
+ return;
+
+ if (Msg->cm_lengths[WhichToCut] > maxlen)
+ {
+ Msg->cm_fields[WhichToCut][maxlen] = '\0';
+ Msg->cm_lengths[WhichToCut] = maxlen;
}
}
-/*
- * 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];
+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;
+}
- char original_name[256];
- safestrncpy(original_name, name, sizeof original_name);
-
- striplt(name);
- remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
- stripallbut(name, '<', '>');
-
- 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);
+
+void CM_Flush(struct CtdlMessage *Msg)
+{
+ int i;
+
+ if (CM_IsValidMsg(Msg) == 0) {
+ return;
}
- fclose(fp);
- /* Hit the Global Address Book */
- if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
- strcpy(name, aaa);
+ for (i = 0; i < 256; ++i) {
+ CM_FlushField(Msg, i);
}
+}
- if (strcasecmp(original_name, name)) {
- MSG_syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name);
+
+void CM_CopyField(struct CtdlMessage *Msg, eMsgField WhichToPutTo, eMsgField WhichtToCopy)
+{
+ long len;
+ if (Msg->cm_fields[WhichToPutTo] != NULL) {
+ free (Msg->cm_fields[WhichToPutTo]);
}
- /* Change "user @ xxx" to "user" if xxx is an alias for this host */
- for (a=0; a<strlen(name); ++a) {
- if (name[a] == '@') {
- if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
- name[a] = 0;
- MSG_syslog(LOG_INFO, "Changed to <%s>\n", 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;
+ }
+ 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; i<num_tokens(ignetcfg, '\n'); ++i) {
- extract_token(buf, ignetcfg, i, '\n', sizeof buf);
- extract_token(testnode, buf, 0, '|', sizeof testnode);
- if (!strcasecmp(node, testnode)) {
- free(ignetcfg);
- return(MES_IGNET);
- }
+ new = malloc(newmsgsize);
+ memcpy(new, buf, length);
+ 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;
}
- free(ignetcfg);
+}
- /*
- * Then try nodes that are two or more hops away.
- */
- ignetmap = CtdlGetSysConfig(IGNETMAP);
- for (i=0; i<num_tokens(ignetmap, '\n'); ++i) {
- extract_token(buf, ignetmap, i, '\n', sizeof buf);
- extract_token(testnode, buf, 0, '|', sizeof testnode);
- if (!strcasecmp(node, testnode)) {
- free(ignetmap);
- return(MES_IGNET);
- }
+
+void CM_SetAsField(struct CtdlMessage *Msg, eMsgField which, char **buf, long length)
+{
+ if (Msg->cm_fields[which] != NULL) {
+ free (Msg->cm_fields[which]);
}
- free(ignetmap);
- /* If we get to this point it's an invalid node name */
- return (MES_ERROR);
+ Msg->cm_fields[which] = *buf;
+ *buf = NULL;
+ Msg->cm_lengths[which] = length;
}
-/*
- * Back end for the MSGS command: output message number only.
- */
-void simple_listing(long msgnum, void *userdata)
+void CM_SetAsFieldSB(struct CtdlMessage *Msg, eMsgField which, StrBuf **buf)
{
- cprintf("%ld\n", msgnum);
+ if (Msg->cm_fields[which] != NULL) {
+ free (Msg->cm_fields[which]);
+ }
+
+ 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 header summary.
+ * 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 headers_listing(long msgnum, void *userdata)
-{
- struct CtdlMessage *msg;
-
- msg = CtdlFetchMessage(msgnum, 0);
+int CM_IsValidMsg(struct CtdlMessage *msg) {
if (msg == NULL) {
- cprintf("%ld|0|||||\n", msgnum);
- return;
+ return 0;
}
+ if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) {
+ syslog(LOG_WARNING, "msgbase: CM_IsValidMsg() self-check failed");
+ return 0;
+ }
+ return 1;
+}
- cprintf("%ld|%s|%s|%s|%s|%s|\n",
- msgnum,
- (msg->cm_fields[eTimestamp] ? msg->cm_fields[eTimestamp] : "0"),
- (msg->cm_fields[eAuthor] ? msg->cm_fields[eAuthor] : ""),
- (msg->cm_fields[eNodeName] ? msg->cm_fields[eNodeName] : ""),
- (msg->cm_fields[erFc822Addr] ? msg->cm_fields[erFc822Addr] : ""),
- (msg->cm_fields[eMsgSubject] ? msg->cm_fields[eMsgSubject] : "")
- );
- CtdlFreeMessage(msg);
+
+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 EUID header.
+ * 'Destructor' for struct CtdlMessage
*/
-void headers_euid(long msgnum, void *userdata)
+void CM_Free(struct CtdlMessage *msg)
{
- struct CtdlMessage *msg;
-
- msg = CtdlFetchMessage(msgnum, 0);
- if (msg == NULL) {
- cprintf("%ld||\n", msgnum);
+ if (CM_IsValidMsg(msg) == 0) {
+ if (msg != NULL) free (msg);
return;
}
+ CM_FreeContents(msg);
+ free(msg);
+}
- cprintf("%ld|%s|%s\n",
- msgnum,
- (msg->cm_fields[eExclusiveID] ? msg->cm_fields[eExclusiveID] : ""),
- (msg->cm_fields[eTimestamp] ? msg->cm_fields[eTimestamp] : "0"));
- 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;
}
+struct CtdlMessage * CM_Duplicate(struct CtdlMessage *OrgMsg)
+{
+ int i;
+ struct CtdlMessage *NewMsg;
+
+ 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;
+ }
+ }
+ }
+ return NewMsg;
+}
/* 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;
}
}
}
-
/*
* Retrieve the "seen" message list for the current room.
*/
void CtdlGetSeen(char *buf, int which_set) {
- struct CitContext *CCC = CC;
visit vbuf;
/* Learn about the user and room in question */
- CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
+ CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
- if (which_set == ctdlsetseen_seen)
+ if (which_set == ctdlsetseen_seen) {
safestrncpy(buf, vbuf.v_seen, SIZ);
- if (which_set == ctdlsetseen_answered)
+ }
+ if (which_set == ctdlsetseen_answered) {
safestrncpy(buf, vbuf.v_answered, SIZ);
+ }
}
-
/*
* Manipulate the "seen msgs" string (or other message set strings)
*/
void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
int target_setting, int which_set,
struct ctdluser *which_user, struct ctdlroom *which_room) {
- struct CitContext *CCC = CC;
struct cdbdata *cdbfr;
int i, k;
int is_seen = 0;
int was_seen = 0;
long lo = (-1L);
- long hi = (-1L); /// TODO: we just write here. y?
+ long hi = (-1L);
visit vbuf;
long *msglist;
int num_msgs = 0;
/* If no room was specified, we go with the current room. */
if (!which_room) {
- which_room = &CCC->room;
+ which_room = &CC->room;
}
/* If no user was specified, we go with the current user. */
if (!which_user) {
- which_user = &CCC->user;
+ which_user = &CC->user;
}
- MSG_syslog(LOG_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n",
+ syslog(LOG_DEBUG, "msgbase: CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>",
num_target_msgnums, target_msgnums[0],
(target_setting ? "SET" : "CLEAR"),
which_set,
#if 0 /* This is a special diagnostic section. Do not allow it to run during normal operation. */
- MSG_syslog(LOG_DEBUG, "There are %d messages in the room.\n", num_msgs);
+ syslog(LOG_DEBUG, "There are %d messages in the room.\n", num_msgs);
for (i=0; i<num_msgs; ++i) {
if ((i > 0) && (msglist[i] <= msglist[i-1])) abort();
}
- MSG_syslog(LOG_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums);
+ syslog(LOG_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums);
for (k=0; k<num_target_msgnums; ++k) {
if ((k > 0) && (target_msgnums[k] <= target_msgnums[k-1])) abort();
}
#endif
- MSG_syslog(LOG_DEBUG, "before update: %s\n", ChrPtr(vset));
-
/* Translate the existing sequence set into an array of booleans */
setstr = NewStrBuf();
lostr = NewStrBuf();
FreeStrBuf(&lostr);
FreeStrBuf(&histr);
-
/* Now translate the array of booleans back into a sequence set */
FlushStrBuf(vset);
was_seen = 0;
vset = new_set;
}
- MSG_syslog(LOG_DEBUG, " after update: %s\n", ChrPtr(vset));
-
/* Decide which message set we're manipulating */
switch (which_set) {
case ctdlsetseen_seen:
ForEachMsgCallback CallBack,
void *userdata)
{
- struct CitContext *CCC = CC;
int a, i, j;
visit vbuf;
struct cdbdata *cdbfr;
if (need_to_free_re) regfree(&re);
return -1;
}
- CtdlGetUser(&CCC->user, CCC->curr_user);
+ CtdlGetUser(&CC->user, CC->curr_user);
if (server_shutting_down) {
if (need_to_free_re) regfree(&re);
return -1;
}
- CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
+ CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
if (server_shutting_down) {
if (need_to_free_re) regfree(&re);
}
/* Load the message list */
- cdbfr = cdb_fetch(CDB_MSGLISTS, &CCC->room.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr == NULL) {
if (need_to_free_re) regfree(&re);
return 0; /* No messages at all? No further action. */
free(msglist);
return -1;
}
- msg = CtdlFetchMessage(msglist[a], 1);
+ msg = CtdlFetchMessage(msglist[a], 1, 1);
if (msg != NULL) {
if (CtdlMsgCmp(msg, compare)) {
msglist[a] = 0L;
}
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}
}
}
|| ((mode == MSGS_EQ) && (thismsg == ref))
)
) {
- if ((mode == MSGS_NEW) && (CCC->user.flags & US_LASTOLD) && (lastold > 0L) && (printed_lastold == 0) && (!is_seen)) {
- if (CallBack)
+ if ((mode == MSGS_NEW) && (CC->user.flags & US_LASTOLD) && (lastold > 0L) && (printed_lastold == 0) && (!is_seen)) {
+ if (CallBack) {
CallBack(lastold, userdata);
+ }
printed_lastold = 1;
++num_processed;
}
- if (CallBack) CallBack(thismsg, userdata);
+ if (CallBack) {
+ CallBack(thismsg, userdata);
+ }
++num_processed;
}
}
/*
* We cache the most recent msglist in order to do security checks later
*/
- if (CCC->client_socket > 0) {
- if (CCC->cached_msglist != NULL) {
- free(CCC->cached_msglist);
+ if (CC->client_socket > 0) {
+ if (CC->cached_msglist != NULL) {
+ free(CC->cached_msglist);
}
- CCC->cached_msglist = msglist;
- CCC->cached_num_msgs = num_msgs;
+ CC->cached_msglist = msglist;
+ CC->cached_num_msgs = num_msgs;
}
else {
free(msglist);
}
-
-/*
- * 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
char *mptr, /* where are we going to get our text from? */
const char *nl /* string to terminate lines with */
) {
- struct CitContext *CCC = CC;
int column = 0;
unsigned char ch = 0;
char outbuf[1024];
while (ch=*(mptr++), ch != 0) {
if (ch == '\n') {
- if (client_write(outbuf, len) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(outbuf, len) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
- if (client_write(nl, nllen) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(nl, nllen) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
column = 0;
}
else if (isspace(ch)) {
if (column > 72) { /* Beyond 72 columns, break on the next space */
- if (client_write(outbuf, len) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(outbuf, len) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
- if (client_write(nl, nllen) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(nl, nllen) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
column = 0;
outbuf[len++] = ch;
++column;
if (column > 1000) { /* Beyond 1000 columns, break anywhere */
- if (client_write(outbuf, len) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(outbuf, len) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
len = 0;
- if (client_write(nl, nllen) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(nl, nllen) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout(): aborting due to write failure");
return;
}
column = 0;
}
}
if (len) {
- if (client_write(outbuf, len) == -1)
- {
- MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ if (client_write(outbuf, len) == -1) {
+ syslog(LOG_ERR, "msgbase: memfmout() aborting due to write failure");
return;
}
- len = 0;
client_write(nl, nllen);
column = 0;
}
}
-
/*
* Callback function for mime parser that simply lists the part
*/
}
}
+
/*
* Callback function for multipart prefix
*/
}
}
+
/*
* Callback function for multipart sufffix
*/
/*
* 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)
{
int rv = 0;
- CitContext *CCC = MyContext();
/* Silently go away if there's already a download open. */
- if (CCC->download_fp != NULL)
+ if (CC->download_fp != NULL)
return;
if (
- (!IsEmptyStr(partnum) && (!strcasecmp(CCC->download_desired_section, partnum)))
- || (!IsEmptyStr(cbid) && (!strcasecmp(CCC->download_desired_section, cbid)))
+ (!IsEmptyStr(partnum) && (!strcasecmp(CC->download_desired_section, partnum)))
+ || (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid)))
) {
- CCC->download_fp = tmpfile();
- if (CCC->download_fp == NULL) {
- MSG_syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
- strerror(errno));
- cprintf("%d cannot open temporary file: %s\n",
- ERROR + INTERNAL_ERROR, strerror(errno));
+ CC->download_fp = tmpfile();
+ if (CC->download_fp == NULL) {
+ syslog(LOG_EMERG, "msgbase: mime_download() couldn't write: %m");
+ cprintf("%d cannot open temporary file: %s\n", ERROR + INTERNAL_ERROR, strerror(errno));
return;
}
- rv = fwrite(content, length, 1, CCC->download_fp);
+ rv = fwrite(content, length, 1, CC->download_fp);
if (rv <= 0) {
- MSG_syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
- strerror(errno));
- cprintf("%d unable to write tempfile.\n",
- ERROR + TOO_BIG);
- fclose(CCC->download_fp);
- CCC->download_fp = NULL;
+ syslog(LOG_EMERG, "msgbase: mime_download() Couldn't write: %m");
+ cprintf("%d unable to write tempfile.\n", ERROR + TOO_BIG);
+ fclose(CC->download_fp);
+ CC->download_fp = NULL;
return;
}
- fflush(CCC->download_fp);
- rewind(CCC->download_fp);
+ fflush(CC->download_fp);
+ rewind(CC->download_fp);
OpenCmdResult(filename, cbtype);
}
}
-
/*
* Callback function for mime parser that outputs a section all at once.
* We can specify the desired section by part number *or* content-id.
}
-/*
- * Load a message from disk into memory.
- * This is used by CtdlOutputMsg() and other fetch functions.
- *
- * NOTE: Caller is responsible for freeing the returned CtdlMessage struct
- * using the CtdlMessageFree() function.
- */
-struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
+struct CtdlMessage *CtdlDeserializeMessage(long msgnum, int with_body, const char *Buffer, long Length)
{
- struct CitContext *CCC = CC;
- struct cdbdata *dmsgtext;
struct CtdlMessage *ret = NULL;
- char *mptr;
- char *upper_bound;
+ const char *mptr;
+ const char *upper_bound;
cit_uint8_t ch;
cit_uint8_t field_header;
+ eMsgField which;
- MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
- dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
- if (dmsgtext == NULL) {
- MSG_syslog(LOG_ERR, "CtdlFetchMessage(%ld, %d) Failed!\n", msgnum, with_body);
+ mptr = Buffer;
+ upper_bound = Buffer + Length;
+ if (msgnum <= 0) {
return NULL;
}
- mptr = dmsgtext->ptr;
- upper_bound = mptr + dmsgtext->len;
/* Parse the three bytes that begin EVERY message on disk.
* The first is always 0xFF, the on-disk magic number.
*/
ch = *mptr++;
if (ch != 255) {
- MSG_syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum);
- cdb_free(dmsgtext);
+ syslog(LOG_ERR, "msgbase: message %ld appears to be corrupted", msgnum);
return NULL;
}
ret = (struct CtdlMessage *) malloc(sizeof(struct CtdlMessage));
* have just processed the 'M' (message text) field.
*/
do {
+ field_header = '\0';
+ long len;
+
+ /* work around possibly buggy messages: */
+ while (field_header == '\0') {
+ if (mptr >= upper_bound) {
+ break;
+ }
+ field_header = *mptr++;
+ }
if (mptr >= upper_bound) {
break;
}
- field_header = *mptr++;
- ret->cm_fields[field_header] = strdup(mptr);
+ which = field_header;
+ len = strlen(mptr);
- while (*mptr++ != 0); /* advance to next field */
+ CM_SetField(ret, which, mptr, len);
+
+ mptr += len + 1; /* advance to next field */
} while ((mptr < upper_bound) && (field_header != 'M'));
- cdb_free(dmsgtext);
-
- /* Always make sure there's something in the msg text field. If
- * it's NULL, the message text is most likely stored separately,
- * so go ahead and fetch that. Failing that, just set a dummy
- * body so other code doesn't barf.
- */
- if ( (ret->cm_fields[eMesageText] == NULL) && (with_body) ) {
- dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long));
- if (dmsgtext != NULL) {
- ret->cm_fields[eMesageText] = dmsgtext->ptr;
- dmsgtext->ptr = NULL;
- cdb_free(dmsgtext);
- }
- }
- if (ret->cm_fields[eMesageText] == NULL) {
- ret->cm_fields[eMesageText] = strdup("\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);
- return NULL;
- }
-
- return (ret);
-}
+ return (ret);
+}
/*
- * 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.
+ * Load a message from disk into memory.
+ * This is used by CtdlOutputMsg() and other fetch functions.
+ *
+ * NOTE: Caller is responsible for freeing the returned CtdlMessage struct
+ * using the CM_Free(); function.
*/
-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)
+struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body, int run_msg_hooks)
{
- int i;
+ struct cdbdata *dmsgtext;
+ struct CtdlMessage *ret = NULL;
- for (i = 0; i < 256; ++i)
- if (msg->cm_fields[i] != NULL) {
- free(msg->cm_fields[i]);
- }
+ syslog(LOG_DEBUG, "msgbase: CtdlFetchMessage(%ld, %d)", msgnum, with_body);
+ dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
+ if (dmsgtext == NULL) {
+ syslog(LOG_ERR, "msgbase: CtdlFetchMessage(%ld, %d) Failed!", msgnum, with_body);
+ return NULL;
+ }
- 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;
+ if (dmsgtext->ptr[dmsgtext->len - 1] != '\0') {
+ syslog(LOG_ERR, "msgbase: CtdlFetchMessage(%ld, %d) Forcefully terminating message!!", msgnum, with_body);
+ dmsgtext->ptr[dmsgtext->len - 1] = '\0';
}
- CtdlFreeMessageContents(msg);
- free(msg);
-}
-int DupCMField(int i, struct CtdlMessage *OrgMsg, struct CtdlMessage *NewMsg)
-{
- long len;
- len = strlen(OrgMsg->cm_fields[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';
- return 1;
-}
+ ret = CtdlDeserializeMessage(msgnum, with_body, dmsgtext->ptr, dmsgtext->len);
-struct CtdlMessage * CtdlDuplicateMessage(struct CtdlMessage *OrgMsg)
-{
- int i;
- struct CtdlMessage *NewMsg;
+ cdb_free(dmsgtext);
- if (is_valid_message(OrgMsg) == 0)
+ if (ret == NULL) {
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 (!DupCMField(i, OrgMsg, NewMsg))
- {
- CtdlFreeMessage(NewMsg);
- return NULL;
- }
+ /* Always make sure there's something in the msg text field. If
+ * it's NULL, the message text is most likely stored separately,
+ * so go ahead and fetch that. Failing that, just set a dummy
+ * body so other code doesn't barf.
+ */
+ 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 - 1);
+ cdb_free(dmsgtext);
}
}
+ if (CM_IsEmpty(ret, eMesageText)) {
+ CM_SetField(ret, eMesageText, HKEY("\r\n\r\n (no text)\r\n"));
+ }
- return NewMsg;
-}
+ /* Perform "before read" hooks (aborting if any return nonzero) */
+ if (run_msg_hooks && (PerformMessageHooks(ret, NULL, EVT_BEFOREREAD) > 0)) {
+ CM_Free(ret);
+ return NULL;
+ }
+ return (ret);
+}
/*
void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
char *cbid, void *cbuserdata)
{
- struct CitContext *CCC = CC;
struct ma_info *ma;
ma = (struct ma_info *)cbuserdata;
- MSG_syslog(LOG_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype);
+ syslog(LOG_DEBUG, "msgbase: fixed_output_pre() type=<%s>", cbtype);
if (!strcasecmp(cbtype, "multipart/alternative")) {
++ma->is_ma;
ma->did_print = 0;
}
}
+
/*
* Post callback function for multipart/alternative
*/
void *content, char *cbtype, char *cbcharset, size_t length,
char *encoding, char *cbid, void *cbuserdata)
{
- struct CitContext *CCC = CC;
struct ma_info *ma;
ma = (struct ma_info *)cbuserdata;
- MSG_syslog(LOG_DEBUG, "fixed_output_post() type=<%s>\n", cbtype);
+ syslog(LOG_DEBUG, "msgbase: fixed_output_post() type=<%s>", cbtype);
if (!strcasecmp(cbtype, "multipart/alternative")) {
--ma->is_ma;
ma->did_print = 0;
}
}
+
/*
* Inline callback function for mime parser that wants to display text
*/
void *content, char *cbtype, char *cbcharset, size_t length,
char *encoding, char *cbid, void *cbuserdata)
{
- struct CitContext *CCC = CC;
char *ptr;
char *wptr;
size_t wlen;
ma = (struct ma_info *)cbuserdata;
- MSG_syslog(LOG_DEBUG,
- "fixed_output() part %s: %s (%s) (%ld bytes)\n",
- partnum, filename, cbtype, (long)length);
+ syslog(LOG_DEBUG,
+ "msgbase: fixed_output() part %s: %s (%s) (%ld bytes)",
+ partnum, filename, cbtype, (long)length
+ );
/*
* If we're in the middle of a multipart/alternative scope and
* we've already printed another section, skip this one.
*/
if ( (ma->is_ma) && (ma->did_print) ) {
- MSG_syslog(LOG_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype);
+ syslog(LOG_DEBUG, "msgbase: skipping part %s (%s)", partnum, cbtype);
return;
}
ma->did_print = 1;
}
if (!strcasecmp(cbtype, "text/html")) {
- ptr = html_to_ascii(content, length, 80, 0);
+ ptr = html_to_ascii(content, length, 80);
wlen = strlen(ptr);
client_write(ptr, wlen);
if ((wlen > 0) && (ptr[wlen-1] != '\n')) {
}
}
+
/*
* The client is elegant and sophisticated and wants to be choosy about
* MIME content types, so figure out which multipart/alternative part
void *content, char *cbtype, char *cbcharset, size_t length,
char *encoding, char *cbid, void *cbuserdata)
{
- struct CitContext *CCC = CC;
char buf[1024];
int i;
struct ma_info *ma;
ma = (struct ma_info *)cbuserdata;
- // NOTE: REMOVING THIS CONDITIONAL FIXES BUG 220
- // http://bugzilla.citadel.org/show_bug.cgi?id=220
- // I don't know if there are any side effects! Please TEST TEST TEST
- //if (ma->is_ma > 0) {
-
- for (i=0; i<num_tokens(CCC->preferred_formats, '|'); ++i) {
- extract_token(buf, CCC->preferred_formats, i, '|', sizeof buf);
+ for (i=0; i<num_tokens(CC->preferred_formats, '|'); ++i) {
+ extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) {
if (i < ma->chosen_pref) {
- MSG_syslog(LOG_DEBUG, "Setting chosen part: <%s>\n", partnum);
+ syslog(LOG_DEBUG, "msgbase: setting chosen part to <%s>", partnum);
safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part);
ma->chosen_pref = i;
}
}
}
+
/*
* Now that we've chosen our preferred part, output it.
*/
char *cbid,
void *cbuserdata)
{
- struct CitContext *CCC = CC;
int i;
char buf[128];
int add_newline = 0;
/* If the content-type of this part is in our preferred formats
* list, we can simply output it verbatim.
*/
- for (i=0; i<num_tokens(CCC->preferred_formats, '|'); ++i) {
- extract_token(buf, CCC->preferred_formats, i, '|', sizeof buf);
+ for (i=0; i<num_tokens(CC->preferred_formats, '|'); ++i) {
+ extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
if (!strcasecmp(buf, cbtype)) {
/* Yeah! Go! W00t!! */
if (ma->dont_decode == 0)
cprintf("\n");
if (client_write(text_content, length) == -1)
{
- MSGM_syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n");
+ syslog(LOG_ERR, "msgbase: output_preferred() aborting due to write failure");
return;
}
if (add_newline) cprintf("\n");
* (This is a security check)
*/
int check_cached_msglist(long msgnum) {
- struct CitContext *CCC = CC;
/* cases in which we skip the check */
- if (!CCC) return om_ok; /* not a session */
- if (CCC->client_socket <= 0) return om_ok; /* not a client session */
- if (CCC->cached_msglist == NULL) return om_access_denied; /* no msglist fetched */
- if (CCC->cached_num_msgs == 0) return om_access_denied; /* nothing to check */
+ if (!CC) return om_ok; /* not a session */
+ if (CC->client_socket <= 0) return om_ok; /* not a client session */
+ if (CC->cached_msglist == NULL) return om_access_denied; /* no msglist fetched */
+ if (CC->cached_num_msgs == 0) return om_access_denied; /* nothing to check */
/* Do a binary search within the cached_msglist for the requested msgnum */
while (max >= min) {
int middle = min + (max-min) / 2 ;
- if (msgnum == CCC->cached_msglist[middle]) {
+ if (msgnum == CC->cached_msglist[middle]) {
return om_ok;
}
if (msgnum > CC->cached_msglist[middle]) {
}
-/*
- * 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)
*
*/
int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */
- int mode, /* how would you like that message? */
- int headers_only, /* eschew the message body? */
- int do_proto, /* do Citadel protocol responses? */
- int crlf, /* Use CRLF newlines instead of LF? */
- char *section, /* NULL or a message/rfc822 section */
- int flags, /* various flags; see msgbase.h */
- char **Author,
- char **Address
+ int mode, /* how would you like that message? */
+ int headers_only, /* eschew the message body? */
+ int do_proto, /* do Citadel protocol responses? */
+ int crlf, /* Use CRLF newlines instead of LF? */
+ char *section, /* NULL or a message/rfc822 section */
+ int flags, /* various flags; see msgbase.h */
+ char **Author,
+ char **Address,
+ char **MessageID
) {
- struct CitContext *CCC = CC;
struct CtdlMessage *TheMessage = NULL;
int retcode = CIT_OK;
struct encapmsg encap;
int r;
- MSG_syslog(LOG_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n",
+ syslog(LOG_DEBUG, "msgbase: CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)",
msg_num, mode,
(section ? section : "<>")
);
r = check_cached_msglist(msg_num);
}
if (r != om_ok) {
- MSG_syslog(LOG_DEBUG, "Security check fail: message %ld is not in %s\n",
- msg_num, CCC->room.QRname
+ syslog(LOG_DEBUG, "msgbase: security check fail; message %ld is not in %s",
+ msg_num, CC->room.QRname
);
if (do_proto) {
if (r == om_access_denied) {
* request that we don't even bother loading the body into memory.
*/
if (headers_only == HEADERS_FAST) {
- TheMessage = CtdlFetchMessage(msg_num, 0);
+ TheMessage = CtdlFetchMessage(msg_num, 0, 1);
}
else {
- TheMessage = CtdlFetchMessage(msg_num, 1);
+ TheMessage = CtdlFetchMessage(msg_num, 1, 1);
}
if (TheMessage == NULL) {
if (section) if (!IsEmptyStr(section)) if (strcmp(section, "0")) {
memset(&encap, 0, sizeof encap);
safestrncpy(encap.desired_section, section, sizeof encap.desired_section);
- mime_parser(TheMessage->cm_fields[eMesageText],
- NULL,
- *extract_encapsulated_message,
- NULL, NULL, (void *)&encap, 0
- );
+ mime_parser(CM_RANGE(TheMessage, eMesageText),
+ *extract_encapsulated_message,
+ NULL, NULL, (void *)&encap, 0
+ );
if ((Author != NULL) && (*Author == NULL))
{
- *Author = TheMessage->cm_fields[eAuthor];
- TheMessage->cm_fields[eAuthor] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, eAuthor, Author, &len);
}
if ((Address != NULL) && (*Address == NULL))
{
- *Address = TheMessage->cm_fields[erFc822Addr];
- TheMessage->cm_fields[erFc822Addr] = NULL;
+ long len;
+ CM_GetAsField(TheMessage, erFc822Addr, Address, &len);
+ }
+ if ((MessageID != NULL) && (*MessageID == NULL))
+ {
+ long len;
+ CM_GetAsField(TheMessage, emessageId, MessageID, &len);
}
- CtdlFreeMessage(TheMessage);
+ CM_Free(TheMessage);
TheMessage = NULL;
if (encap.msg) {
* encapsulated message instead of the top-level
* message. Isn't that neat?
*/
-
}
else {
if (do_proto) {
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);
}
-
- CtdlFreeMessage(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;
- if (MessageDebugEnabled != 0) 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 */
- }
+ if ((MessageID != NULL) && (*MessageID == NULL))
+ {
+ long len;
+ CM_GetAsField(TheMessage, emessageId, MessageID, &len);
}
- 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;
+ CM_Free(TheMessage);
- *cptr = 0;
+ return(retcode);
}
int do_proto) /* do Citadel protocol responses? */
{
int i;
- int suppress_f = 0;
char buf[SIZ];
char display_name[256];
/* begin header processing loop for Citadel message format */
safestrncpy(display_name, "<unknown>", sizeof display_name);
- if (TheMessage->cm_fields[eAuthor]) {
+ if (!CM_IsEmpty(TheMessage, eAuthor)) {
strcpy(buf, TheMessage->cm_fields[eAuthor]);
if (TheMessage->cm_anon_type == MES_ANONONLY) {
safestrncpy(display_name, "****", sizeof display_name);
}
}
- /* Don't show Internet address for users on the
- * local Citadel network.
- */
- suppress_f = 0;
- if (TheMessage->cm_fields[eNodeName] != NULL)
- if (!IsEmptyStr(TheMessage->cm_fields[eNodeName]))
- if (haschar(TheMessage->cm_fields[eNodeName], '.') == 0) {
- suppress_f = 1;
- }
-
/* Now spew the header fields in the order we like them. */
for (i=0; i< NDiskFields; ++i) {
eMsgField Field;
Field = FieldOrder[i];
if (Field != eMesageText) {
- if ( (TheMessage->cm_fields[Field] != NULL)
+ if ( (!CM_IsEmpty(TheMessage, Field))
&& (msgkeys[Field] != NULL) ) {
if ((Field == eenVelopeTo) ||
(Field == eRecipient) ||
msgkeys[Field],
display_name);
}
- else if ((Field == erFc822Addr) && (suppress_f)) {
- /* do nothing */
- }
/* Masquerade display name if needed */
else {
- if (do_proto) cprintf("%s=%s\n",
- msgkeys[Field],
- TheMessage->cm_fields[Field]
- );
+ if (do_proto) {
+ cprintf("%s=%s\n", msgkeys[Field], TheMessage->cm_fields[Field]);
+ }
}
}
}
}
-
}
+
void OutputRFC822MsgHeaders(
struct CtdlMessage *TheMessage,
- int flags, /* should the bessage be exported clean */
- const char *nl,
+ int flags, /* should the message be exported clean */
+ const char *nl, int nlen,
char *mid, long sizeof_mid,
char *suser, long sizeof_suser,
char *luser, long sizeof_luser,
char *mpptr = NULL;
char *hptr;
- for (i = 0; i < 256; ++i) {
- if (TheMessage->cm_fields[i]) {
- mptr = mpptr = TheMessage->cm_fields[i];
-
- if (i == eAuthor) {
+ for (i = 0; i < NDiskFields; ++i) {
+ if (TheMessage->cm_fields[FieldOrder[i]]) {
+ mptr = mpptr = TheMessage->cm_fields[FieldOrder[i]];
+ switch (FieldOrder[i]) {
+ case eAuthor:
safestrncpy(luser, mptr, sizeof_luser);
safestrncpy(suser, mptr, sizeof_suser);
- }
- else if (i == 'Y') {
+ break;
+ case eCarbonCopY:
if ((flags & QP_EADDR) != 0) {
mptr = qp_encode_email_addrs(mptr);
}
sanitize_truncated_recipient(mptr);
cprintf("CC: %s%s", mptr, nl);
- }
- else if (i == 'P') {
+ break;
+ case eMessagePath:
cprintf("Return-Path: %s%s", mptr, nl);
- }
- else if (i == eListID) {
+ break;
+ case eListID:
cprintf("List-ID: %s%s", mptr, nl);
- }
- else if (i == 'V') {
+ break;
+ case eenVelopeTo:
if ((flags & QP_EADDR) != 0)
mptr = qp_encode_email_addrs(mptr);
hptr = mptr;
hptr ++;
if (!IsEmptyStr(hptr))
cprintf("Envelope-To: %s%s", hptr, nl);
- }
- else if (i == 'U') {
+ break;
+ case eMsgSubject:
cprintf("Subject: %s%s", mptr, nl);
subject_found = 1;
- }
- else if (i == 'I')
- safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found.
- else if (i == erFc822Addr)
+ break;
+ case emessageId:
+ safestrncpy(mid, mptr, sizeof_mid);
+ break;
+ case erFc822Addr:
safestrncpy(fuser, mptr, sizeof_fuser);
- /* else if (i == 'O')
- cprintf("X-Citadel-Room: %s%s",
- mptr, nl); */
- else if (i == 'N')
- safestrncpy(snode, mptr, sizeof_snode);
- else if (i == 'R')
- {
- if (haschar(mptr, '@') == 0)
- {
+ case eRecipient:
+ if (haschar(mptr, '@') == 0) {
sanitize_truncated_recipient(mptr);
- cprintf("To: %s@%s", mptr, config.c_fqdn);
+ cprintf("To: %s@%s", mptr, CtdlGetConfigStr("c_fqdn"));
cprintf("%s", nl);
}
- else
- {
+ else {
if ((flags & QP_EADDR) != 0) {
mptr = qp_encode_email_addrs(mptr);
}
cprintf("To: %s", mptr);
cprintf("%s", nl);
}
- }
- else if (i == 'T') {
- datestring(datestamp, sizeof datestamp,
- atol(mptr), DATESTRING_RFC822);
+ break;
+ case eTimestamp:
+ datestring(datestamp, sizeof datestamp, atol(mptr), DATESTRING_RFC822);
cprintf("Date: %s%s", datestamp, nl);
- }
- else if (i == 'W') {
+ break;
+ case eWeferences:
cprintf("References: ");
k = num_tokens(mptr, '|');
for (j=0; j<k; ++j) {
cprintf(" ");
}
}
- }
- else if (i == eReplyTo) {
+ break;
+ case eReplyTo:
hptr = mptr;
while ((*hptr != '\0') && isspace(*hptr))
hptr ++;
if (!IsEmptyStr(hptr))
cprintf("Reply-To: %s%s", mptr, nl);
+ break;
+
+ case eExclusiveID:
+ case eJournal:
+ case eMesageText:
+ case eBig_message:
+ case eOriginalRoom:
+ case eErrorMsg:
+ case eSuppressIdx:
+ case eExtnotify:
+ case eVltMsgNum:
+ /* these don't map to mime message headers. */
+ break;
}
- if (mptr != mpptr)
+ if (mptr != mpptr) {
free (mptr);
+ }
}
}
if (subject_found == 0) {
struct CtdlMessage *TheMessage,
int headers_only, /* eschew the message body? */
int flags, /* should the bessage be exported clean? */
-
- const char *nl)
+ const char *nl, int nlen)
{
cit_uint8_t prev_ch;
int eoh = 0;
int outlen = 0;
int nllen = strlen(nl);
char *mptr;
+ int lfSent = 0;
mptr = TheMessage->cm_fields[eMesageText];
-
prev_ch = '\0';
while (*mptr != '\0') {
if (*mptr == '\r') {
((headers_only == HEADERS_ONLY) && (mptr < StartOfText)) ||
((headers_only != HEADERS_NONE) &&
(headers_only != HEADERS_ONLY))
- ) {
+ ) {
if (*mptr == '\n') {
memcpy(&outbuf[outlen], nl, nllen);
outlen += nllen;
}
}
}
- if (flags & ESC_DOT)
- {
- if ((prev_ch == '\n') &&
- (*mptr == '.') &&
- ((*(mptr+1) == '\r') || (*(mptr+1) == '\n')))
- {
+ if (flags & ESC_DOT) {
+ if ((prev_ch == '\n') && (*mptr == '.') && ((*(mptr+1) == '\r') || (*(mptr+1) == '\n'))) {
outbuf[outlen++] = '.';
}
prev_ch = *mptr;
}
++mptr;
if (outlen > 1000) {
- if (client_write(outbuf, outlen) == -1)
- {
- struct CitContext *CCC = CC;
- MSGM_syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n");
+ if (client_write(outbuf, outlen) == -1) {
+ syslog(LOG_ERR, "msgbase: Dump_RFC822HeadersBody() aborting due to write failure");
return;
}
+ lfSent = (outbuf[outlen - 1] == '\n');
outlen = 0;
}
}
if (outlen > 0) {
client_write(outbuf, outlen);
+ lfSent = (outbuf[outlen - 1] == '\n');
}
+ if (!lfSent)
+ client_write(nl, nlen);
}
-
/* If the format type on disk is 1 (fixed-format), then we want
* everything to be output completely literally ... regardless of
* what message transfer format is in use.
void DumpFormatFixed(
struct CtdlMessage *TheMessage,
int mode, /* how would you like that message? */
- const char *nl)
+ const char *nl, int nllen)
{
cit_uint8_t ch;
char buf[SIZ];
int buflen;
int xlline = 0;
- int nllen = strlen (nl);
char *mptr;
mptr = TheMessage->cm_fields[eMesageText];
ch = '\r';
}
}
- /* if we reach the outer bounds of our buffer,
- abort without respect what whe purge. */
- if (xlline &&
- ((isspace(ch)) ||
- (buflen > SIZ - nllen - 2)))
+
+ /* if we reach the outer bounds of our buffer, abort without respect for what we purge. */
+ if (xlline && ((isspace(ch)) || (buflen > SIZ - nllen - 2))) {
ch = '\r';
+ }
if (ch == '\r') {
memcpy (&buf[buflen], nl, nllen);
buflen += nllen;
buf[buflen] = '\0';
- if (client_write(buf, buflen) == -1)
- {
- struct CitContext *CCC = CC;
- MSGM_syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n");
+ if (client_write(buf, buflen) == -1) {
+ syslog(LOG_ERR, "msgbase: DumpFormatFixed() aborting due to write failure");
return;
}
*buf = '\0';
}
}
buf[buflen] = '\0';
- if (!IsEmptyStr(buf))
+ if (!IsEmptyStr(buf)) {
cprintf("%s%s", buf, nl);
+ }
}
+
/*
* Get a message off disk. (returns om_* values found in msgbase.h)
*/
int crlf, /* Use CRLF newlines instead of LF? */
int flags /* should the bessage be exported clean? */
) {
- struct CitContext *CCC = CC;
int i;
- char *mptr = NULL;
const char *nl; /* newline string */
+ int nlen;
struct ma_info ma;
/* Buffers needed for RFC822 translation. These are all filled
char snode[100];
char mid[100];
- MSG_syslog(LOG_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n",
+ syslog(LOG_DEBUG, "msgbase: CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d",
((TheMessage == NULL) ? "NULL" : "not null"),
- mode, headers_only, do_proto, crlf);
+ mode, headers_only, do_proto, crlf
+ );
strcpy(mid, "unknown");
nl = (crlf ? "\r\n" : "\n");
+ nlen = crlf ? 2 : 1;
- if (!is_valid_message(TheMessage)) {
- MSGM_syslog(LOG_ERR,
- "ERROR: invalid preloaded message for output\n");
- cit_backtrace ();
+ if (!CM_IsValidMsg(TheMessage)) {
+ syslog(LOG_ERR, "msgbase: error; invalid preloaded message for output");
return(om_no_such_msg);
}
/* 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[eenVelopeTo] != NULL) ) {
- memset(TheMessage->cm_fields[eenVelopeTo], ' ', strlen(TheMessage->cm_fields[eenVelopeTo]));
+ if ( (flags & SUPPRESS_ENV_TO) && (!CM_IsEmpty(TheMessage, eenVelopeTo)) ) {
+ memset(TheMessage->cm_fields[eenVelopeTo], ' ', TheMessage->cm_lengths[eenVelopeTo]);
}
/* Are we downloading a MIME component? */
if (do_proto)
cprintf("%d This is not a MIME message.\n",
ERROR + ILLEGAL_VALUE);
- } else if (CCC->download_fp != NULL) {
+ } else if (CC->download_fp != NULL) {
if (do_proto) cprintf(
"%d You already have a download open.\n",
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
*/
- if (CCC->download_fp == NULL) {
+ if (CC->download_fp == NULL) {
if (do_proto) cprintf(
"%d Section %s not found.\n",
ERROR + FILE_NOT_FOUND,
- CCC->download_desired_section);
+ CC->download_desired_section);
}
}
- return((CCC->download_fp != NULL) ? om_ok : om_mime_error);
+ return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
/* MT_SPEW_SECTION is like MT_DOWNLOAD except it outputs the whole MIME part
/* 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) {
if (do_proto) cprintf(
"%d Section %s not found.\n",
ERROR + FILE_NOT_FOUND,
- CCC->download_desired_section);
+ CC->download_desired_section);
}
}
- return((CCC->download_fp != NULL) ? om_ok : om_mime_error);
+ return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
/* now for the user-mode message reading loops */
strcpy(suser, "");
strcpy(luser, "");
strcpy(fuser, "");
- strcpy(snode, NODENAME);
if (mode == MT_RFC822)
OutputRFC822MsgHeaders(
TheMessage,
flags,
- nl,
+ nl, nlen,
mid, sizeof(mid),
suser, sizeof(suser),
luser, sizeof(luser),
}
if (mode == MT_RFC822) {
- if (!strcasecmp(snode, NODENAME)) {
- safestrncpy(snode, FQDN, sizeof snode);
- }
-
/* Construct a fun message id */
- cprintf("Message-ID: <%s", mid);/// todo: this possibly breaks threadding mails.
+ cprintf("Message-ID: <%s", mid);
if (strchr(mid, '@')==NULL) {
cprintf("@%s", snode);
}
/* 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),
TheMessage,
headers_only,
flags,
- nl);
+ nl, nlen);
goto DONE;
}
}
DumpFormatFixed(
TheMessage,
mode, /* how would you like that message? */
- nl);
+ nl, nlen);
/* If the message on disk is format 0 (Citadel vari-format), we
* output using the formatter at 80 columns. This is the final output
* 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
ma.use_fo_hooks = 0;
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);
+ ma.dont_decode = CC->msg4_dont_decode;
+ 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)
+ * Save one or more message pointers into a specified room
+ * (Returns 0 for success, nonzero for failure)
+ * roomname may be NULL to use the current room
+ *
+ * Note that the 'supplied_msg' field may be set to NULL, in which case
+ * the message will be fetched from disk, by number, if we need to perform
+ * replication checks. This adds an additional database read, so if the
+ * caller already has the message in memory then it should be supplied. (Obviously
+ * this mode of operation only works if we're saving a single message.)
*/
-void cmd_msg2(char *cmdbuf)
-{
- long msgid;
- int headers_only = HEADERS_ALL;
+int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs,
+ int do_repl_check, struct CtdlMessage *supplied_msg, int suppress_refcount_adj
+) {
+ int i, j, unique;
+ char hold_rm[ROOMNAMELEN];
+ struct cdbdata *cdbfr;
+ int num_msgs;
+ long *msglist;
+ long highest_msg = 0L;
- msgid = extract_long(cmdbuf, 0);
- headers_only = extract_int(cmdbuf, 1);
+ long msgid = 0;
+ struct CtdlMessage *msg = NULL;
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL, 0, NULL, NULL);
-}
+ long *msgs_to_be_merged = NULL;
+ int num_msgs_to_be_merged = 0;
+ syslog(LOG_DEBUG,
+ "msgbase: CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)",
+ roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
+ );
+ strcpy(hold_rm, CC->room.QRname);
-/*
- * 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;
+ /* Sanity checks */
+ if (newmsgidlist == NULL) return(ERROR + INTERNAL_ERROR);
+ if (num_newmsgs < 1) return(ERROR + INTERNAL_ERROR);
+ if (num_newmsgs > 1) supplied_msg = NULL;
- if (CC->internal_pgm == 0) {
- cprintf("%d This command is for internal programs only.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
+ /* Now the regular stuff */
+ if (CtdlGetRoomLock(&CC->room,
+ ((roomname != NULL) ? roomname : CC->room.QRname) )
+ != 0) {
+ syslog(LOG_ERR, "msgbase: no such room <%s>", roomname);
+ return(ERROR + ROOM_NOT_FOUND);
}
- 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);
+ msgs_to_be_merged = malloc(sizeof(long) * num_newmsgs);
+ num_msgs_to_be_merged = 0;
- 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)
- * roomname may be NULL to use the current room
- *
- * Note that the 'supplied_msg' field may be set to NULL, in which case
- * the message will be fetched from disk, by number, if we need to perform
- * replication checks. This adds an additional database read, so if the
- * caller already has the message in memory then it should be supplied. (Obviously
- * this mode of operation only works if we're saving a single message.)
- */
-int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs,
- int do_repl_check, struct CtdlMessage *supplied_msg, int suppress_refcount_adj
-) {
- struct CitContext *CCC = CC;
- int i, j, unique;
- char hold_rm[ROOMNAMELEN];
- struct cdbdata *cdbfr;
- int num_msgs;
- long *msglist;
- long highest_msg = 0L;
-
- long msgid = 0;
- struct CtdlMessage *msg = NULL;
-
- long *msgs_to_be_merged = NULL;
- int num_msgs_to_be_merged = 0;
- MSG_syslog(LOG_DEBUG,
- "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n",
- roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
- );
-
- strcpy(hold_rm, CCC->room.QRname);
-
- /* Sanity checks */
- if (newmsgidlist == NULL) return(ERROR + INTERNAL_ERROR);
- if (num_newmsgs < 1) return(ERROR + INTERNAL_ERROR);
- if (num_newmsgs > 1) supplied_msg = NULL;
-
- /* Now the regular stuff */
- if (CtdlGetRoomLock(&CCC->room,
- ((roomname != NULL) ? roomname : CCC->room.QRname) )
- != 0) {
- MSG_syslog(LOG_ERR, "No such room <%s>\n", roomname);
- return(ERROR + ROOM_NOT_FOUND);
- }
-
-
- msgs_to_be_merged = malloc(sizeof(long) * num_newmsgs);
- num_msgs_to_be_merged = 0;
-
-
- cdbfr = cdb_fetch(CDB_MSGLISTS, &CCC->room.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr == NULL) {
msglist = NULL;
num_msgs = 0;
}
}
- MSG_syslog(LOG_DEBUG, "%d unique messages to be merged\n", num_msgs_to_be_merged);
+ syslog(LOG_DEBUG, "msgbase: %d unique messages to be merged", num_msgs_to_be_merged);
/*
* Now merge the new messages
*/
msglist = realloc(msglist, (sizeof(long) * (num_msgs + num_msgs_to_be_merged)) );
if (msglist == NULL) {
- MSGM_syslog(LOG_ALERT, "ERROR: can't realloc message list!\n");
+ syslog(LOG_ALERT, "msgbase: ERROR; can't realloc message list!");
free(msgs_to_be_merged);
return (ERROR + INTERNAL_ERROR);
}
highest_msg = msglist[num_msgs - 1];
/* Write it back to disk. */
- cdb_store(CDB_MSGLISTS, &CCC->room.QRnumber, (int)sizeof(long),
+ cdb_store(CDB_MSGLISTS, &CC->room.QRnumber, (int)sizeof(long),
msglist, (int)(num_msgs * sizeof(long)));
/* Free up the memory we used. */
free(msglist);
/* Update the highest-message pointer and unlock the room. */
- CCC->room.QRhighest = highest_msg;
- CtdlPutRoomLock(&CCC->room);
+ CC->room.QRhighest = highest_msg;
+ CtdlPutRoomLock(&CC->room);
/* Perform replication checks if necessary */
- if ( (DoesThisRoomNeedEuidIndexing(&CCC->room)) && (do_repl_check) ) {
- MSGM_syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n");
+ if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) {
+ syslog(LOG_DEBUG, "msgbase: CtdlSaveMsgPointerInRoom() doing repl checks");
for (i=0; i<num_msgs_to_be_merged; ++i) {
msgid = msgs_to_be_merged[i];
msg = supplied_msg;
}
else {
- msg = CtdlFetchMessage(msgid, 0);
+ msg = CtdlFetchMessage(msgid, 0, 1);
}
if (msg != NULL) {
ReplicationChecks(msg);
/* If the message has an Exclusive ID, index that... */
- if (msg->cm_fields[eExclusiveID] != NULL) {
- index_message_by_euid(msg->cm_fields[eExclusiveID], &CCC->room, msgid);
+ if (!CM_IsEmpty(msg, eExclusiveID)) {
+ index_message_by_euid(msg->cm_fields[eExclusiveID], &CC->room, msgid);
}
/* Free up the memory we may have allocated */
if (msg != supplied_msg) {
- CtdlFreeMessage(msg);
+ CM_Free(msg);
}
}
}
else {
- MSGM_syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n");
+ syslog(LOG_DEBUG, "msgbase: CtdlSaveMsgPointerInRoom() skips repl checks");
}
/* Submit this room for processing by hooks */
- PerformRoomHooks(&CCC->room);
+ PerformRoomHooks(&CC->room);
/* Go back to the room we were in before we wandered here... */
- CtdlGetRoom(&CCC->room, hold_rm);
+ CtdlGetRoom(&CC->room, hold_rm);
/* Bump the reference count for all messages which were merged */
if (!suppress_refcount_adj) {
* called by server-side modules.
*
*/
-long send_message(struct CtdlMessage *msg) {
- struct CitContext *CCC = CC;
- long newmsgid;
+long CtdlSaveThisMessage(struct CtdlMessage *msg, long msgid, int Reply) {
long retval;
- char msgidbuf[256];
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
- );
-
- /* Generate an ID if we don't have one already */
- if (msg->cm_fields[emessageId]==NULL) {
- msg->cm_fields[emessageId] = strdup(msgidbuf);
- }
-
- /* If the message is big, set its body aside for storage elsewhere */
- if (msg->cm_fields[eMesageText] != NULL) {
- if (strlen(msg->cm_fields[eMesageText]) > BIGMSG) {
- is_bigmsg = 1;
- holdM = msg->cm_fields[eMesageText];
- msg->cm_fields[eMesageText] = NULL;
- }
+ /*
+ * If the message is big, set its body aside for storage elsewhere
+ * and we hide the message body from the serializer
+ */
+ if (!CM_IsEmpty(msg, eMesageText) && msg->cm_lengths[eMesageText] > BIGMSG)
+ {
+ is_bigmsg = 1;
+ holdM = msg->cm_fields[eMesageText];
+ msg->cm_fields[eMesageText] = NULL;
+ holdMLen = msg->cm_lengths[eMesageText];
+ msg->cm_lengths[eMesageText] = 0;
}
/* Serialize our data structure for storage in the database */
- serialize_message(&smr, msg);
+ CtdlSerializeMessage(&smr, msg);
if (is_bigmsg) {
+ /* put the message body back into the message */
msg->cm_fields[eMesageText] = holdM;
+ msg->cm_lengths[eMesageText] = holdMLen;
}
if (smr.len == 0) {
- cprintf("%d Unable to serialize message\n",
- ERROR + INTERNAL_ERROR);
+ if (Reply) {
+ cprintf("%d Unable to serialize message\n",
+ ERROR + INTERNAL_ERROR);
+ }
+ else {
+ syslog(LOG_ERR, "msgbase: CtdlSaveMessage() unable to serialize message");
+
+ }
return (-1L);
}
/* Write our little bundle of joy into the message base */
- if (cdb_store(CDB_MSGMAIN, &newmsgid, (int)sizeof(long),
- smr.ser, smr.len) < 0) {
- MSGM_syslog(LOG_ERR, "Can't store message\n");
- retval = 0L;
- } else {
+ retval = cdb_store(CDB_MSGMAIN, &msgid, (int)sizeof(long),
+ smr.ser, smr.len);
+ if (retval < 0) {
+ syslog(LOG_ERR, "msgbase: can't store message %ld: %ld", msgid, retval);
+ }
+ else {
if (is_bigmsg) {
- cdb_store(CDB_BIGMSGS,
- &newmsgid,
- (int)sizeof(long),
- holdM,
- (strlen(holdM) + 1)
+ retval = cdb_store(CDB_BIGMSGS,
+ &msgid,
+ (int)sizeof(long),
+ holdM,
+ (holdMLen + 1)
);
+ if (retval < 0) {
+ syslog(LOG_ERR, "msgbase: failed to store message body for msgid %ld: %ld", msgid, retval);
+ }
}
- retval = newmsgid;
}
/* Free the memory we used for the serialized message */
free(smr.ser);
+ return(retval);
+}
+
+long send_message(struct CtdlMessage *msg) {
+ long newmsgid;
+ long retval;
+ char msgidbuf[256];
+ long msgidbuflen;
+
+ /* Get a new message number */
+ newmsgid = get_new_message_number();
+
+ /* Generate an ID if we don't have one already */
+ if (CM_IsEmpty(msg, emessageId)) {
+ msgidbuflen = snprintf(msgidbuf, sizeof msgidbuf, "%08lX-%08lX@%s",
+ (long unsigned int) time(NULL),
+ (long unsigned int) newmsgid,
+ CtdlGetConfigStr("c_fqdn")
+ );
+
+ CM_SetField(msg, emessageId, msgidbuf, msgidbuflen);
+ }
+
+ retval = CtdlSaveThisMessage(msg, newmsgid, 1);
+
+ if (retval == 0) {
+ retval = newmsgid;
+ }
+
/* Return the *local* message ID to the caller
* (even if we're storing an incoming network message)
*/
* contains the length of the serialized message and a pointer to the
* serialized message in memory. THE LATTER MUST BE FREED BY THE CALLER.
*/
-void serialize_message(struct ser_ret *ret, /* return values */
- struct CtdlMessage *msg) /* unserialized msg */
+void CtdlSerializeMessage(struct ser_ret *ret, /* return values */
+ struct CtdlMessage *msg) /* unserialized msg */
{
- struct CitContext *CCC = CC;
- size_t wlen, fieldlen;
+ size_t wlen;
int i;
- long lengths[NDiskFields];
-
- memset(lengths, 0, sizeof(lengths));
/*
* Check for valid message format
*/
- if (is_valid_message(msg) == 0) {
- MSGM_syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n");
+ if (CM_IsValidMsg(msg) == 0) {
+ syslog(LOG_ERR, "msgbase: CtdlSerializeMessage() aborting due to invalid message");
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",
- (long)ret->len, strerror(errno));
+ syslog(LOG_ERR, "msgbase: CtdlSerializeMessage() malloc(%ld) failed: %m", (long)ret->len);
ret->len = 0;
ret->ser = NULL;
return;
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) {
- MSG_syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n",
- (long)ret->len, (long)wlen);
+ syslog(LOG_ERR, "msgbase: ERROR; len=%ld wlen=%ld", (long)ret->len, (long)wlen);
}
return;
* carry the same Exclusive ID as this one. If any are found, delete them.
*/
void ReplicationChecks(struct CtdlMessage *msg) {
- struct CitContext *CCC = CC;
long old_msgnum = (-1L);
- if (DoesThisRoomNeedEuidIndexing(&CCC->room) == 0) return;
+ if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
- MSG_syslog(LOG_DEBUG, "Performing replication checks in <%s>\n",
- CCC->room.QRname);
+ syslog(LOG_DEBUG, "msgbase: performing replication checks in <%s>", CC->room.QRname);
/* No exclusive id? Don't do anything. */
if (msg == NULL) return;
- if (msg->cm_fields[eExclusiveID] == NULL) return;
- if (IsEmptyStr(msg->cm_fields[eExclusiveID])) return;
- /*MSG_syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
- msg->cm_fields[eExclusiveID], CCC->room.QRname);*/
+ if (CM_IsEmpty(msg, eExclusiveID)) return;
- old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields[eExclusiveID], &CCC->room);
+ /*syslog(LOG_DEBUG, "msgbase: exclusive ID: <%s> for room <%s>",
+ msg->cm_fields[eExclusiveID], CC->room.QRname);*/
+
+ old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields[eExclusiveID], &CC->room);
if (old_msgnum > 0L) {
- MSG_syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum);
- CtdlDeleteMessages(CCC->room.QRname, &old_msgnum, 1, "");
+ syslog(LOG_DEBUG, "msgbase: ReplicationChecks() replacing message %ld", old_msgnum);
+ CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, "");
}
}
* 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 */
+ syslog(LOG_DEBUG, "msgbase: CtdlSubmitMsg() called");
+ 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[eTimestamp] == NULL) {
- snprintf(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL));
- msg->cm_fields[eTimestamp] = 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[eMessagePath] == NULL) {
- if (msg->cm_fields[eAuthor] != NULL) {
- msg->cm_fields[eMessagePath] = strdup(msg->cm_fields[eAuthor]);
+ 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[eMessagePath] = 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[eMesageText] == NULL) {
- MSGM_syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n");
+ if (CM_IsEmpty(msg, eMesageText)) {
+ syslog(LOG_ERR, "msgbase: ERROR; attempt to save message with NULL body");
return(-2);
}
}
/* Goto the correct room */
- room = (recps) ? CCC->room.QRname : SENTITEMS;
- MSG_syslog(LOG_DEBUG, "Selected room %s\n", room);
- strcpy(hold_rm, CCC->room.QRname);
- strcpy(actual_rm, CCC->room.QRname);
+ room = (recps) ? CC->room.QRname : SENTITEMS;
+ syslog(LOG_DEBUG, "msgbase: selected room %s", room);
+ strcpy(hold_rm, CC->room.QRname);
+ strcpy(actual_rm, CC->room.QRname);
if (recps != NULL) {
strcpy(actual_rm, SENTITEMS);
}
/* If the user is a twit, move to the twit room for posting */
if (TWITDETECT) {
- if (CCC->user.axlevel == AxProbU) {
+ if (CC->user.axlevel == AxProbU) {
strcpy(hold_rm, actual_rm);
- strcpy(actual_rm, config.c_twitroom);
- MSGM_syslog(LOG_DEBUG, "Diverting to twit room\n");
+ strcpy(actual_rm, CtdlGetConfigStr("c_twitroom"));
+ syslog(LOG_DEBUG, "msgbase: diverting to twit room");
}
}
strcpy(actual_rm, force_room);
}
- MSG_syslog(LOG_INFO, "Final selection: %s (%s)\n", actual_rm, room);
- if (strcasecmp(actual_rm, CCC->room.QRname)) {
- /* CtdlGetRoom(&CCC->room, actual_rm); */
- CtdlUserGoto(actual_rm, 0, 1, NULL, NULL);
+ syslog(LOG_DEBUG, "msgbase: final selection: %s (%s)", actual_rm, room);
+ if (strcasecmp(actual_rm, CC->room.QRname)) {
+ /* CtdlGetRoom(&CC->room, actual_rm); */
+ CtdlUserGoto(actual_rm, 0, 1, NULL, NULL, NULL, NULL);
}
/*
* If this message has no O (room) field, generate one.
*/
- if (msg->cm_fields[eOriginalRoom] == NULL) {
- msg->cm_fields[eOriginalRoom] = strdup(CCC->room.QRname);
+ if (CM_IsEmpty(msg, eOriginalRoom) && !IsEmptyStr(CC->room.QRname)) {
+ CM_SetField(msg, eOriginalRoom, CC->room.QRname, strlen(CC->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);
+ syslog(LOG_DEBUG, "msgbase: performing before-save hooks");
+ if (PerformMessageHooks(msg, recps, EVT_BEFORESAVE) > 0) return(-3);
/*
* If this message has an Exclusive ID, and the room is replication
* checking enabled, then do replication checks.
*/
- if (DoesThisRoomNeedEuidIndexing(&CCC->room)) {
+ if (DoesThisRoomNeedEuidIndexing(&CC->room)) {
ReplicationChecks(msg);
}
/* Save it to disk */
- MSGM_syslog(LOG_DEBUG, "Saving to disk\n");
+ syslog(LOG_DEBUG, "msgbase: saving to disk");
newmsgid = send_message(msg);
if (newmsgid <= 0L) return(-5);
* be a critical section because nobody else knows about this message
* yet.
*/
- MSGM_syslog(LOG_DEBUG, "Creating MetaData record\n");
+ syslog(LOG_DEBUG, "msgbase: creating metadata record");
memset(&smi, 0, sizeof(struct MetaData));
smi.meta_msgnum = newmsgid;
smi.meta_refcount = 0;
* 2. If journaling is enabled, we will need an RFC822 version of the
* message to attach to the journalized copy.
*/
- if (CCC->redirect_buffer != NULL) {
- MSGM_syslog(LOG_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n");
+ if (CC->redirect_buffer != NULL) {
+ syslog(LOG_ALERT, "msgbase: CC->redirect_buffer is not NULL during message submission!");
abort();
}
- CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
+ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, QP_EADDR);
- smi.meta_rfc822_length = StrLength(CCC->redirect_buffer);
- saved_rfc822_version = CCC->redirect_buffer;
- CCC->redirect_buffer = NULL;
+ smi.meta_rfc822_length = StrLength(CC->redirect_buffer);
+ saved_rfc822_version = CC->redirect_buffer;
+ CC->redirect_buffer = NULL;
PutMetaData(&smi);
/* Now figure out where to store the pointers */
- MSGM_syslog(LOG_DEBUG, "Storing pointers\n");
+ syslog(LOG_DEBUG, "msgbase: storing pointers");
/* If this is being done by the networker delivering a private
* message, we want to BYPASS saving the sender's copy (because there
* is no local sender; it would otherwise go to the Trashcan).
*/
- if ((!CCC->internal_pgm) || (recps == NULL)) {
+ if ((!CC->internal_pgm) || (recps == NULL)) {
if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
- MSGM_syslog(LOG_ERR, "ERROR saving message pointer!\n");
- CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
+ syslog(LOG_ERR, "msgbase: ERROR saving message pointer!");
+ CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("c_aideroom"), newmsgid, 0, msg);
}
}
for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
extract_token(recipient, recps->recp_room, i,
'|', sizeof recipient);
- MSG_syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient);///// xxxx
+ syslog(LOG_DEBUG, "msgbase: delivering to room <%s>", recipient);
CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
}
/* Bump this user's messages posted counter. */
- MSGM_syslog(LOG_DEBUG, "Updating user\n");
- CtdlGetUserLock(&CCC->user, CCC->curr_user);
- CCC->user.posted = CCC->user.posted + 1;
- CtdlPutUserLock(&CCC->user);
+ syslog(LOG_DEBUG, "msgbase: updating user");
+ CtdlLockGetCurrentUser();
+ CC->user.posted = CC->user.posted + 1;
+ CtdlPutCurrentUserLock();
/* Decide where bounces need to be delivered */
- if ((recps != NULL) && (recps->bounce_to != NULL)) {
- safestrncpy(bounce_to, recps->bounce_to, sizeof bounce_to);
- }
- else if (CCC->logged_in) {
- snprintf(bounce_to, sizeof bounce_to, "%s@%s", CCC->user.fullname, config.c_nodename);
- }
- else {
- snprintf(bounce_to, sizeof bounce_to, "%s@%s", msg->cm_fields[eAuthor], msg->cm_fields[eNodeName]);
+ if ((recps != NULL) && (recps->bounce_to == NULL))
+ {
+ if (CC->logged_in) {
+ strcpy(bounce_to, CC->user.fullname);
+ }
+ else {
+ strcpy(bounce_to, msg->cm_fields[eAuthor]);
+ }
+ 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) {
- 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);
+ syslog(LOG_DEBUG, "msgbase: delivering private local mail to <%s>", 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[eMsgSubject] = strdup("QMSG");
- imsg->cm_fields[eAuthor] = strdup("Citadel");
- imsg->cm_fields[eJournal] = strdup("do not journal");
- imsg->cm_fields[eMesageText] = instr; /* imsg owns this memory now */
- imsg->cm_fields[eExtnotify] = 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);
+ syslog(LOG_DEBUG, "msgbase: no user <%s>", recipient);
+ CtdlSaveMsgPointerInRoom(CtdlGetConfigStr("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[eVltMsgNum] != NULL) free(msg->cm_fields[eVltMsgNum]);
- msg->cm_fields[eVltMsgNum] = malloc(20);
- snprintf(msg->cm_fields[eVltMsgNum], 20, "%ld", newmsgid);
- PerformMessageHooks(msg, EVT_AFTERSAVE);
- free(msg->cm_fields[eVltMsgNum]);
- msg->cm_fields[eVltMsgNum] = 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; 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);
- }
+ syslog(LOG_DEBUG, "msgbase: performing after-save hooks");
- free(msg->cm_fields[eRecipient]);
- free(msg->cm_fields[eDestination]);
- msg->cm_fields[eRecipient] = hold_R;
- msg->cm_fields[eDestination] = 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[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);
- CtdlFreeMessage(imsg);
- }
+ syslog(LOG_DEBUG, "msgbase: returning to original room %s", hold_rm);
+ if (strcasecmp(hold_rm, CC->room.QRname))
+ CtdlUserGoto(hold_rm, 0, 1, NULL, NULL, NULL, NULL);
/*
* Any addresses to harvest for someone's address book?
*/
- if ( (CCC->logged_in) && (recps != NULL) ) {
+ if ( (CC->logged_in) && (recps != NULL) ) {
collected_addresses = harvest_collected_addresses(msg);
}
aptr = (struct addresses_to_be_filed *)
malloc(sizeof(struct addresses_to_be_filed));
CtdlMailboxName(actual_rm, sizeof actual_rm,
- &CCC->user, USERCONTACTSROOM);
+ &CC->user, USERCONTACTSROOM);
aptr->roomname = strdup(actual_rm);
aptr->collected_addresses = collected_addresses;
begin_critical_section(S_ATBF);
/*
* Determine whether this message qualifies for journaling.
*/
- if (msg->cm_fields[eJournal] != NULL) {
+ if (!CM_IsEmpty(msg, eJournal)) {
qualified_for_journaling = 0;
}
else {
if (recps == NULL) {
- qualified_for_journaling = config.c_journal_pubmsgs;
+ qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
}
else if (recps->num_local + recps->num_ignet + recps->num_internet > 0) {
- qualified_for_journaling = config.c_journal_email;
+ qualified_for_journaling = CtdlGetConfigInt("c_journal_email");
}
else {
- qualified_for_journaling = config.c_journal_pubmsgs;
+ qualified_for_journaling = CtdlGetConfigInt("c_journal_pubmsgs");
}
}
}
}
+ if ((recps != NULL) && (recps->bounce_to == bounce_to))
+ recps->bounce_to = NULL;
+
/* Done. */
return(newmsgid);
}
/*
* Convenience function for generating small administrative messages.
*/
-void quickie_message(const char *from,
+long quickie_message(const char *from,
const char *fromaddr,
const char *to,
char *room,
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_anon_type = MES_NORMAL;
msg->cm_format_type = format_type;
- if (from != NULL) {
- msg->cm_fields[eAuthor] = strdup(from);
+ if (!IsEmptyStr(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;
+ else if (!IsEmptyStr(fromaddr)) {
+ 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 (to != NULL) {
- msg->cm_fields[eRecipient] = strdup(to);
+ if (!IsEmptyStr(fromaddr)) CM_SetField(msg, erFc822Addr, fromaddr, strlen(fromaddr));
+ if (!IsEmptyStr(room)) CM_SetField(msg, eOriginalRoom, room, strlen(room));
+ if (!IsEmptyStr(to)) {
+ CM_SetField(msg, eRecipient, to, strlen(to));
recp = validate_recipients(to, NULL, 0);
}
- if (subject != NULL) {
- msg->cm_fields[eMsgSubject] = strdup(subject);
+ if (!IsEmptyStr(subject)) {
+ CM_SetField(msg, eMsgSubject, subject, strlen(subject));
+ }
+ if (!IsEmptyStr(text)) {
+ CM_SetField(msg, eMesageText, text, strlen(text));
}
- msg->cm_fields[eMesageText] = strdup(text);
- CtdlSubmitMsg(msg, recp, room, 0);
- CtdlFreeMessage(msg);
+ long msgnum = CtdlSubmitMsg(msg, recp, room, 0);
+ 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);
+ return msgnum;
}
size_t maxlen, /* maximum message length */
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 */
+ int crlf /* CRLF newlines instead of LF */
)
{
StrBuf *Message;
/* read in the lines of message text one by one */
do {
- if (sock != NULL) {
- if ((CtdlSockGetLine(sock, LineBuf, 5) < 0) ||
- (*sock == -1))
- finished = 1;
- }
- else {
- if (CtdlClientGetLine(LineBuf) < 0) finished = 1;
+ if (CtdlClientGetLine(LineBuf) < 0) {
+ finished = 1;
}
- if ((StrLength(LineBuf) == tlen) &&
- (!strcmp(ChrPtr(LineBuf), terminator)))
+ if ((StrLength(LineBuf) == tlen) && (!strcmp(ChrPtr(LineBuf), terminator))) {
finished = 1;
-
+ }
if ( (!flushing) && (!finished) ) {
if (crlf) {
StrBufAppendBufPlain(LineBuf, HKEY("\r\n"), 0);
}
/* Unescape SMTP-style input of two dots at the beginning of the line */
- if ((dotdot) &&
- (StrLength(LineBuf) == 2) &&
- (!strcmp(ChrPtr(LineBuf), "..")))
- {
+ if ((dotdot) && (StrLength(LineBuf) > 1) && (ChrPtr(LineBuf)[0] == '.')) {
StrBufCutLeft(LineBuf, 1);
}
-
StrBufAppendBuf(Message, LineBuf, 0);
}
return Message;
}
-void DeleteAsyncMsg(ReadAsyncMsg **Msg)
-{
- if (*Msg == NULL)
- return;
- FreeStrBuf(&(*Msg)->MsgBuf);
-
- free(*Msg);
- *Msg = NULL;
-}
-ReadAsyncMsg *NewAsyncMsg(const char *terminator, /* token signalling EOT */
+/*
+ * Back end function used by CtdlMakeMessage() and similar functions
+ */
+char *CtdlReadMessageBody(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? */
StrBuf *exist, /* if non-null, append to it;
- exist is ALWAYS freed */
- long eLen, /* length of exist */
- int crlf /* CRLF newlines instead of LF */
- )
+ exist is ALWAYS freed */
+ int crlf /* CRLF newlines instead of LF */
+ )
{
- ReadAsyncMsg *NewMsg;
-
- NewMsg = (ReadAsyncMsg *)malloc(sizeof(ReadAsyncMsg));
- memset(NewMsg, 0, sizeof(ReadAsyncMsg));
-
- if (exist == NULL) {
- long len;
-
- if (expectlen == 0) {
- len = 4 * SIZ;
- }
- else {
- len = expectlen + 10;
- }
- NewMsg->MsgBuf = NewStrBufPlain(NULL, len);
- }
- else {
- NewMsg->MsgBuf = NewStrBufDup(exist);
- }
- /* Do we need to change leading ".." to "." for SMTP escaping? */
- if ((tlen == 1) && (*terminator == '.')) {
- NewMsg->dodot = 1;
- }
-
- NewMsg->terminator = terminator;
- NewMsg->tlen = tlen;
+ StrBuf *Message;
- NewMsg->maxlen = maxlen;
+ Message = CtdlReadMessageBodyBuf(terminator,
+ tlen,
+ maxlen,
+ exist,
+ crlf
+ );
+ if (Message == NULL)
+ return NULL;
+ else
+ return SmashStrBuf(&Message);
+}
- NewMsg->crlf = crlf;
+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);
- return NewMsg;
}
/*
- * Back end function used by CtdlMakeMessage() and similar functions
+ * 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 CM_Free() is called.)
*/
-eReadState CtdlReadMessageBodyAsync(AsyncIO *IO)
-{
- ReadAsyncMsg *ReadMsg;
- int MsgFinished = 0;
- eReadState Finished = eMustReadMore;
-
-#ifdef BIGBAD_IODBG
- char fn [SIZ];
- FILE *fd;
- const char *pch = ChrPtr(IO->SendBuf.Buf);
- const char *pchh = IO->SendBuf.ReadWritePointer;
- long nbytes;
-
- if (pchh == NULL)
- pchh = pch;
-
- nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch);
- snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d",
- ((CitContext*)(IO->CitContext))->ServiceName,
- IO->SendBuf.fd);
-
- fd = fopen(fn, "a+");
-#endif
- ReadMsg = IO->ReadMsg;
-
- /* read in the lines of message text one by one */
- do {
- Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf);
-
- switch (Finished) {
- case eMustReadMore: /// read new from socket...
-#ifdef BIGBAD_IODBG
- if (IO->RecvBuf.ReadWritePointer != NULL) {
- nbytes = StrLength(IO->RecvBuf.Buf) - (IO->RecvBuf.ReadWritePointer - ChrPtr(IO->RecvBuf.Buf));
- fprintf(fd, "Read; Line unfinished: %ld Bytes still in buffer [", nbytes);
-
- fwrite(IO->RecvBuf.ReadWritePointer, nbytes, 1, fd);
-
- fprintf(fd, "]\n");
- } else {
- fprintf(fd, "BufferEmpty! \n");
- }
- fclose(fd);
-#endif
- return Finished;
- break;
- case eBufferNotEmpty: /* shouldn't happen... */
- case eReadSuccess: /// done for now...
- break;
- case eReadFail: /// WHUT?
- ///todo: shut down!
- break;
- }
-
-
- if ((StrLength(IO->IOBuf) == ReadMsg->tlen) &&
- (!strcmp(ChrPtr(IO->IOBuf), ReadMsg->terminator))) {
- MsgFinished = 1;
-#ifdef BIGBAD_IODBG
- fprintf(fd, "found Terminator; Message Size: %d\n", StrLength(ReadMsg->MsgBuf));
-#endif
- }
- else if (!ReadMsg->flushing) {
-
-#ifdef BIGBAD_IODBG
- fprintf(fd, "Read Line: [%d][%s]\n", StrLength(IO->IOBuf), ChrPtr(IO->IOBuf));
-#endif
-
- /* Unescape SMTP-style input of two dots at the beginning of the line */
- if ((ReadMsg->dodot) &&
- (StrLength(IO->IOBuf) == 2) && /* TODO: do we just unescape lines with two dots or any line? */
- (!strcmp(ChrPtr(IO->IOBuf), "..")))
- {
-#ifdef BIGBAD_IODBG
- fprintf(fd, "UnEscaped!\n");
-#endif
- StrBufCutLeft(IO->IOBuf, 1);
- }
-
- if (ReadMsg->crlf) {
- StrBufAppendBufPlain(IO->IOBuf, HKEY("\r\n"), 0);
- }
- else {
- StrBufAppendBufPlain(IO->IOBuf, HKEY("\n"), 0);
- }
-
- StrBufAppendBuf(ReadMsg->MsgBuf, IO->IOBuf, 0);
- }
-
- /* if we've hit the max msg length, flush the rest */
- if (StrLength(ReadMsg->MsgBuf) >= ReadMsg->maxlen) ReadMsg->flushing = 1;
-
- } while (!MsgFinished);
-
-#ifdef BIGBAD_IODBG
- fprintf(fd, "Done with reading; %s.\n, ",
- (MsgFinished)?"Message Finished": "FAILED");
- fclose(fd);
-#endif
- if (MsgFinished)
- return eReadSuccess;
- else
- return eAbort;
-}
-
-
-/*
- * Back end function used by CtdlMakeMessage() and similar functions
- */
-char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */
- long tlen,
- size_t maxlen, /* maximum message length */
- 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 */
- )
-{
- StrBuf *Message;
-
- Message = CtdlReadMessageBodyBuf(terminator,
- tlen,
- maxlen,
- exist,
- crlf,
- sock);
- if (Message == NULL)
- return NULL;
- else
- return SmashStrBuf(&Message);
-}
-
-
-/*
- * 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.)
- */
-
-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 */
- ) {
- char dest_node[256];
- char buf[1024];
- struct CtdlMessage *msg;
- StrBuf *FakeAuthor;
- StrBuf *FakeEncAuthor = NULL;
+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 */
+ long textlen,
+ char *references, /* Thread references */
+ long reflen
+ )
+{
+ /* 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;
+ StrBuf *FakeEncAuthor = NULL;
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
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);
+ else if (!IsEmptyStr(author->fullname)) {
+ 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]);
- }
- else {
- msg->cm_fields[eOriginalRoom] = strdup(CC->room.QRname);
+ if (!!IsEmptyStr(CC->room.QRname)) {
+ if (CC->room.QRflags & QR_MAILBOX) { /* room */
+ CM_SetField(msg, eOriginalRoom, &CC->room.QRname[11], strlen(&CC->room.QRname[11]));
+ }
+ else {
+ CM_SetField(msg, eOriginalRoom, CC->room.QRname, strlen(CC->room.QRname));
+ }
}
- msg->cm_fields[eNodeName] = strdup(NODENAME); /* nodename */
- msg->cm_fields[eHumanNode] = strdup(HUMANNODE); /* hnodename */
-
- 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);
+ CM_SetField(msg, erFc822Addr, CC->cs_inet_email, strlen(CC->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);
- }
-
- }
- }
-
- if (supplied_euid != NULL) {
- msg->cm_fields[eExclusiveID] = strdup(supplied_euid);
- }
-
- if ((references != NULL) && (!IsEmptyStr(references))) {
- if (msg->cm_fields[eWeferences] != NULL)
- free(msg->cm_fields[eWeferences]);
- msg->cm_fields[eWeferences] = strdup(references);
- }
-
- if (preformatted_text != NULL) {
- msg->cm_fields[eMesageText] = preformatted_text;
- }
- else {
- msg->cm_fields[eMesageText] = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0);
- }
-
- return(msg);
-}
-
-/*
- * 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.
- */
-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) {
-
- return CtdlNetconfigCheckRoomaccess(errmsgbuf, n, RemoteIdentifier);
- }
- 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);
- }
-
- 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);
- }
-
- 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);
- }
-
- snprintf(errmsgbuf, n, "Higher access is required to post in this room.");
- return (ERROR + HIGHER_ACCESS_REQUIRED);
-
-}
-
-
-/*
- * 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);
-
- /* User flagged ok? */
- if (who->flags & US_INTERNET) return(2);
-
- /* Admin level access? */
- if (who->axlevel >= AxAideU) return(3);
-
- /* No mail for you! */
- return(0);
-}
-
-
-/*
- * 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; 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;
+ char *rfc2047Subj;
+ rfc2047Subj = rfc2047encode(subject, length);
+ CM_SetAsField(msg, eMsgSubject, &rfc2047Subj, strlen(rfc2047Subj));
+ }
- /* 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);
+ if (euidlen > 0) {
+ CM_SetField(msg, eExclusiveID, supplied_euid, euidlen);
}
- 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);
+ if (reflen > 0) {
+ CM_SetField(msg, eWeferences, references, reflen);
}
- 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 (preformatted_text != NULL) {
+ CM_SetField(msg, eMesageText, preformatted_text, textlen);
}
-
- 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[eExclusiveID] != NULL) {
- cprintf("%s\n", msg->cm_fields[eExclusiveID]);
- } else {
- cprintf("\n");
- }
- cprintf("000\n");
+ else {
+ StrBuf *MsgBody;
+ MsgBody = CtdlReadMessageBodyBuf(HKEY("000"), CtdlGetConfigLong("c_maxmsglen"), NULL, 0);
+ if (MsgBody != NULL) {
+ CM_SetAsFieldSB(msg, eMesageText, &MsgBody);
}
-
- CtdlFreeMessage(msg);
- }
- if (valid != NULL) {
- free_recipients(valid);
}
- return;
+
+ return(msg);
}
+
/*
* API function to delete messages which match a set of criteria
* (returns the actual number of messages deleted)
*/
-int CtdlDeleteMessages(char *room_name, /* which room */
+int CtdlDeleteMessages(const char *room_name, /* which room */
long *dmsgnums, /* array of msg numbers to be deleted */
int num_dmsgnums, /* number of msgs to be deleted, or 0 for "any" */
char *content_type /* or "" for any. regular expressions expected. */
)
{
- struct CitContext *CCC = CC;
struct ctdlroom qrbuf;
struct cdbdata *cdbfr;
long *msglist = NULL;
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);
+ syslog(LOG_DEBUG, "msgbase: CtdlDeleteMessages(%s, %d msgs, %s)", 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);
+ syslog(LOG_ERR, "msgbase: CtdlDeleteMessages(): Room <%s> not found", room_name);
if (need_to_free_re) regfree(&re);
- return (0); /* room not found */
+ return(0); /* room not found */
}
cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
StrBuf *dbg = NewStrBuf();
for (i = 0; i < num_dmsgnums; i++)
StrBufAppendPrintf(dbg, ", %ld", dmsgnums[i]);
- MSG_syslog(LOG_DEBUG, " Deleting before: %s", ChrPtr(dbg));
+ syslog(LOG_DEBUG, "msgbase: Deleting before: %s", ChrPtr(dbg));
FreeStrBuf(&dbg);
}
*/
StrBuf *dbg = NewStrBuf();
for (i = 0; i < num_deleted; i++)
StrBufAppendPrintf(dbg, ", %ld", dellist[i]);
- MSG_syslog(LOG_DEBUG, " Deleting: %s", ChrPtr(dbg));
+ syslog(LOG_DEBUG, "msgbase: Deleting: %s", ChrPtr(dbg));
FreeStrBuf(&dbg);
}
*/
/* 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);
+ syslog(LOG_DEBUG, "msgbase: %d message(s) deleted", 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; 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") );
-}
-
-
-
/*
* GetMetaData() - Get the supplementary record for a message
*/
void GetMetaData(struct MetaData *smibuf, long msgnum)
{
-
struct cdbdata *cdbsmi;
long TheIndex;
cdbsmi = cdb_fetch(CDB_MSGMAIN, &TheIndex, sizeof(long));
if (cdbsmi == NULL) {
- return; /* record not found; go with defaults */
+ return; /* record not found; leave it alone */
}
memcpy(smibuf, cdbsmi->ptr,
((cdbsmi->len > sizeof(struct MetaData)) ?
- sizeof(struct MetaData) : cdbsmi->len));
+ sizeof(struct MetaData) : cdbsmi->len)
+ );
cdb_free(cdbsmi);
return;
}
cdb_store(CDB_MSGMAIN,
&TheIndex, (int)sizeof(long),
- smibuf, (int)sizeof(struct MetaData));
-
+ smibuf, (int)sizeof(struct MetaData)
+ );
}
+
/*
- * AdjRefCount - submit an adjustment to the reference count for a message.
- * (These are just queued -- we actually process them later.)
+ * Convenience function to process a big block of AdjRefCount() operations
*/
-void AdjRefCount(long msgnum, int incr)
-{
- struct CitContext *CCC = CC;
- struct arcq new_arcq;
- int rv = 0;
-
- MSG_syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", msgnum, incr);
-
- begin_critical_section(S_SUPPMSGMAIN);
- if (arcfp == NULL) {
- arcfp = fopen(file_arcq, "ab+");
- chown(file_arcq, CTDLUID, (-1));
- chmod(file_arcq, 0600);
- }
- end_critical_section(S_SUPPMSGMAIN);
-
- /* msgnum < 0 means that we're trying to close the file */
- if (msgnum < 0) {
- MSGM_syslog(LOG_DEBUG, "Closing the AdjRefCount queue file\n");
- begin_critical_section(S_SUPPMSGMAIN);
- if (arcfp != NULL) {
- fclose(arcfp);
- arcfp = NULL;
- }
- end_critical_section(S_SUPPMSGMAIN);
- return;
- }
-
- /*
- * If we can't open the queue, perform the operation synchronously.
- */
- if (arcfp == NULL) {
- TDAP_AdjRefCount(msgnum, incr);
- return;
- }
-
- new_arcq.arcq_msgnum = msgnum;
- new_arcq.arcq_delta = incr;
- rv = fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp);
- if (rv == -1) {
- MSG_syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
- file_arcq,
- strerror(errno));
- }
- fflush(arcfp);
-
- return;
-}
-
void AdjRefCountList(long *msgnum, long nmsg, int incr)
{
- struct CitContext *CCC = CC;
- long i, the_size, offset;
- struct arcq *new_arcq;
- int rv = 0;
-
- MSG_syslog(LOG_DEBUG, "AdjRefCountList() msg %ld ref count delta %+d\n", nmsg, incr);
-
- begin_critical_section(S_SUPPMSGMAIN);
- if (arcfp == NULL) {
- arcfp = fopen(file_arcq, "ab+");
- chown(file_arcq, CTDLUID, (-1));
- chmod(file_arcq, 0600);
- }
- end_critical_section(S_SUPPMSGMAIN);
-
- /*
- * If we can't open the queue, perform the operation synchronously.
- */
- if (arcfp == NULL) {
- for (i = 0; i < nmsg; i++)
- TDAP_AdjRefCount(msgnum[i], incr);
- return;
- }
+ long i;
- the_size = sizeof(struct arcq) * nmsg;
- new_arcq = malloc(the_size);
for (i = 0; i < nmsg; i++) {
- new_arcq[i].arcq_msgnum = msgnum[i];
- new_arcq[i].arcq_delta = incr;
- }
- rv = 0;
- offset = 0;
- while ((rv >= 0) && (offset < the_size))
- {
- rv = fwrite(new_arcq + offset, 1, the_size - offset, arcfp);
- if (rv == -1) {
- MSG_syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
- file_arcq,
- strerror(errno));
- }
- else {
- offset += rv;
- }
+ AdjRefCount(msgnum[i], incr);
}
- free(new_arcq);
- fflush(arcfp);
-
- return;
-}
-
-
-/*
- * TDAP_ProcessAdjRefCountQueue()
- *
- * Process the queue of message count adjustments that was created by calls
- * to AdjRefCount() ... by reading the queue and calling TDAP_AdjRefCount()
- * for each one. This should be an "off hours" operation.
- */
-int TDAP_ProcessAdjRefCountQueue(void)
-{
- struct CitContext *CCC = CC;
- char file_arcq_temp[PATH_MAX];
- int r;
- FILE *fp;
- struct arcq arcq_rec;
- int num_records_processed = 0;
-
- snprintf(file_arcq_temp, sizeof file_arcq_temp, "%s.%04x", file_arcq, rand());
-
- begin_critical_section(S_SUPPMSGMAIN);
- if (arcfp != NULL) {
- fclose(arcfp);
- arcfp = NULL;
- }
-
- r = link(file_arcq, file_arcq_temp);
- if (r != 0) {
- MSG_syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
- end_critical_section(S_SUPPMSGMAIN);
- return(num_records_processed);
- }
-
- unlink(file_arcq);
- end_critical_section(S_SUPPMSGMAIN);
-
- fp = fopen(file_arcq_temp, "rb");
- if (fp == NULL) {
- MSG_syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
- return(num_records_processed);
- }
-
- while (fread(&arcq_rec, sizeof(struct arcq), 1, fp) == 1) {
- TDAP_AdjRefCount(arcq_rec.arcq_msgnum, arcq_rec.arcq_delta);
- ++num_records_processed;
- }
-
- fclose(fp);
- r = unlink(file_arcq_temp);
- if (r != 0) {
- MSG_syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
- }
-
- return(num_records_processed);
}
-
/*
- * TDAP_AdjRefCount - adjust the reference count for a message.
- * This one does it "for real" because it's called by
- * the autopurger function that processes the queue
- * created by AdjRefCount(). If a message's reference
- * count becomes zero, we also delete the message from
- * disk and de-index it.
+ * AdjRefCount - adjust the reference count for a message. We need to delete from disk any message whose reference count reaches zero.
*/
-void TDAP_AdjRefCount(long msgnum, int incr)
+void AdjRefCount(long msgnum, int incr)
{
- struct CitContext *CCC = CC;
-
struct MetaData smi;
long delnum;
smi.meta_refcount += incr;
PutMetaData(&smi);
end_critical_section(S_SUPPMSGMAIN);
- MSG_syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n",
- msgnum, incr, smi.meta_refcount
- );
+ syslog(LOG_DEBUG, "msgbase: AdjRefCount() msg %ld ref count delta %+d, is now %d", msgnum, incr, smi.meta_refcount);
- /* If the reference count is now zero, delete the message
- * (and its supplementary record as well).
+ /* If the reference count is now zero, delete both the message and its metadata record.
*/
if (smi.meta_refcount == 0) {
- MSG_syslog(LOG_DEBUG, "Deleting message <%ld>\n", msgnum);
+ syslog(LOG_DEBUG, "msgbase: deleting message <%ld>", msgnum);
/* Call delete hooks with NULL room to show it has gone altogether */
PerformDeleteHooks(NULL, msgnum);
delnum = (0L - msgnum);
cdb_delete(CDB_MSGMAIN, &delnum, (int)sizeof(long));
}
-
}
+
/*
* Write a generic object to this room
*
*/
void CtdlWriteObject(char *req_room, /* Room to stuff it in */
char *content_type, /* MIME type of this object */
- char *raw_message, /* Data to be written */
- off_t raw_length, /* Size of raw_message */
+ char *raw_message, /* Data to be written */
+ off_t raw_length, /* Size of raw_message */
struct ctdluser *is_mailbox, /* Mailbox room? */
int is_binary, /* Is encoding necessary? */
int is_unique, /* Del others of this type? */
- unsigned int flags /* Internal save flags */
+ unsigned int flags /* Internal save flags */
)
{
- struct CitContext *CCC = CC;
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);
safestrncpy(roomname, req_room, sizeof(roomname));
}
- MSG_syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length);
+ syslog(LOG_DEBUG, "msfbase: raw length is %ld", (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");
+ syslog(LOG_DEBUG, "msgbase: allocating");
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
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, CC->user.fullname, strlen(CC->user.fullname));
+ CM_SetField(msg, eOriginalRoom, req_room, strlen(req_room));
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) {
- CtdlCreateRoom(roomname,
- ( (is_mailbox != NULL) ? 5 : 3 ),
- "", 0, 1, 0, VIEW_BBS);
+ CtdlCreateRoom(roomname, ( (is_mailbox != NULL) ? 5 : 3 ), "", 0, 1, 0, VIEW_BBS);
}
/* If the caller specified this object as unique, delete all
* other objects of this type that are currently in the room.
*/
if (is_unique) {
- MSG_syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n",
+ syslog(LOG_DEBUG, "msgbase: deleted %d other msgs of this type",
CtdlDeleteMessages(roomname, NULL, 0, content_type)
);
}
/* Now write the data */
CtdlSubmitMsg(msg, NULL, roomname, 0);
- CtdlFreeMessage(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[eMesageText]);
- 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; i<recp->num_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);
+ CM_Free(msg);
}
-/*
- * 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 */
+/************************************************************************/
-/*****************************************************************************/
-/* MODULE INITIALIZATION STUFF */
-/*****************************************************************************/
-void SetMessageDebugEnabled(const int n)
-{
- MessageDebugEnabled = n;
-}
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 */
+ FillMsgKeyLookupTable();
+ }
+
+ /* return our module id for the log */
return "msgbase";
}
projects / citadel.git / blobdiff