striplt(name);
remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
+ stripallbut(name, '<', '>');
fp = fopen(
#ifndef HAVE_ETG_DIR
/*
* Manipulate the "seen msgs" string (or other message set strings)
*/
-void CtdlSetSeen(long target_msgnum, int target_setting, int which_set,
+void CtdlSetSeen(long *target_msgnums, int num_target_msgnums,
+ int target_setting, int which_set,
struct ctdluser *which_user, struct ctdlroom *which_room) {
struct cdbdata *cdbfr;
- int i, j;
+ int i, j, k;
int is_seen = 0;
int was_seen = 0;
long lo = (-1L);
char setstr[SIZ], lostr[SIZ], histr[SIZ];
size_t tmp;
- lprintf(CTDL_DEBUG, "CtdlSetSeen(%ld, %d, %d)\n",
- target_msgnum, target_setting, which_set);
+ lprintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %d, %d)\n",
+ num_target_msgnums, target_msgnums[0],
+ target_setting, which_set);
/* Learn about the user and room in question */
CtdlGetRelationship(&vbuf,
/* Load the message list */
cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr != NULL) {
- msglist = malloc(cdbfr->len);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* CtdlSetSeen() now owns this memory */
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
} else {
hi = (-1L);
for (i=0; i<num_msgs; ++i) {
- is_seen = 0;
- if (msglist[i] == target_msgnum) {
- is_seen = target_setting;
- }
- else {
- is_seen = is_set[i];
+ is_seen = is_set[i]; /* Default to existing setting */
+
+ for (k=0; k<num_target_msgnums; ++k) {
+ if (msglist[i] == target_msgnums[k]) {
+ is_seen = target_setting;
+ }
}
if (is_seen) {
/* Load the message list */
cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long));
if (cdbfr != NULL) {
- msglist = malloc(cdbfr->len);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* CtdlForEachMessage() now owns this memory */
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
} else {
* Post callback function for multipart/alternative
*/
void fixed_output_post(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ void *content, char *cbtype, char *cbcharset, size_t length,
+ char *encoding, void *cbuserdata)
{
struct ma_info *ma;
* Inline callback function for mime parser that wants to display text
*/
void fixed_output(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
- {
- char *ptr;
- char *wptr;
- size_t wlen;
- struct ma_info *ma;
-
- ma = (struct ma_info *)cbuserdata;
+ void *content, char *cbtype, char *cbcharset, size_t length,
+ char *encoding, void *cbuserdata)
+{
+ char *ptr;
+ char *wptr;
+ size_t wlen;
+ struct ma_info *ma;
- lprintf(CTDL_DEBUG, "fixed_output() type=<%s>\n", cbtype);
+ ma = (struct ma_info *)cbuserdata;
- /*
- * 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 == 1) && (ma->did_print == 1) ) {
- lprintf(CTDL_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype);
- return;
- }
- ma->did_print = 1;
-
- if ( (!strcasecmp(cbtype, "text/plain"))
- || (strlen(cbtype)==0) ) {
- wptr = content;
- if (length > 0) {
- client_write(wptr, length);
- if (wptr[length-1] != '\n') {
- cprintf("\n");
- }
- }
- }
- else if (!strcasecmp(cbtype, "text/html")) {
- ptr = html_to_ascii(content, 80, 0);
- wlen = strlen(ptr);
- client_write(ptr, wlen);
- if (ptr[wlen-1] != '\n') {
+ lprintf(CTDL_DEBUG,
+ "fixed_output() part %s: %s (%s) (%ld bytes)\n",
+ 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 == 1) && (ma->did_print == 1) ) {
+ lprintf(CTDL_DEBUG, "Skipping part %s (%s)\n",
+ partnum, cbtype);
+ return;
+ }
+ ma->did_print = 1;
+
+ if ( (!strcasecmp(cbtype, "text/plain"))
+ || (strlen(cbtype)==0) ) {
+ wptr = content;
+ if (length > 0) {
+ client_write(wptr, length);
+ if (wptr[length-1] != '\n') {
cprintf("\n");
}
- free(ptr);
}
- else if (strncasecmp(cbtype, "multipart/", 10)) {
- cprintf("Part %s: %s (%s) (%ld bytes)\r\n",
- partnum, filename, cbtype, (long)length);
+ }
+ else if (!strcasecmp(cbtype, "text/html")) {
+ ptr = html_to_ascii(content, length, 80, 0);
+ wlen = strlen(ptr);
+ client_write(ptr, wlen);
+ if (ptr[wlen-1] != '\n') {
+ cprintf("\n");
}
+ free(ptr);
+ }
+ else if (PerformFixedOutputHooks(cbtype, content, length)) {
+ /* above function returns nonzero if it handled the part */
}
+ else if (strncasecmp(cbtype, "multipart/", 10)) {
+ cprintf("Part %s: %s (%s) (%ld bytes)\r\n",
+ partnum, filename, cbtype, (long)length);
+ }
+}
/*
* The client is elegant and sophisticated and wants to be choosy about
* we're going to send.
*/
void choose_preferred(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ void *content, char *cbtype, char *cbcharset, size_t length,
+ char *encoding, void *cbuserdata)
{
char buf[1024];
int i;
for (i=0; i<num_tokens(CC->preferred_formats, '|'); ++i) {
extract_token(buf, CC->preferred_formats, i, '|', sizeof buf);
if (!strcasecmp(buf, cbtype)) {
- strcpy(ma->chosen_part, partnum);
+ if (num_tokens(partnum, '.') < 3) {
+ lprintf(CTDL_DEBUG, "REPLACING MA <%s> WITH <%s>\n",
+ ma->chosen_part, partnum);
+ safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part);
+ }
}
}
}
* Now that we've chosen our preferred part, output it.
*/
void output_preferred(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, char *cbcharset, size_t length, char *encoding,
- void *cbuserdata)
+ void *content, char *cbtype, char *cbcharset, size_t length,
+ char *encoding, void *cbuserdata)
{
int i;
char buf[128];
}
+struct encapmsg {
+ char desired_section[64];
+ char *msg;
+ size_t msglen;
+};
+
+
+/*
+ * Callback function for
+ */
+void extract_encapsulated_message(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, char *cbcharset, size_t length,
+ char *encoding, void *cbuserdata)
+{
+ struct encapmsg *encap;
+
+ encap = (struct encapmsg *)cbuserdata;
+
+ /* Only proceed if this is the desired section... */
+ if (!strcasecmp(encap->desired_section, partnum)) {
+ encap->msglen = length;
+ encap->msg = malloc(length + 2);
+ memcpy(encap->msg, content, length);
+ return;
+ }
+
+}
+
+
+
+
/*
* Get a message off disk. (returns om_* values found in msgbase.h)
*
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? */
+ int crlf, /* Use CRLF newlines instead of LF? */
+ char *section /* NULL or a message/rfc822 section */
) {
struct CtdlMessage *TheMessage = NULL;
int retcode = om_no_such_msg;
+ struct encapmsg encap;
- lprintf(CTDL_DEBUG, "CtdlOutputMsg() msgnum=%ld, mode=%d\n",
- msg_num, mode);
+ lprintf(CTDL_DEBUG, "CtdlOutputMsg() msgnum=%ld, mode=%d, section=%s\n",
+ msg_num, mode,
+ (section ? section : "<>")
+ );
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
if (do_proto) cprintf("%d Not logged in.\n",
ERROR + MESSAGE_NOT_FOUND, msg_num);
return(om_no_such_msg);
}
-
- retcode = CtdlOutputPreLoadedMsg(
- TheMessage, mode,
- headers_only, do_proto, crlf);
+ /* Here is the weird form of this command, to process only an
+ * encapsulated message/rfc822 section.
+ */
+ if (section) {
+ memset(&encap, 0, sizeof encap);
+ safestrncpy(encap.desired_section, section, sizeof encap.desired_section);
+ mime_parser(TheMessage->cm_fields['M'],
+ NULL,
+ *extract_encapsulated_message,
+ NULL, NULL, (void *)&encap, 0
+ );
+ CtdlFreeMessage(TheMessage);
+ TheMessage = NULL;
+
+ if (encap.msg) {
+ encap.msg[encap.msglen] = 0;
+ TheMessage = convert_internet_message(encap.msg);
+ encap.msg = NULL; /* no free() here, TheMessage owns it now */
+
+ /* Now we let it fall through to the bottom of this
+ * function, because TheMessage now contains the
+ * encapsulated message instead of the top-level
+ * message. Isn't that neat?
+ */
+
+ }
+ else {
+ 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);
CtdlFreeMessage(TheMessage);
return(retcode);
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0, NULL);
return;
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1, NULL);
}
void cmd_msg4(char *cmdbuf)
{
long msgid;
+ char section[64];
msgid = extract_long(cmdbuf, 0);
- CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0);
+ extract_token(section, cmdbuf, 1, '|', sizeof section);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0, (section[0] ? section : NULL) );
}
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);
+ safestrncpy(CC->download_desired_section, desired_section,
+ sizeof CC->download_desired_section);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1, NULL);
}
long highest_msg = 0L;
struct CtdlMessage *msg = NULL;
- lprintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom(roomname=%s, msgid=%ld, do_repl_check=%d)\n",
- roomname, msgid, do_repl_check);
+ /*lprintf(CTDL_DEBUG,
+ "CtdlSaveMsgPointerInRoom(room=%s, msgid=%ld, repl=%d)\n",
+ roomname, msgid, do_repl_check);*/
strcpy(hold_rm, CC->room.QRname);
- /* We may need to check to see if this message is real */
- if (do_repl_check) {
- if (supplied_msg != NULL) {
- msg = supplied_msg;
- }
- else {
- msg = CtdlFetchMessage(msgid, 0);
- }
- if (msg == NULL) return(ERROR + ILLEGAL_VALUE);
- }
-
- /* Perform replication checks if necessary */
- if ( (do_repl_check) && (msg != NULL) ) {
-
- if (getroom(&CC->room,
- ((roomname != NULL) ? roomname : CC->room.QRname) )
- != 0) {
- lprintf(CTDL_ERR, "No such room <%s>\n", roomname);
- if ( (msg != NULL) && (msg != supplied_msg) ) CtdlFreeMessage(msg);
- return(ERROR + ROOM_NOT_FOUND);
- }
-
- ReplicationChecks(msg);
- }
-
/* Now the regular stuff */
if (lgetroom(&CC->room,
((roomname != NULL) ? roomname : CC->room.QRname) )
!= 0) {
lprintf(CTDL_ERR, "No such room <%s>\n", roomname);
- if ( (msg != NULL) && (msg != supplied_msg) ) CtdlFreeMessage(msg);
return(ERROR + ROOM_NOT_FOUND);
}
msglist = NULL;
num_msgs = 0;
} else {
- msglist = malloc(cdbfr->len);
- if (msglist == NULL)
- lprintf(CTDL_ALERT, "ERROR malloc msglist!\n");
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* CtdlSaveMsgPointerInRoom() now owns this memory */
num_msgs = cdbfr->len / sizeof(long);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
cdb_free(cdbfr);
}
-
/* Make sure the message doesn't already exist in this room. It
* is absolutely taboo to have more than one reference to the same
* message in a room.
if (msglist[i] == msgid) {
lputroom(&CC->room); /* unlock the room */
getroom(&CC->room, hold_rm);
- if ( (msg != NULL) && (msg != supplied_msg) ) CtdlFreeMessage(msg);
free(msglist);
return(ERROR + ALREADY_EXISTS);
}
/* Free up the memory we used. */
free(msglist);
+ /* Update the highest-message pointer and unlock the room. */
+ CC->room.QRhighest = highest_msg;
+ lputroom(&CC->room);
+
+ /* Perform replication checks if necessary */
+ if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) {
+ if (supplied_msg != NULL) {
+ msg = supplied_msg;
+ }
+ else {
+ msg = CtdlFetchMessage(msgid, 0);
+ }
+
+ if (msg != NULL) {
+ ReplicationChecks(msg);
+ }
+
+ }
+
/* If the message has an Exclusive ID, index that... */
if (msg != NULL) {
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'],
+ &CC->room, msgid);
}
}
- /* Update the highest-message pointer and unlock the room. */
- CC->room.QRhighest = highest_msg;
- lputroom(&CC->room);
+ /* Free up the memory we may have allocated */
+ if ( (msg != NULL) && (msg != supplied_msg) ) {
+ CtdlFreeMessage(msg);
+ }
+
+ /* Go back to the room we were in before we wandered here... */
getroom(&CC->room, hold_rm);
/* Bump the reference count for this message. */
AdjRefCount(msgid, +1);
/* Return success. */
- if ( (msg != NULL) && (msg != supplied_msg) ) CtdlFreeMessage(msg);
return (0);
}
void ReplicationChecks(struct CtdlMessage *msg) {
long old_msgnum = (-1L);
+ if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return;
+
+ lprintf(CTDL_DEBUG, "Performing replication checks in <%s>\n",
+ CC->room.QRname);
+
/* No exclusive id? Don't do anything. */
if (msg == NULL) return;
if (msg->cm_fields['E'] == NULL) return;
if (strlen(msg->cm_fields['E']) == 0) return;
- lprintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
- msg->cm_fields['E'], CC->room.QRname);
+ /*lprintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n",
+ msg->cm_fields['E'], CC->room.QRname);*/
old_msgnum = locate_message_by_euid(msg->cm_fields['E'], &CC->room);
if (old_msgnum > 0L) {
* giving it one, right now.
*/
if (msg->cm_fields['T'] == NULL) {
- lprintf(CTDL_DEBUG, "Generating timestamp\n");
snprintf(generated_timestamp, sizeof generated_timestamp, "%ld", (long)time(NULL));
msg->cm_fields['T'] = strdup(generated_timestamp);
}
/* If this message has no path, we generate one.
*/
if (msg->cm_fields['P'] == NULL) {
- lprintf(CTDL_DEBUG, "Generating path\n");
if (msg->cm_fields['A'] != NULL) {
msg->cm_fields['P'] = strdup(msg->cm_fields['A']);
for (a=0; a<strlen(msg->cm_fields['P']); ++a) {
}
/* Learn about what's inside, because it's what's inside that counts */
- lprintf(CTDL_DEBUG, "Learning what's inside\n");
if (msg->cm_fields['M'] == NULL) {
lprintf(CTDL_ERR, "ERROR: attempt to save message with NULL body\n");
return(-2);
}
/* Goto the correct room */
- lprintf(CTDL_DEBUG, "Selected room %s\n",
- (recps) ? CC->room.QRname : SENTITEMS);
+ lprintf(CTDL_DEBUG, "Selected room %s\n", (recps) ? CC->room.QRname : SENTITEMS);
strcpy(hold_rm, CC->room.QRname);
strcpy(actual_rm, CC->room.QRname);
if (recps != NULL) {
}
/* If the user is a twit, move to the twit room for posting */
- lprintf(CTDL_DEBUG, "Handling twit stuff: %s\n",
- (CC->user.axlevel == 2) ? config.c_twitroom : "OK");
if (TWITDETECT) {
if (CC->user.axlevel == 2) {
strcpy(hold_rm, actual_rm);
strcpy(actual_rm, config.c_twitroom);
+ lprintf(CTDL_DEBUG, "Diverting to twit room\n");
}
}
lprintf(CTDL_DEBUG, "Performing before-save hooks\n");
if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3);
- /* If this message has an Exclusive ID, perform replication checks */
- lprintf(CTDL_DEBUG, "Performing replication checks\n");
- ReplicationChecks(msg);
+ /*
+ * If this message has an Exclusive ID, and the room is replication
+ * checking enabled, then do replication checks.
+ */
+ if (DoesThisRoomNeedEuidIndexing(&CC->room)) {
+ ReplicationChecks(msg);
+ }
/* Save it to disk */
lprintf(CTDL_DEBUG, "Saving to disk\n");
}
else {
lprintf(CTDL_DEBUG, "No user <%s>\n", recipient);
- CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
+ CtdlSaveMsgPointerInRoom(config.c_aideroom,
+ newmsgid, 0, msg);
}
}
for (i=0; i<num_tokens(recps->recp_internet, '|'); ++i) {
size_t tmp = strlen(instr);
- extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient);
+ extract_token(recipient, recps->recp_internet,
+ i, '|', sizeof recipient);
snprintf(&instr[tmp], SIZ * 2 - tmp,
"remote|%s|0||\n", recipient);
}
if (collected_addresses != NULL) {
begin_critical_section(S_ATBF);
- aptr = (struct addresses_to_be_filed *) malloc(sizeof(struct addresses_to_be_filed));
+ aptr = (struct addresses_to_be_filed *)
+ malloc(sizeof(struct addresses_to_be_filed));
aptr->next = atbf;
- MailboxName(actual_rm, sizeof actual_rm, &CC->user, USERCONTACTSROOM);
+ MailboxName(actual_rm, sizeof actual_rm,
+ &CC->user, USERCONTACTSROOM);
aptr->roomname = strdup(actual_rm);
aptr->collected_addresses = collected_addresses;
atbf = aptr;
* Returns 0 if all addresses are ok, -1 if no addresses were specified,
* or the number of addresses found invalid.
*/
-struct recptypes *validate_recipients(char *recipients) {
+struct recptypes *validate_recipients(char *supplied_recipients) {
struct recptypes *ret;
- char this_recp[SIZ];
- char this_recp_cooked[SIZ];
+ char recipients[SIZ];
+ char this_recp[256];
+ char this_recp_cooked[256];
char append[SIZ];
int num_recps;
int i, j;
int invalid;
struct ctdluser tempUS;
struct ctdlroom tempQR;
+ int in_quotes = 0;
/* Initialize */
ret = (struct recptypes *) malloc(sizeof(struct recptypes));
ret->num_error = 0;
ret->num_room = 0;
- if (recipients == NULL) {
- num_recps = 0;
- }
- else if (strlen(recipients) == 0) {
- num_recps = 0;
+ if (supplied_recipients == NULL) {
+ strcpy(recipients, "");
}
else {
- /* Change all valid separator characters to commas */
- for (i=0; i<strlen(recipients); ++i) {
- if ((recipients[i] == ';') || (recipients[i] == '|')) {
- recipients[i] = ',';
- }
- }
+ safestrncpy(recipients, supplied_recipients, sizeof recipients);
+ }
- /* Count 'em up */
- num_recps = num_tokens(recipients, ',');
+ /* Change all valid separator characters to commas */
+ for (i=0; i<strlen(recipients); ++i) {
+ if ((recipients[i] == ';') || (recipients[i] == '|')) {
+ recipients[i] = ',';
+ }
}
- if (num_recps > 0) for (i=0; i<num_recps; ++i) {
- extract_token(this_recp, recipients, i, ',', sizeof this_recp);
+ /* Now start extracting recipients... */
+
+ while (strlen(recipients) > 0) {
+
+ 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);
- lprintf(CTDL_DEBUG, "Evaluating recipient #%d <%s>\n", i, this_recp);
+ lprintf(CTDL_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp);
+ ++num_recps;
mailtype = alias(this_recp);
mailtype = alias(this_recp);
mailtype = alias(this_recp);
cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf.QRnumber, sizeof(long));
if (cdbfr != NULL) {
- msglist = malloc(cdbfr->len);
dellist = malloc(cdbfr->len);
- memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ msglist = (long *) cdbfr->ptr;
+ cdbfr->ptr = NULL; /* CtdlDeleteMessages() now owns this memory */
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
}
projects / citadel.git / blobdiff