#include <sys/stat.h>
#include <sys/types.h>
#include <regex.h>
+
+#include "md5.h"
+
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
/* 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",
- NULL, NULL, NULL,
- "exti",
- "rfca",
- NULL,
- "hnod",
- "msgn",
- "jrnl",
- NULL,
- "list",
- "text",
- "node",
- "room",
- "path",
- NULL,
- "rcpt",
- "spec",
- "time",
- "subj",
- NULL,
- "wefw",
- NULL,
- "cccc",
- NULL
+ "from", /* A */
+ NULL, /* B */
+ NULL, /* C */
+ NULL, /* D */
+ "exti", /* E */
+ "rfca", /* F */
+ NULL, /* G */
+ "hnod", /* H */
+ "msgn", /* I */
+ "jrnl", /* J */
+ "rep2", /* K */
+ "list", /* L */
+ "text", /* M */
+ "node", /* N */
+ "room", /* O */
+ "path", /* P */
+ NULL, /* Q */
+ "rcpt", /* R */
+ "spec", /* S */
+ "time", /* T */
+ "subj", /* U */
+ "nvto", /* V */
+ "wefw", /* W */
+ NULL, /* X */
+ "cccc", /* Y */
+ NULL /* Z */
};
+void CtdlMsgSetCM_Fields(struct CtdlMessage *Msg, const char 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';
+}
+
/*
* This function is self explanatory.
* (What can I say, I'm in a weird mood today...)
*/
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];
}
if (strcasecmp(original_name, name)) {
- syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name);
+ MSG_syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name);
}
/* Change "user @ xxx" to "user" if xxx is an alias for this host */
if (name[a] == '@') {
if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
name[a] = 0;
- syslog(LOG_INFO, "Changed to <%s>\n", name);
+ MSG_syslog(LOG_INFO, "Changed to <%s>\n", name);
}
}
}
* 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, &CC->user, &CC->room);
+ CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
if (which_set == ctdlsetseen_seen)
safestrncpy(buf, vbuf.v_seen, SIZ);
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);
+ long hi = (-1L); /// TODO: we just write here. y?
visit vbuf;
long *msglist;
int num_msgs = 0;
/* If no room was specified, we go with the current room. */
if (!which_room) {
- which_room = &CC->room;
+ which_room = &CCC->room;
}
/* If no user was specified, we go with the current user. */
if (!which_user) {
- which_user = &CC->user;
+ which_user = &CCC->user;
}
- syslog(LOG_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n",
- num_target_msgnums, target_msgnums[0],
- (target_setting ? "SET" : "CLEAR"),
- which_set,
- which_room->QRname);
+ MSG_syslog(LOG_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n",
+ num_target_msgnums, target_msgnums[0],
+ (target_setting ? "SET" : "CLEAR"),
+ which_set,
+ which_room->QRname);
/* Learn about the user and room in question */
CtdlGetRelationship(&vbuf, which_user, which_room);
#if 0 /* This is a special diagnostic section. Do not allow it to run during normal operation. */
- syslog(LOG_DEBUG, "There are %d messages in the room.\n", num_msgs);
+ MSG_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();
}
- syslog(LOG_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums);
+ MSG_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
- syslog(LOG_DEBUG, "before update: %s\n", ChrPtr(vset));
+ MSG_syslog(LOG_DEBUG, "before update: %s\n", ChrPtr(vset));
/* Translate the existing sequence set into an array of booleans */
setstr = NewStrBuf();
vset = new_set;
}
- syslog(LOG_DEBUG, " after update: %s\n", ChrPtr(vset));
+ MSG_syslog(LOG_DEBUG, " after update: %s\n", ChrPtr(vset));
/* Decide which message set we're manipulating */
switch (which_set) {
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(&CC->user, CC->curr_user);
+ CtdlGetUser(&CCC->user, CCC->curr_user);
if (server_shutting_down) {
if (need_to_free_re) regfree(&re);
return -1;
}
- CtdlGetRelationship(&vbuf, &CC->user, &CC->room);
+ CtdlGetRelationship(&vbuf, &CCC->user, &CCC->room);
if (server_shutting_down) {
if (need_to_free_re) regfree(&re);
}
/* Load the message list */
- cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CCC->room.QRnumber, sizeof(long));
if (cdbfr == NULL) {
if (need_to_free_re) regfree(&re);
return 0; /* No messages at all? No further action. */
|| ((mode == MSGS_EQ) && (thismsg == ref))
)
) {
- if ((mode == MSGS_NEW) && (CC->user.flags & US_LASTOLD) && (lastold > 0L) && (printed_lastold == 0) && (!is_seen)) {
+ if ((mode == MSGS_NEW) && (CCC->user.flags & US_LASTOLD) && (lastold > 0L) && (printed_lastold == 0) && (!is_seen)) {
if (CallBack)
CallBack(lastold, userdata);
printed_lastold = 1;
/*
* We cache the most recent msglist in order to do security checks later
*/
- if (CC->client_socket > 0) {
- if (CC->cached_msglist != NULL) {
- free(CC->cached_msglist);
+ if (CCC->client_socket > 0) {
+ if (CCC->cached_msglist != NULL) {
+ free(CCC->cached_msglist);
}
- CC->cached_msglist = msglist;
- CC->cached_num_msgs = num_msgs;
+ CCC->cached_msglist = msglist;
+ CCC->cached_num_msgs = num_msgs;
}
else {
free(msglist);
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];
if (ch == '\n') {
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
len = 0;
if (client_write(nl, nllen) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
column = 0;
if (column > 72) { /* Beyond 72 columns, break on the next space */
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
len = 0;
if (client_write(nl, nllen) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
column = 0;
if (column > 1000) { /* Beyond 1000 columns, break anywhere */
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
len = 0;
if (client_write(nl, nllen) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
column = 0;
if (len) {
if (client_write(outbuf, len) == -1)
{
- syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n");
return;
}
len = 0;
) {
CCC->download_fp = tmpfile();
if (CCC->download_fp == NULL) {
- syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
- strerror(errno));
+ 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));
return;
}
- rv = fwrite(content, length, 1, CC->download_fp);
+ rv = fwrite(content, length, 1, CCC->download_fp);
if (rv <= 0) {
- syslog(LOG_EMERG, "mime_download(): Couldn't write: %s\n",
- strerror(errno));
+ 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);
*/
struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body)
{
+ struct CitContext *CCC = CC;
struct cdbdata *dmsgtext;
struct CtdlMessage *ret = NULL;
char *mptr;
cit_uint8_t ch;
cit_uint8_t field_header;
- syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
+ MSG_syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body);
dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
if (dmsgtext == NULL) {
return NULL;
*/
ch = *mptr++;
if (ch != 255) {
- syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum);
+ MSG_syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum);
cdb_free(dmsgtext);
return NULL;
}
if (msg == NULL)
return 0;
if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) {
- syslog(LOG_WARNING, "is_valid_message() -- self-check failed\n");
+ struct CitContext *CCC = CC;
+ MSGM_syslog(LOG_WARNING, "is_valid_message() -- self-check failed\n");
return 0;
}
return 1;
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;
+}
+
+struct CtdlMessage * CtdlDuplicateMessage(struct CtdlMessage *OrgMsg)
+{
+ int i;
+ struct CtdlMessage *NewMsg;
+
+ if (is_valid_message(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 (!DupCMField(i, OrgMsg, NewMsg))
+ {
+ CtdlFreeMessage(NewMsg);
+ return NULL;
+ }
+ }
+ }
+
+ return NewMsg;
+}
+
+
/*
* Pre 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;
- syslog(LOG_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype);
+ MSG_syslog(LOG_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype);
if (!strcasecmp(cbtype, "multipart/alternative")) {
++ma->is_ma;
ma->did_print = 0;
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;
- syslog(LOG_DEBUG, "fixed_output_post() type=<%s>\n", cbtype);
+ MSG_syslog(LOG_DEBUG, "fixed_output_post() type=<%s>\n", cbtype);
if (!strcasecmp(cbtype, "multipart/alternative")) {
--ma->is_ma;
ma->did_print = 0;
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;
- syslog(LOG_DEBUG,
+ MSG_syslog(LOG_DEBUG,
"fixed_output() part %s: %s (%s) (%ld bytes)\n",
partnum, filename, cbtype, (long)length);
* we've already printed another section, skip this one.
*/
if ( (ma->is_ma) && (ma->did_print) ) {
- syslog(LOG_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype);
+ MSG_syslog(LOG_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype);
return;
}
ma->did_print = 1;
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;
// 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(CC->preferred_formats, '|'); ++i) {
- extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
+ for (i=0; i<num_tokens(CCC->preferred_formats, '|'); ++i) {
+ extract_token(buf, CCC->preferred_formats, i, '|', sizeof buf);
if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) {
if (i < ma->chosen_pref) {
- syslog(LOG_DEBUG, "Setting chosen part: <%s>\n", partnum);
+ MSG_syslog(LOG_DEBUG, "Setting chosen part: <%s>\n", partnum);
safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part);
ma->chosen_pref = i;
}
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(CC->preferred_formats, '|'); ++i) {
- extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
+ for (i=0; i<num_tokens(CCC->preferred_formats, '|'); ++i) {
+ extract_token(buf, CCC->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)
{
- syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n");
+ MSGM_syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n");
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 (!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 */
+ 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 */
/* Do a binary search within the cached_msglist for the requested msgnum */
while (max >= min) {
int middle = min + (max-min) / 2 ;
- if (msgnum == CC->cached_msglist[middle]) {
+ if (msgnum == CCC->cached_msglist[middle]) {
return om_ok;
}
if (msgnum > CC->cached_msglist[middle]) {
int do_proto, /* do Citadel protocol responses? */
int crlf, /* Use CRLF newlines instead of LF? */
char *section, /* NULL or a message/rfc822 section */
- int flags /* various flags; see msgbase.h */
+ int flags, /* various flags; see msgbase.h */
+ char **Author,
+ char **Address
) {
+ struct CitContext *CCC = CC;
struct CtdlMessage *TheMessage = NULL;
- int retcode = om_no_such_msg;
+ int retcode = CIT_OK;
struct encapmsg encap;
int r;
- syslog(LOG_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n",
+ MSG_syslog(LOG_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n",
msg_num, mode,
(section ? section : "<>")
);
r = check_cached_msglist(msg_num);
}
if (r != om_ok) {
- syslog(LOG_DEBUG, "Security check fail: message %ld is not in %s\n",
- msg_num, CC->room.QRname
+ MSG_syslog(LOG_DEBUG, "Security check fail: message %ld is not in %s\n",
+ msg_num, CCC->room.QRname
);
if (do_proto) {
if (r == om_access_denied) {
*extract_encapsulated_message,
NULL, NULL, (void *)&encap, 0
);
+
+ if ((Author != NULL) && (*Author == NULL))
+ {
+ *Author = TheMessage->cm_fields['A'];
+ TheMessage->cm_fields['A'] = NULL;
+ }
+ if ((Address != NULL) && (*Address == NULL))
+ {
+ *Address = TheMessage->cm_fields['F'];
+ TheMessage->cm_fields['F'] = NULL;
+ }
CtdlFreeMessage(TheMessage);
TheMessage = NULL;
}
else {
- if (do_proto) cprintf("%d msg %ld has no part %s\n",
- ERROR + MESSAGE_NOT_FOUND, msg_num, section);
+ if (do_proto) {
+ cprintf("%d msg %ld has no part %s\n",
+ ERROR + MESSAGE_NOT_FOUND,
+ msg_num,
+ section);
+ }
retcode = om_no_such_msg;
}
}
/* Ok, output the message now */
- retcode = CtdlOutputPreLoadedMsg(TheMessage, mode, headers_only, do_proto, crlf, flags);
+ if (retcode == CIT_OK)
+ retcode = CtdlOutputPreLoadedMsg(TheMessage, mode, headers_only, do_proto, crlf, flags);
+ if ((Author != NULL) && (*Author == NULL))
+ {
+ *Author = TheMessage->cm_fields['A'];
+ TheMessage->cm_fields['A'] = NULL;
+ }
+ if ((Address != NULL) && (*Address == NULL))
+ {
+ *Address = TheMessage->cm_fields['F'];
+ TheMessage->cm_fields['F'] = NULL;
+ }
+
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;
if (source == NULL) return source;
if (IsEmptyStr(source)) return source;
- cit_backtrace();
- syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", 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);
if (outlen > 1000) {
if (client_write(outbuf, outlen) == -1)
{
- syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n");
+ struct CitContext *CCC = CC;
+ MSGM_syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n");
return;
}
outlen = 0;
}
if (outlen > 0) {
client_write(outbuf, outlen);
- outlen = 0;
}
}
if (client_write(buf, buflen) == -1)
{
- syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n");
+ struct CitContext *CCC = CC;
+ MSGM_syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n");
return;
}
*buf = '\0';
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 */
char snode[100];
char mid[100];
- syslog(LOG_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n",
- ((TheMessage == NULL) ? "NULL" : "not null"),
- mode, headers_only, do_proto, crlf);
+ MSG_syslog(LOG_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n",
+ ((TheMessage == NULL) ? "NULL" : "not null"),
+ mode, headers_only, do_proto, crlf);
strcpy(mid, "unknown");
nl = (crlf ? "\r\n" : "\n");
if (!is_valid_message(TheMessage)) {
- syslog(LOG_ERR,
- "ERROR: invalid preloaded message for output\n");
+ MSGM_syslog(LOG_ERR,
+ "ERROR: invalid preloaded message for output\n");
cit_backtrace ();
return(om_no_such_msg);
}
if (do_proto)
cprintf("%d This is not a MIME message.\n",
ERROR + ILLEGAL_VALUE);
- } else if (CC->download_fp != NULL) {
+ } else if (CCC->download_fp != NULL) {
if (do_proto) cprintf(
"%d You already have a download open.\n",
ERROR + RESOURCE_BUSY);
/* If there's no file open by this time, the requested
* section wasn't found, so print an error
*/
- if (CC->download_fp == NULL) {
+ if (CCC->download_fp == NULL) {
if (do_proto) cprintf(
"%d Section %s not found.\n",
ERROR + FILE_NOT_FOUND,
- CC->download_desired_section);
+ CCC->download_desired_section);
}
}
- return((CC->download_fp != NULL) ? om_ok : om_mime_error);
+ return((CCC->download_fp != NULL) ? om_ok : om_mime_error);
}
/* MT_SPEW_SECTION is like MT_DOWNLOAD except it outputs the whole MIME part
if (do_proto) cprintf(
"%d Section %s not found.\n",
ERROR + FILE_NOT_FOUND,
- CC->download_desired_section);
+ CCC->download_desired_section);
}
}
- return((CC->download_fp != NULL) ? om_ok : om_mime_error);
+ return((CCC->download_fp != NULL) ? om_ok : om_mime_error);
}
/* now for the user-mode message reading loops */
ma.use_fo_hooks = 0;
strcpy(ma.chosen_part, "1");
ma.chosen_pref = 9999;
- ma.dont_decode = CC->msg4_dont_decode;
+ ma.dont_decode = CCC->msg4_dont_decode;
mime_parser(mptr, NULL,
*choose_preferred, *fixed_output_pre,
*fixed_output_post, (void *)&ma, 1);
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0, NULL, 0);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0, NULL, 0, NULL, NULL);
return;
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL, 0);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL, 0, NULL, NULL);
}
msgid = extract_long(cmdbuf, 0);
extract_token(section, cmdbuf, 1, '|', sizeof section);
- CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0, (section[0] ? section : NULL) , 0);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0, (section[0] ? section : NULL) , 0, NULL, NULL);
}
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);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1, NULL, 0, NULL, NULL);
}
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);
-}
+ CtdlOutputMsg(msgid, MT_SPEW_SECTION, 0, 1, 1, NULL, 0, NULL, NULL);
+}
/*
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;
long *msgs_to_be_merged = NULL;
int num_msgs_to_be_merged = 0;
- syslog(LOG_DEBUG,
- "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n",
- roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
+ 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, CC->room.QRname);
+ strcpy(hold_rm, CCC->room.QRname);
/* Sanity checks */
if (newmsgidlist == NULL) return(ERROR + INTERNAL_ERROR);
if (num_newmsgs > 1) supplied_msg = NULL;
/* Now the regular stuff */
- if (CtdlGetRoomLock(&CC->room,
- ((roomname != NULL) ? roomname : CC->room.QRname) )
+ if (CtdlGetRoomLock(&CCC->room,
+ ((roomname != NULL) ? roomname : CCC->room.QRname) )
!= 0) {
- syslog(LOG_ERR, "No such room <%s>\n", roomname);
+ MSG_syslog(LOG_ERR, "No such room <%s>\n", roomname);
return(ERROR + ROOM_NOT_FOUND);
}
num_msgs_to_be_merged = 0;
- cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CCC->room.QRnumber, sizeof(long));
if (cdbfr == NULL) {
msglist = NULL;
num_msgs = 0;
}
}
- syslog(LOG_DEBUG, "%d unique messages to be merged\n", num_msgs_to_be_merged);
+ MSG_syslog(LOG_DEBUG, "%d unique messages to be merged\n", 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) {
- syslog(LOG_ALERT, "ERROR: can't realloc message list!\n");
+ MSGM_syslog(LOG_ALERT, "ERROR: can't realloc message list!\n");
+ free(msgs_to_be_merged);
+ return (ERROR + INTERNAL_ERROR);
}
memcpy(&msglist[num_msgs], msgs_to_be_merged, (sizeof(long) * num_msgs_to_be_merged) );
num_msgs += num_msgs_to_be_merged;
highest_msg = msglist[num_msgs - 1];
/* Write it back to disk. */
- cdb_store(CDB_MSGLISTS, &CC->room.QRnumber, (int)sizeof(long),
+ cdb_store(CDB_MSGLISTS, &CCC->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. */
- CC->room.QRhighest = highest_msg;
- CtdlPutRoomLock(&CC->room);
+ CCC->room.QRhighest = highest_msg;
+ CtdlPutRoomLock(&CCC->room);
/* Perform replication checks if necessary */
- if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) {
- syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n");
+ if ( (DoesThisRoomNeedEuidIndexing(&CCC->room)) && (do_repl_check) ) {
+ MSGM_syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n");
for (i=0; i<num_msgs_to_be_merged; ++i) {
msgid = msgs_to_be_merged[i];
/* If the message has an Exclusive ID, index that... */
if (msg->cm_fields['E'] != NULL) {
- index_message_by_euid(msg->cm_fields['E'], &CC->room, msgid);
+ index_message_by_euid(msg->cm_fields['E'], &CCC->room, msgid);
}
/* Free up the memory we may have allocated */
}
else {
- syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n");
+ MSGM_syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() skips repl checks\n");
}
/* Submit this room for processing by hooks */
- PerformRoomHooks(&CC->room);
+ PerformRoomHooks(&CCC->room);
/* Go back to the room we were in before we wandered here... */
- CtdlGetRoom(&CC->room, hold_rm);
+ CtdlGetRoom(&CCC->room, hold_rm);
/* Bump the reference count for all messages which were merged */
if (!suppress_refcount_adj) {
*
*/
long send_message(struct CtdlMessage *msg) {
+ struct CitContext *CCC = CC;
long newmsgid;
long retval;
char msgidbuf[256];
/* Write our little bundle of joy into the message base */
if (cdb_store(CDB_MSGMAIN, &newmsgid, (int)sizeof(long),
smr.ser, smr.len) < 0) {
- syslog(LOG_ERR, "Can't store message\n");
+ MSGM_syslog(LOG_ERR, "Can't store message\n");
retval = 0L;
} else {
if (is_bigmsg) {
void serialize_message(struct ser_ret *ret, /* return values */
struct CtdlMessage *msg) /* unserialized msg */
{
+ struct CitContext *CCC = CC;
size_t wlen, fieldlen;
int i;
static char *forder = FORDER;
* Check for valid message format
*/
if (is_valid_message(msg) == 0) {
- syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n");
+ MSGM_syslog(LOG_ERR, "serialize_message() aborting due to invalid message\n");
ret->len = 0;
ret->ser = NULL;
return;
ret->ser = malloc(ret->len);
if (ret->ser == NULL) {
- syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n",
- (long)ret->len, strerror(errno));
+ MSG_syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n",
+ (long)ret->len, strerror(errno));
ret->len = 0;
ret->ser = NULL;
return;
safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1);
wlen = wlen + fieldlen + 1;
}
- if (ret->len != wlen) syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n",
- (long)ret->len, (long)wlen);
-
- return;
-}
-
-
-/*
- * Serialize a struct CtdlMessage into the format used on disk and network.
- *
- * This function loads up a "struct ser_ret" (defined in server.h) which
- * 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 dump_message(struct CtdlMessage *msg, /* unserialized msg */
- long Siz) /* how many chars ? */
-{
- int i;
- static char *forder = FORDER;
- char *buf;
-
- /*
- * Check for valid message format
- */
- if (is_valid_message(msg) == 0) {
- syslog(LOG_ERR, "dump_message() aborting due to invalid message\n");
- return;
+ if (ret->len != wlen) {
+ MSG_syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n",
+ (long)ret->len, (long)wlen);
}
- buf = (char*) malloc (Siz + 1);
-
- for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
- snprintf (buf, Siz, " msg[%c] = %s ...\n", (char) forder[i],
- msg->cm_fields[(int)forder[i]]);
- if (client_write (buf, strlen(buf)) == -1)
- {
- syslog(LOG_ERR, "dump_message(): aborting due to write failure.\n");
- return;
- }
- }
-
return;
}
-
/*
* Check to see if any messages already exist in the current room which
* carry the same Exclusive ID as this one. If any are found, delete them.
*/
void ReplicationChecks(struct CtdlMessage *msg) {
+ struct CitContext *CCC = CC;
long old_msgnum = (-1L);
- if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
+ if (DoesThisRoomNeedEuidIndexing(&CCC->room) == 0) return;
- syslog(LOG_DEBUG, "Performing replication checks in <%s>\n",
- CC->room.QRname);
+ MSG_syslog(LOG_DEBUG, "Performing replication checks in <%s>\n",
+ CCC->room.QRname);
/* No exclusive id? Don't do anything. */
if (msg == NULL) return;
if (msg->cm_fields['E'] == NULL) return;
if (IsEmptyStr(msg->cm_fields['E'])) return;
- /*syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
- msg->cm_fields['E'], CC->room.QRname);*/
+ /*MSG_syslog(LOG_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
+ msg->cm_fields['E'], CCC->room.QRname);*/
- old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CC->room);
+ old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CCC->room);
if (old_msgnum > 0L) {
- syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum);
- CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, "");
+ MSG_syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum);
+ CtdlDeleteMessages(CCC->room.QRname, &old_msgnum, 1, "");
}
}
char force_room[ROOMNAMELEN];
char content_type[SIZ]; /* We have to learn this */
char recipient[SIZ];
+ const char *room;
long newmsgid;
const char *mptr = NULL;
struct ctdluser userbuf;
char bounce_to[1024] = "";
int rv = 0;
- syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n");
+ MSGM_syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n");
if (is_valid_message(msg) == 0) return(-1); /* self check */
/* If this message has no timestamp, we take the liberty of
/* Learn about what's inside, because it's what's inside that counts */
if (msg->cm_fields['M'] == NULL) {
- syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n");
+ MSGM_syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n");
return(-2);
}
}
/* Goto the correct room */
- syslog(LOG_DEBUG, "Selected room %s\n", (recps) ? CCC->room.QRname : SENTITEMS);
+ 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);
if (recps != NULL) {
if (CCC->user.axlevel == AxProbU) {
strcpy(hold_rm, actual_rm);
strcpy(actual_rm, config.c_twitroom);
- syslog(LOG_DEBUG, "Diverting to twit room\n");
+ MSGM_syslog(LOG_DEBUG, "Diverting to twit room\n");
}
}
strcpy(actual_rm, force_room);
}
- syslog(LOG_DEBUG, "Final selection: %s\n", actual_rm);
+ 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);
}
/* Perform "before save" hooks (aborting if any return nonzero) */
- syslog(LOG_DEBUG, "Performing before-save hooks\n");
+ MSGM_syslog(LOG_DEBUG, "Performing before-save hooks\n");
if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3);
/*
}
/* Save it to disk */
- syslog(LOG_DEBUG, "Saving to disk\n");
+ MSGM_syslog(LOG_DEBUG, "Saving to disk\n");
newmsgid = send_message(msg);
if (newmsgid <= 0L) return(-5);
* be a critical section because nobody else knows about this message
* yet.
*/
- syslog(LOG_DEBUG, "Creating MetaData record\n");
+ MSGM_syslog(LOG_DEBUG, "Creating MetaData record\n");
memset(&smi, 0, sizeof(struct MetaData));
smi.meta_msgnum = newmsgid;
smi.meta_refcount = 0;
* message to attach to the journalized copy.
*/
if (CCC->redirect_buffer != NULL) {
- syslog(LOG_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n");
+ MSGM_syslog(LOG_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n");
abort();
}
CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ);
PutMetaData(&smi);
/* Now figure out where to store the pointers */
- syslog(LOG_DEBUG, "Storing pointers\n");
+ MSGM_syslog(LOG_DEBUG, "Storing pointers\n");
/* If this is being done by the networker delivering a private
* message, we want to BYPASS saving the sender's copy (because there
*/
if ((!CCC->internal_pgm) || (recps == NULL)) {
if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) {
- syslog(LOG_ERR, "ERROR saving message pointer!\n");
+ MSGM_syslog(LOG_ERR, "ERROR saving message pointer!\n");
CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
extract_token(recipient, recps->recp_room, i,
'|', sizeof recipient);
- syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient);///// xxxx
+ MSG_syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient);///// xxxx
CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg);
}
/* Bump this user's messages posted counter. */
- syslog(LOG_DEBUG, "Updating user\n");
+ MSGM_syslog(LOG_DEBUG, "Updating user\n");
CtdlGetUserLock(&CCC->user, CCC->curr_user);
CCC->user.posted = CCC->user.posted + 1;
CtdlPutUserLock(&CCC->user);
for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
extract_token(recipient, recps->recp_local, i,
'|', sizeof recipient);
- syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n",
+ MSG_syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n",
recipient);
if (CtdlGetUser(&userbuf, recipient) == 0) {
CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM);
}
}
else {
- syslog(LOG_DEBUG, "No user <%s>\n", recipient);
+ MSG_syslog(LOG_DEBUG, "No user <%s>\n", recipient);
CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
}
}
/* Perform "after save" hooks */
- syslog(LOG_DEBUG, "Performing after-save hooks\n");
+ MSGM_syslog(LOG_DEBUG, "Performing after-save hooks\n");
if (msg->cm_fields['3'] != NULL) free(msg->cm_fields['3']);
msg->cm_fields['3'] = malloc(20);
snprintf(msg->cm_fields['3'], 20, "%ld", newmsgid);
if (network_fp != NULL) {
rv = fwrite(smr.ser, smr.len, 1, network_fp);
if (rv == -1) {
- syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n",
- strerror(errno));
+ MSG_syslog(LOG_EMERG, "CtdlSubmitMsg(): Couldn't write network spool file: %s\n",
+ strerror(errno));
}
fclose(network_fp);
}
}
/* Go back to the room we started from */
- syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm);
+ 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);
StrBuf *SpoolMsg = NewStrBuf();
long nTokens;
- syslog(LOG_DEBUG, "Generating delivery instructions\n");
+ MSGM_syslog(LOG_DEBUG, "Generating delivery instructions\n");
StrBufPrintf(SpoolMsg,
"Content-type: "SPOOLMIME"\n"
}
-
-void aide_message (char *text, char *subject)
-{
- quickie_message("Citadel",NULL,NULL,AIDEROOM,text,FMT_CITADEL,subject);
-}
-
-
/*
* Convenience function for generating small administrative messages.
*/
-void quickie_message(const char *from, const char *fromaddr, char *to, char *room, const char *text,
- int format_type, const char *subject)
+void quickie_message(const char *from,
+ const char *fromaddr,
+ const char *to,
+ char *room,
+ const char *text,
+ int format_type,
+ const char *subject)
{
struct CtdlMessage *msg;
struct recptypes *recp = NULL;
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)
+{
+ int i;
+ struct UseTable ut;
+ u_char rawdigest[MD5_DIGEST_LEN];
+ struct MD5Context md5context;
+ StrBuf *guid;
+ struct cdbdata *cdbut;
+ char timestamp[64];
+ long tslen;
+ time_t ts = time(NULL);
+ time_t tsday = ts / (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);
+ /* Find out if we've already sent a similar message */
+ memcpy(ut.ut_msgid, SKEY(guid));
+ ut.ut_timestamp = ts;
+
+ cdbut = cdb_fetch(CDB_USETABLE, SKEY(guid));
+
+ if (cdbut != NULL) {
+ /* yes, we did. flood protection kicks in. */
+ syslog(LOG_DEBUG,
+ "not sending message again\n");
+ cdb_free(cdbut);
+ }
+
+ /* rewrite the record anyway, to update the timestamp */
+ cdb_store(CDB_USETABLE,
+ SKEY(guid),
+ &ut, sizeof(struct UseTable) );
+
+ FreeStrBuf(&guid);
+
+ if (cdbut != NULL) return;
+ /* no, this message isn't sent recently; go ahead. */
+ quickie_message(from,
+ fromaddr,
+ to,
+ room,
+ text,
+ format_type,
+ subject);
+}
/*
StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */
long tlen,
size_t maxlen, /* maximum message length */
- char *exist, /* if non-null, append to it;
+ StrBuf *exist, /* if non-null, append to it;
exist is ALWAYS freed */
int crlf, /* CRLF newlines instead of LF */
int *sock /* socket handle or 0 for this session's client socket */
Message = NewStrBufPlain(NULL, 4 * SIZ);
}
else {
- Message = NewStrBufPlain(exist, -1);
- free(exist);
+ Message = NewStrBufDup(exist);
}
/* Do we need to change leading ".." to "." for SMTP escaping? */
long tlen,
size_t maxlen, /* maximum message length */
size_t expectlen, /* if we expect a message, how long should it be? */
- char *exist, /* if non-null, append to it;
+ StrBuf *exist, /* if non-null, append to it;
exist is ALWAYS freed */
long eLen, /* length of exist */
int crlf /* CRLF newlines instead of LF */
NewMsg->MsgBuf = NewStrBufPlain(NULL, len);
}
else {
- NewMsg->MsgBuf = NewStrBufPlain(exist, eLen);
- free(exist);
+ NewMsg->MsgBuf = NewStrBufDup(exist);
}
/* Do we need to change leading ".." to "." for SMTP escaping? */
if ((tlen == 1) && (*terminator == '.')) {
char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */
long tlen,
size_t maxlen, /* maximum message length */
- char *exist, /* if non-null, append to it;
+ StrBuf *exist, /* if non-null, append to it;
exist is ALWAYS freed */
int crlf, /* CRLF newlines instead of LF */
int *sock /* socket handle or 0 for this session's client socket */
return(msg);
}
-extern int netconfig_check_roomaccess(
- char *errmsgbuf,
- size_t n,
- const char* RemoteIdentifier); /* TODO: find a smarter way */
-
/*
* Check to see whether we have permission to post a message in the current
* room. Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or
}
if ((PostPublic!=POST_LMTP) &&(CC->room.QRflags2 & QR2_SMTP_PUBLIC) == 0) {
- return netconfig_check_roomaccess(errmsgbuf, n, RemoteIdentifier);
+ return CtdlNetconfigCheckRoomaccess(errmsgbuf, n, RemoteIdentifier);
}
return (0);
/* User flagged ok? */
if (who->flags & US_INTERNET) return(2);
- /* Aide level access? */
+ /* Admin level access? */
if (who->axlevel >= AxAideU) return(3);
/* No mail for you! */
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;
striplt(this_recp);
if (IsEmptyStr(this_recp))
break;
- syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp);
+ 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);
- mailtype = alias(this_recp);
- mailtype = alias(this_recp);
- j = 0;
- for (j=0; !IsEmptyStr(&this_recp[j]); ++j) {
+
+ for (j = 0; !IsEmptyStr(&this_recp[j]); ++j) {
if (this_recp[j]=='_') {
this_recp_cooked[j] = ' ';
}
&& (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
/* Save room so we can restore it later */
- tempQR2 = CC->room;
- CC->room = tempQR;
+ tempQR2 = CCC->room;
+ CCC->room = tempQR;
/* Check permissions to send mail to this room */
err = CtdlDoIHavePermissionToPostInThisRoom(
}
/* Restore room in case something needs it */
- CC->room = tempQR2;
+ CCC->room = tempQR2;
}
else if (CtdlGetUser(&tempUS, this_recp) == 0) {
strcpy(ret->errormsg, "No recipients specified.");
}
- syslog(LOG_DEBUG, "validate_recipients()\n");
- syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local);
- syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room);
- syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet);
- syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet);
- syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg);
+ 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);
}
if (valid->recptypes_magic != RECPTYPES_MAGIC) {
- syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n");
+ struct CitContext *CCC = CC;
+ MSGM_syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n");
abort();
}
char subject[SIZ];
int subject_required = 0;
int do_confirm = 0;
- int verbose_reply = 0;
long msgnum;
int i, j;
char buf[256];
do_confirm = extract_int(entargs, 6);
extract_token(cc, entargs, 7, '|', sizeof cc);
extract_token(bcc, entargs, 8, '|', sizeof bcc);
- verbose_reply = extract_int(entargs, 9);
switch(CC->room.QRdefaultview) {
case VIEW_NOTES:
case VIEW_WIKI:
if (msg != NULL) {
msgnum = CtdlSubmitMsg(msg, valid, "", QP_EADDR);
- if (verbose_reply)
- {
- if (StrLength(CCC->StatusMessage)>0)
- {
- StrBufAppendBufPlain(CCC->StatusMessage, HKEY("\n000\n"), 0);
- cputbuf(CCC->StatusMessage);
- }
- else
- client_write(HKEY("\n000\n"));
- }
-
if (do_confirm) {
cprintf("%ld\n", msgnum);
- if (msgnum >= 0L) {
+
+ if (StrLength(CCC->StatusMessage) > 0) {
+ cprintf("%s\n", ChrPtr(CCC->StatusMessage));
+ }
+ else if (msgnum >= 0L) {
client_write(HKEY("Message accepted.\n"));
}
else {
client_write(HKEY("Internal error.\n"));
}
+
if (msg->cm_fields['E'] != NULL) {
cprintf("%s\n", msg->cm_fields['E']);
} else {
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;
}
- syslog(LOG_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n",
- room_name, num_dmsgnums, content_type);
+ MSG_syslog(LOG_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n",
+ room_name, num_dmsgnums, content_type);
/* get room record, obtaining a lock... */
if (CtdlGetRoomLock(&qrbuf, room_name) != 0) {
- syslog(LOG_ERR, "CtdlDeleteMessages(): Room <%s> not found\n",
- room_name);
+ MSG_syslog(LOG_ERR, "CtdlDeleteMessages(): Room <%s> not found\n",
+ room_name);
if (need_to_free_re) regfree(&re);
return (0); /* room not found */
}
cdb_free(cdbfr);
}
if (num_msgs > 0) {
- int have_contenttype = !IsEmptyStr(content_type);
+ int have_contenttype = (content_type != NULL) && !IsEmptyStr(content_type);
int have_delmsgs = (num_dmsgnums == 0) || (dmsgnums == NULL);
int have_more_del = 1;
StrBuf *dbg = NewStrBuf();
for (i = 0; i < num_dmsgnums; i++)
StrBufAppendPrintf(dbg, ", %ld", dmsgnums[i]);
- syslog(LOG_DEBUG, "Deleting before: %s", ChrPtr(dbg));
+ MSG_syslog(LOG_DEBUG, "Deleting before: %s", ChrPtr(dbg));
FreeStrBuf(&dbg);
}
*/
StrBuf *dbg = NewStrBuf();
for (i = 0; i < num_deleted; i++)
StrBufAppendPrintf(dbg, ", %ld", dellist[i]);
- syslog(LOG_DEBUG, "Deleting: %s", ChrPtr(dbg));
+ MSG_syslog(LOG_DEBUG, "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);
- syslog(LOG_DEBUG, "%d message(s) deleted.\n", num_deleted);
+ MSG_syslog(LOG_DEBUG, "%d message(s) deleted.\n", num_deleted);
if (need_to_free_re) regfree(&re);
return (num_deleted);
}
*/
permit = 0;
- /* Aides can move/copy */
+ /* Admins can move/copy */
if (CC->user.axlevel >= AxAideU) permit = 1;
/* Room aides can move/copy */
*/
void AdjRefCount(long msgnum, int incr)
{
+ struct CitContext *CCC = CC;
struct arcq new_arcq;
int rv = 0;
- syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", msgnum, incr);
+ MSG_syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", msgnum, incr);
begin_critical_section(S_SUPPMSGMAIN);
if (arcfp == NULL) {
/* msgnum < 0 means that we're trying to close the file */
if (msgnum < 0) {
- syslog(LOG_DEBUG, "Closing the AdjRefCount queue file\n");
+ MSGM_syslog(LOG_DEBUG, "Closing the AdjRefCount queue file\n");
begin_critical_section(S_SUPPMSGMAIN);
if (arcfp != NULL) {
fclose(arcfp);
new_arcq.arcq_delta = incr;
rv = fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp);
if (rv == -1) {
- syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
- file_arcq,
- strerror(errno));
+ MSG_syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
+ file_arcq,
+ strerror(errno));
}
fflush(arcfp);
void AdjRefCountList(long *msgnum, long nmsg, int incr)
{
+ struct CitContext *CCC = CC;
long i, the_size, offset;
struct arcq *new_arcq;
int rv = 0;
- syslog(LOG_DEBUG, "AdjRefCountList() msg %ld ref count delta %+d\n", nmsg, incr);
+ MSG_syslog(LOG_DEBUG, "AdjRefCountList() msg %ld ref count delta %+d\n", nmsg, incr);
begin_critical_section(S_SUPPMSGMAIN);
if (arcfp == NULL) {
{
rv = fwrite(new_arcq + offset, 1, the_size - offset, arcfp);
if (rv == -1) {
- syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
- file_arcq,
- strerror(errno));
+ MSG_syslog(LOG_EMERG, "Couldn't write Refcount Queue File %s: %s\n",
+ file_arcq,
+ strerror(errno));
}
else {
offset += rv;
*/
int TDAP_ProcessAdjRefCountQueue(void)
{
+ struct CitContext *CCC = CC;
char file_arcq_temp[PATH_MAX];
int r;
FILE *fp;
r = link(file_arcq, file_arcq_temp);
if (r != 0) {
- syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
+ MSG_syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
end_critical_section(S_SUPPMSGMAIN);
return(num_records_processed);
}
fp = fopen(file_arcq_temp, "rb");
if (fp == NULL) {
- syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
+ MSG_syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
return(num_records_processed);
}
fclose(fp);
r = unlink(file_arcq_temp);
if (r != 0) {
- syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
+ MSG_syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno));
}
return(num_records_processed);
*/
void TDAP_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);
- syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n",
- msgnum, incr, smi.meta_refcount
+ MSG_syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n",
+ msgnum, incr, smi.meta_refcount
);
/* If the reference count is now zero, delete the message
* (and its supplementary record as well).
*/
if (smi.meta_refcount == 0) {
- syslog(LOG_DEBUG, "Deleting message <%ld>\n", msgnum);
+ MSG_syslog(LOG_DEBUG, "Deleting message <%ld>\n", msgnum);
/* Call delete hooks with NULL room to show it has gone altogether */
PerformDeleteHooks(NULL, msgnum);
unsigned int flags /* Internal save flags */
)
{
-
+ struct CitContext *CCC = CC;
struct ctdlroom qrbuf;
char roomname[ROOMNAMELEN];
struct CtdlMessage *msg;
safestrncpy(roomname, req_room, sizeof(roomname));
}
- syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length);
+ MSG_syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length);
if (is_binary) {
encoded_message = malloc((size_t) (((raw_length * 134) / 100) + 4096 ) );
);
}
- syslog(LOG_DEBUG, "Allocating\n");
+ MSGM_syslog(LOG_DEBUG, "Allocating\n");
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['A'] = strdup(CC->user.fullname);
+ msg->cm_fields['A'] = strdup(CCC->user.fullname);
msg->cm_fields['O'] = strdup(req_room);
msg->cm_fields['N'] = strdup(config.c_nodename);
msg->cm_fields['H'] = strdup(config.c_humannode);
* other objects of this type that are currently in the room.
*/
if (is_unique) {
- syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n",
- CtdlDeleteMessages(roomname, NULL, 0, content_type)
+ MSG_syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n",
+ CtdlDeleteMessages(roomname, NULL, 0, content_type)
);
}
/* Now write the data */
/*****************************************************************************/
/* 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");
projects / citadel.git / blobdiff