#include <ctype.h>
#include <string.h>
#include <syslog.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#include <limits.h>
#include "citadel.h"
#include "server.h"
"path",
"",
"rcpt",
- "",
+ "spec",
"time",
"subj",
"",
int a, b;
char aaa[300], bbb[300];
- lprintf(9, "alias() called for <%s>\n", name);
-
remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
fp = fopen("network/mail.aliases", "r");
CIT_UBYTE field_header;
size_t field_length;
-
dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long));
if (dmsgtext == NULL) {
- lprintf(9, "CtdlFetchMessage(%ld) failed.\n");
return NULL;
}
mptr = dmsgtext->ptr;
cdb_free(dmsgtext);
+ /* Always make sure there's something in the msg text field */
+ if (ret->cm_fields['M'] == NULL)
+ ret->cm_fields['M'] = strdoop("<no text>\n");
+
/* Perform "before read" hooks (aborting if any return nonzero) */
if (PerformMessageHooks(ret, EVT_BEFOREREAD) > 0) {
CtdlFreeMessage(ret);
/* */
msg_num = atol(msgid);
+ safestrncpy(mid, msgid, sizeof mid);
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
- if (TheMessage->cm_format_type != 4) {
+ if (TheMessage->cm_format_type != FMT_RFC822) {
cprintf("%d This is not a MIME message.\n",
ERROR);
} else if (CC->download_fp != NULL) {
* MIME message, *lie* about it and tell the user it's fixed-format.
*/
if (mode == MT_CITADEL) {
- if (TheMessage->cm_format_type == 4)
+ if (TheMessage->cm_format_type == FMT_RFC822)
cprintf("type=1\n");
else
cprintf("type=%d\n", TheMessage->cm_format_type);
mptr = TheMessage->cm_fields['M'];
/* Tell the client about the MIME parts in this message */
- if (TheMessage->cm_format_type == 4) { /* legacy textual dump */
+ if (TheMessage->cm_format_type == FMT_RFC822) { /* legacy text dump */
if (mode == MT_CITADEL) {
mime_parser(mptr, NULL, *list_this_part);
}
/* signify start of msg text */
if (mode == MT_CITADEL)
cprintf("text\n");
- if ((mode == MT_RFC822) && (TheMessage->cm_format_type != 4))
+ if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822))
cprintf("\n");
/* 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.
*/
- if (TheMessage->cm_format_type == 1) {
+ if (TheMessage->cm_format_type == FMT_FIXED) {
strcpy(buf, "");
while (ch = *mptr++, ch > 0) {
if (ch == 13)
* for new paragraphs is correct and the client will reformat the
* message to the reader's screen width.
*/
- if (TheMessage->cm_format_type == 0) {
+ if (TheMessage->cm_format_type == FMT_CITADEL) {
memfmout(80, mptr, 0);
}
* this message is format 1 (fixed format), so the callback function
* we use will display those parts as-is.
*/
- if (TheMessage->cm_format_type == 4) {
+ if (TheMessage->cm_format_type == FMT_RFC822) {
CtdlAllocUserData(SYM_MA_INFO, sizeof(struct ma_info));
memset(ma, 0, sizeof(struct ma_info));
mime_parser(mptr, NULL, *fixed_output);
}
-
/*
* Save a message pointer into a specified room
* (Returns 0 for success, nonzero for failure)
+ * roomname may be NULL to use the current room
*/
int CtdlSaveMsgPointerInRoom(char *roomname, long msgid, int flags) {
int i;
- struct quickroom qrbuf;
+ char hold_rm[ROOMNAMELEN];
struct cdbdata *cdbfr;
int num_msgs;
long *msglist;
long highest_msg = 0L;
+ struct CtdlMessage *msg = NULL;
lprintf(9, "CtdlSaveMsgPointerInRoom(%s, %ld, %d)\n",
roomname, msgid, flags);
- if (lgetroom(&qrbuf, roomname) != 0) {
+ strcpy(hold_rm, CC->quickroom.QRname);
+
+ /* We may need to check to see if this message is real */
+ if ( (flags & SM_VERIFY_GOODNESS)
+ || (flags & SM_DO_REPL_CHECK)
+ ) {
+ msg = CtdlFetchMessage(msgid);
+ if (msg == NULL) return(ERROR + ILLEGAL_VALUE);
+ }
+
+ /* Perform replication checks if necessary */
+ if ( (flags & SM_DO_REPL_CHECK) && (msg != NULL) ) {
+
+ if (getroom(&CC->quickroom,
+ ((roomname != NULL) ? roomname : CC->quickroom.QRname) )
+ != 0) {
+ lprintf(9, "No such room <%s>\n", roomname);
+ if (msg != NULL) CtdlFreeMessage(msg);
+ return(ERROR + ROOM_NOT_FOUND);
+ }
+
+ if (ReplicationChecks(msg) != 0) {
+ getroom(&CC->quickroom, hold_rm);
+ if (msg != NULL) CtdlFreeMessage(msg);
+ lprintf(9, "Did replication, and newer exists\n");
+ return(0);
+ }
+ }
+
+ /* Now the regular stuff */
+ if (lgetroom(&CC->quickroom,
+ ((roomname != NULL) ? roomname : CC->quickroom.QRname) )
+ != 0) {
lprintf(9, "No such room <%s>\n", roomname);
+ if (msg != NULL) CtdlFreeMessage(msg);
return(ERROR + ROOM_NOT_FOUND);
}
- cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
if (cdbfr == NULL) {
msglist = NULL;
num_msgs = 0;
*/
if (num_msgs > 0) for (i=0; i<num_msgs; ++i) {
if (msglist[i] == msgid) {
- lputroom(&qrbuf); /* unlock the room */
+ lputroom(&CC->quickroom); /* unlock the room */
+ getroom(&CC->quickroom, hold_rm);
+ if (msg != NULL) CtdlFreeMessage(msg);
return(ERROR + ALREADY_EXISTS);
}
}
highest_msg = msglist[num_msgs - 1];
/* Write it back to disk. */
- cdb_store(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long),
+ cdb_store(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long),
msglist, num_msgs * sizeof(long));
/* Free up the memory we used. */
phree(msglist);
/* Update the highest-message pointer and unlock the room. */
- qrbuf.QRhighest = highest_msg;
- lputroom(&qrbuf);
+ CC->quickroom.QRhighest = highest_msg;
+ lputroom(&CC->quickroom);
+ getroom(&CC->quickroom, hold_rm);
/* Bump the reference count for this message. */
AdjRefCount(msgid, +1);
/* Return success. */
- lprintf(9, "CtdlSaveMsgPointerInRoom() succeeded\n");
+ if (msg != NULL) CtdlFreeMessage(msg);
return (0);
}
int i;
static char *forder = FORDER;
- lprintf(9, "serialize_message() called\n");
-
if (is_valid_message(msg) == 0) return; /* self check */
- lprintf(9, "magic number check OK.\n");
-
ret->len = 3;
for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL)
ret->len = ret->len +
strlen(msg->cm_fields[(int)forder[i]]) + 2;
- lprintf(9, "message is %d bytes\n", ret->len);
-
lprintf(9, "calling malloc\n");
ret->ser = mallok(ret->len);
if (ret->ser == NULL) {
ret->ser[2] = msg->cm_format_type;
wlen = 3;
- lprintf(9, "stuff\n");
for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
ret->ser[wlen++] = (char)forder[i];
strcpy(&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
}
if (ret->len != wlen) lprintf(3, "ERROR: len=%d wlen=%d\n",
ret->len, wlen);
- lprintf(9, "done serializing\n");
return;
}
}
CtdlFreeMessage(template);
- lprintf(9, "Returning %d\n", abort_this);
+ lprintf(9, "ReplicationChecks() returning %d\n", abort_this);
return(abort_this);
}
/*
* Save a message to disk
*/
-void CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
+long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
char *rec, /* Recipient (mail) */
char *force, /* force a particular room? */
int mailtype, /* local or remote type */
static int seqnum = 1;
lprintf(9, "CtdlSaveMsg() called\n");
- if (is_valid_message(msg) == 0) return; /* self check */
+ if (is_valid_message(msg) == 0) return(-1); /* self check */
/* If this message has no timestamp, we take the liberty of
* giving it one, right now.
*/
if (msg->cm_fields['T'] == NULL) {
+ lprintf(9, "Generating timestamp\n");
sprintf(aaa, "%ld", time(NULL));
msg->cm_fields['T'] = strdoop(aaa);
}
/* If this message has no path, we generate one.
*/
if (msg->cm_fields['P'] == NULL) {
- msg->cm_fields['P'] = strdoop(msg->cm_fields['A']);
- for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
- if (isspace(msg->cm_fields['P'][a])) {
- msg->cm_fields['P'][a] = ' ';
+ lprintf(9, "Generating path\n");
+ if (msg->cm_fields['A'] != NULL) {
+ msg->cm_fields['P'] = strdoop(msg->cm_fields['A']);
+ for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
+ if (isspace(msg->cm_fields['P'][a])) {
+ msg->cm_fields['P'][a] = ' ';
+ }
}
}
+ else {
+ msg->cm_fields['P'] = strdoop("unknown");
+ }
}
strcpy(force_room, force);
strcpy(&recipient[a], &recipient[a + 1]);
/* Learn about what's inside, because it's what's inside that counts */
+ lprintf(9, "Learning what's inside\n");
switch (msg->cm_format_type) {
case 0:
}
}
+ /* Goto the correct room */
+ lprintf(9, "Switching rooms\n");
+ strcpy(hold_rm, CC->quickroom.QRname);
+ strcpy(actual_rm, CC->quickroom.QRname);
+
+ /* If the user is a twit, move to the twit room for posting */
+ lprintf(9, "Handling twit stuff\n");
+ if (TWITDETECT) {
+ if (CC->usersupp.axlevel == 2) {
+ strcpy(hold_rm, actual_rm);
+ strcpy(actual_rm, config.c_twitroom);
+ }
+ }
+
+ /* ...or if this message is destined for Aide> then go there. */
+ if (strlen(force_room) > 0) {
+ strcpy(actual_rm, force_room);
+ }
+
+ lprintf(9, "Possibly relocating\n");
+ if (strcasecmp(actual_rm, CC->quickroom.QRname))
+ getroom(&CC->quickroom, actual_rm);
+
/* Perform "before save" hooks (aborting if any return nonzero) */
- if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return;
+ lprintf(9, "Performing before-save hooks\n");
+ if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-1);
/* If this message has an Extended ID, perform replication checks */
- if (ReplicationChecks(msg) > 0) return;
+ lprintf(9, "Performing replication checks\n");
+ if (ReplicationChecks(msg) > 0) return(-1);
/* Network mail - send a copy to the network program. */
- if ((strlen(recipient) > 0) && (mailtype != MES_LOCAL)) {
+ if ((strlen(recipient) > 0) && (mailtype == MES_BINARY)) {
+ lprintf(9, "Sending network spool\n");
sprintf(aaa, "./network/spoolin/netmail.%04lx.%04x.%04x",
(long) getpid(), CC->cs_pid, ++seqnum);
lprintf(9, "Saving a copy to %s\n", aaa);
}
/* Save it to disk */
+ lprintf(9, "Saving to disk\n");
newmsgid = send_message(msg, generate_id, network_fp);
if (network_fp != NULL) {
fclose(network_fp);
system("exec nohup ./netproc -i >/dev/null 2>&1 &");
}
- if (newmsgid <= 0L) return;
+ if (newmsgid <= 0L) return(-1);
/* Write a supplemental message info record. This doesn't have to
* be a critical section because nobody else knows about this message
* yet.
*/
+ lprintf(9, "Creating SuppMsgInfo record\n");
memset(&smi, 0, sizeof(struct SuppMsgInfo));
smi.smi_msgnum = newmsgid;
smi.smi_refcount = 0;
PutSuppMsgInfo(&smi);
/* Now figure out where to store the pointers */
+ lprintf(9, "Storing pointers\n");
- strcpy(actual_rm, CC->quickroom.QRname);
/* 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 ((!CC->internal_pgm) || (strlen(recipient) == 0)) {
- /* If the user is a twit, move to the twit room for posting */
- if (TWITDETECT) {
- if (CC->usersupp.axlevel == 2) {
- strcpy(hold_rm, actual_rm);
- strcpy(actual_rm, config.c_twitroom);
- }
- }
- /* ...or if this message is destined for Aide> then go there. */
- if (strlen(force_room) > 0) {
- strcpy(actual_rm, force_room);
- }
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
+ /* For internet mail, drop a copy in the outbound queue room */
+ /* FIX ... nothing's going to get delivered until we add
+ some delivery instructions!!! */
+ if (mailtype == MES_INTERNET) {
+ CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
+ }
+
/* Bump this user's messages posted counter. */
+ lprintf(9, "Updating user\n");
lgetuser(&CC->usersupp, CC->curr_user);
CC->usersupp.posted = CC->usersupp.posted + 1;
lputuser(&CC->usersupp);
*/
if ((strlen(recipient) > 0) && (mailtype == MES_LOCAL)) {
if (getuser(&userbuf, recipient) == 0) {
+ lprintf(9, "Delivering private mail\n");
MailboxName(actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
}
/* Perform "after save" hooks */
+ lprintf(9, "Performing after-save hooks\n");
PerformMessageHooks(msg, EVT_AFTERSAVE);
+
+ /* */
+ lprintf(9, "Returning to original room\n");
+ if (strcasecmp(hold_rm, CC->quickroom.QRname))
+ getroom(&CC->quickroom, hold_rm);
+
+ return(newmsgid);
}
}
+
+/*
+ * Back end function used by make_message() and similar functions
+ */
+char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */
+ size_t maxlen, /* maximum message length */
+ char *exist /* if non-null, append to it;
+ exist is ALWAYS freed */
+ ) {
+ char buf[256];
+ size_t message_len = 0;
+ size_t buffer_len = 0;
+ char *ptr, *append;
+ char *m;
+
+ if (exist == NULL) {
+ m = mallok(4096);
+ }
+ else {
+ m = reallok(exist, strlen(exist) + 4096);
+ if (m == NULL) phree(exist);
+ }
+ if (m == NULL) {
+ while ( (client_gets(buf)>0) && strcmp(buf, terminator) ) ;;
+ return(NULL);
+ } else {
+ buffer_len = 4096;
+ m[0] = 0;
+ message_len = 0;
+ }
+ /* read in the lines of message text one by one */
+ append = NULL;
+ while ( (client_gets(buf)>0) && strcmp(buf, terminator) ) {
+
+ /* augment the buffer if we have to */
+ if ((message_len + strlen(buf) + 2) > buffer_len) {
+ lprintf(9, "realloking\n");
+ ptr = reallok(m, (buffer_len * 2) );
+ if (ptr == NULL) { /* flush if can't allocate */
+ while ( (client_gets(buf)>0) &&
+ strcmp(buf, terminator)) ;;
+ return(m);
+ } else {
+ buffer_len = (buffer_len * 2);
+ m = ptr;
+ append = NULL;
+ lprintf(9, "buffer_len is %d\n", buffer_len);
+ }
+ }
+
+ if (append == NULL) append = m;
+ while (strlen(append) > 0) ++append;
+ strcpy(append, buf);
+ strcat(append, "\n");
+ message_len = message_len + strlen(buf) + 1;
+
+ /* if we've hit the max msg length, flush the rest */
+ if (message_len >= maxlen) {
+ while ( (client_gets(buf)>0) && strcmp(buf, terminator)) ;;
+ return(m);
+ }
+ }
+ return(m);
+}
+
+
+
+
/*
* Build a binary message to be saved on disk.
*/
int a;
char dest_node[32];
char buf[256];
- size_t message_len = 0;
- size_t buffer_len = 0;
- char *ptr;
struct CtdlMessage *msg;
msg = mallok(sizeof(struct CtdlMessage));
if (dest_node[0] != 0)
msg->cm_fields['D'] = strdoop(dest_node);
- msg->cm_fields['M'] = mallok(4096);
- if (msg->cm_fields['M'] == NULL) {
- while (client_gets(buf), strcmp(buf, "000")) ;; /* flush */
- return(msg);
- } else {
- buffer_len = 4096;
- msg->cm_fields['M'][0] = 0;
- message_len = 0;
- }
-
- /* read in the lines of message text one by one */
- while (client_gets(buf), strcmp(buf, "000")) {
- /* augment the buffer if we have to */
- if ((message_len + strlen(buf) + 2) > buffer_len) {
- ptr = reallok(msg->cm_fields['M'], (buffer_len * 2) );
- if (ptr == NULL) { /* flush if can't allocate */
- while (client_gets(buf), strcmp(buf, "000")) ;;
- return(msg);
- } else {
- buffer_len = (buffer_len * 2);
- msg->cm_fields['M'] = ptr;
- }
- }
-
- strcat(msg->cm_fields['M'], buf);
- strcat(msg->cm_fields['M'], "\n");
+ msg->cm_fields['M'] = CtdlReadMessageBody("000",
+ config.c_maxmsglen, NULL);
- /* if we've hit the max msg length, flush the rest */
- if (message_len >= config.c_maxmsglen) {
- while (client_gets(buf), strcmp(buf, "000")) ;;
- return(msg);
- }
- }
return(msg);
}
char recp[256];
int a;
int e = 0;
+ int valid_msg = 1;
unsigned char ch, which_field;
struct usersupp tempUS;
long msglen;
while (msglen > 0) {
client_read(&which_field, 1);
+ if (!isalpha(which_field)) valid_msg = 0;
--msglen;
tempbuf[0] = 0;
do {
tempbuf[a+1] = 0;
tempbuf[a] = ch;
} while ( (ch != 0) && (msglen > 0) );
- msg->cm_fields[which_field] = strdoop(tempbuf);
+ if (valid_msg)
+ msg->cm_fields[which_field] = strdoop(tempbuf);
}
msg->cm_flags = CM_SKIP_HOOKS;
- CtdlSaveMsg(msg, recp, "", e, 0);
+ if (valid_msg) CtdlSaveMsg(msg, recp, "", e, 0);
CtdlFreeMessage(msg);
phree(tempbuf);
}
/*
- * move a message to another room
+ * move or copy a message to another room
*/
void cmd_move(char *args)
{
long num;
- char targ[32];
+ char targ[256];
struct quickroom qtemp;
- int foundit;
int err;
+ int is_copy = 0;
num = extract_long(args, 0);
extract(targ, args, 1);
+ targ[ROOMNAMELEN - 1] = 0;
+ is_copy = extract_int(args, 2);
getuser(&CC->usersupp, CC->curr_user);
if ((CC->usersupp.axlevel < 6)
return;
}
- /* Temporarily bump the reference count to avoid having the message
- * deleted while it's in transit.
- */
- AdjRefCount(num, 1);
-
- /* yank the message out of the current room... */
- foundit = CtdlDeleteMessages(CC->quickroom.QRname, num, NULL);
-
- if (foundit) {
- /* put the message into the target room */
- if (err = CtdlSaveMsgPointerInRoom(targ, num, 0), (err !=0) ) {
- cprintf("%d Could not save message %ld in %s.\n",
- err, num, targ);
- }
- else {
- cprintf("%d Message moved.\n", OK);
- }
- }
- else {
- cprintf("%d No such message.\n", ERROR);
+ err = CtdlSaveMsgPointerInRoom(targ, num,
+ (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+ if (err != 0) {
+ cprintf("%d Cannot store message in %s: error %d\n",
+ err, targ, err);
+ return;
}
- /* Fix the reference count. */
- AdjRefCount(num, (-1));
+ /* Now delete the message from the source room,
+ * if this is a 'move' rather than a 'copy' operation.
+ */
+ if (is_copy == 0) CtdlDeleteMessages(CC->quickroom.QRname, num, NULL);
+
+ cprintf("%d Message %s.\n", OK, (is_copy ? "copied" : "moved") );
}
projects / citadel.git / blobdiff