-/* $Id$ */
+/*
+ * $Id$
+ *
+ * Implements the message store.
+ *
+ */
+
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <fcntl.h>
-#include <time.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 <syslog.h>
#include <sys/stat.h>
#include "citadel.h"
#include "server.h"
+#include "dynloader.h"
#include "database.h"
#include "msgbase.h"
#include "support.h"
#include "user_ops.h"
#include "file_ops.h"
#include "control.h"
-#include "dynloader.h"
#include "tools.h"
#include "mime_parser.h"
#include "html.h"
+#include "genstamp.h"
+#include "internet_addressing.h"
#define desired_section ((char *)CtdlGetUserData(SYM_DESIRED_SECTION))
#define ma ((struct ma_info *)CtdlGetUserData(SYM_MA_INFO))
extern struct config config;
long config_msgnum;
+
+/*
+ * This really belongs in serv_network.c, but I don't know how to export
+ * symbols between modules.
+ */
+struct FilterList *filterlist = NULL;
+
+
+/*
+ * These are the four-character field headers we use when outputting
+ * messages in Citadel format (as opposed to RFC822 format).
+ */
char *msgkeys[] = {
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "", "", "", "", "", "", "", "",
- "",
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ 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",
- "", "", "",
+ NULL, NULL, NULL,
"text",
"node",
"room",
"path",
- "",
+ NULL,
"rcpt",
"spec",
"time",
"subj",
- "",
- "",
- "",
- "",
- ""
+ NULL,
+ NULL,
+ NULL,
+ NULL,
+ NULL
};
/*
{
int i;
- for (i = 0; i < strlen(name); ++i)
+ for (i = 0; i < strlen(name); ++i) {
if (name[i] == '@') {
- if (i > 0)
- if (isspace(name[i - 1])) {
- strcpy(&name[i - 1], &name[i]);
- i = 0;
- }
+ 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]);
}
}
+ }
}
int alias(char *name)
{ /* process alias and routing info for mail */
FILE *fp;
- int a, b;
- char aaa[300], bbb[300];
-
+ int a, i;
+ char aaa[SIZ], bbb[SIZ];
+ char *ignetcfg = NULL;
+ char *ignetmap = NULL;
+ int at = 0;
+ char node[SIZ];
+ char testnode[SIZ];
+ char buf[SIZ];
+
+ striplt(name);
remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
fp = fopen("network/mail.aliases", "r");
- if (fp == NULL)
+ if (fp == NULL) {
fp = fopen("/dev/null", "r");
- if (fp == NULL)
+ }
+ if (fp == NULL) {
return (MES_ERROR);
+ }
strcpy(aaa, "");
strcpy(bbb, "");
while (fgets(aaa, sizeof aaa, fp) != NULL) {
strcpy(name, bbb);
}
fclose(fp);
+
+ /* Hit the Global Address Book */
+ if (CtdlDirectoryLookup(aaa, name) == 0) {
+ strcpy(name, aaa);
+ }
+
lprintf(7, "Mail is being forwarded to %s\n", name);
+ /* 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;
+ lprintf(7, "Changed to <%s>\n", name);
+ }
+ }
+ }
+
/* determine local or remote type, see citadel.h */
- for (a = 0; a < strlen(name); ++a)
- if (name[a] == '!')
- return (MES_INTERNET);
- for (a = 0; a < strlen(name); ++a)
- if (name[a] == '@')
- for (b = a; b < strlen(name); ++b)
- if (name[b] == '.')
- return (MES_INTERNET);
- b = 0;
- for (a = 0; a < strlen(name); ++a)
- if (name[a] == '@')
- ++b;
- if (b > 1) {
- lprintf(7, "Too many @'s in address\n");
- return (MES_ERROR);
+ 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, '@');
+
+ /* 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);
}
- if (b == 1) {
- for (a = 0; a < strlen(name); ++a)
- if (name[a] == '@')
- strcpy(bbb, &name[a + 1]);
- while (bbb[0] == 32)
- strcpy(bbb, &bbb[1]);
- fp = fopen("network/mail.sysinfo", "r");
- if (fp == NULL)
- return (MES_ERROR);
- GETSN:do {
- a = getstring(fp, aaa);
- } while ((a >= 0) && (strcasecmp(aaa, bbb)));
- a = getstring(fp, aaa);
- if (!strncmp(aaa, "use ", 4)) {
- strcpy(bbb, &aaa[4]);
- fseek(fp, 0L, 0);
- goto GETSN;
+
+ /* 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');
+ extract_token(testnode, buf, 0, '|');
+ if (!strcasecmp(node, testnode)) {
+ phree(ignetcfg);
+ return(MES_IGNET);
}
- fclose(fp);
- if (!strncmp(aaa, "uum", 3)) {
- strcpy(bbb, name);
- for (a = 0; a < strlen(bbb); ++a) {
- if (bbb[a] == '@')
- bbb[a] = 0;
- if (bbb[a] == ' ')
- bbb[a] = '_';
- }
- while (bbb[strlen(bbb) - 1] == '_')
- bbb[strlen(bbb) - 1] = 0;
- sprintf(name, &aaa[4], bbb);
- return (MES_INTERNET);
- }
- if (!strncmp(aaa, "bin", 3)) {
- strcpy(aaa, name);
- strcpy(bbb, name);
- while (aaa[strlen(aaa) - 1] != '@')
- aaa[strlen(aaa) - 1] = 0;
- aaa[strlen(aaa) - 1] = 0;
- while (aaa[strlen(aaa) - 1] == ' ')
- aaa[strlen(aaa) - 1] = 0;
- while (bbb[0] != '@')
- strcpy(bbb, &bbb[1]);
- strcpy(bbb, &bbb[1]);
- while (bbb[0] == ' ')
- strcpy(bbb, &bbb[1]);
- sprintf(name, "%s @%s", aaa, bbb);
- return (MES_BINARY);
+ }
+ phree(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');
+ extract_token(testnode, buf, 0, '|');
+ if (!strcasecmp(node, testnode)) {
+ phree(ignetmap);
+ return(MES_IGNET);
}
- return (MES_ERROR);
}
- return (MES_LOCAL);
+ phree(ignetmap);
+
+ /* If we get to this point it's an invalid node name */
+ return (MES_ERROR);
}
-void simple_listing(long msgnum)
+void simple_listing(long msgnum, void *userdata)
{
cprintf("%ld\n", msgnum);
}
}
+/*
+ * Manipulate the "seen msgs" string.
+ */
+void CtdlSetSeen(long target_msgnum, int target_setting) {
+ char newseen[SIZ];
+ struct cdbdata *cdbfr;
+ int i;
+ int is_seen = 0;
+ int was_seen = 1;
+ long lo = (-1L);
+ long hi = (-1L);
+ struct visit vbuf;
+ long *msglist;
+ int num_msgs = 0;
+
+ /* Learn about the user and room in question */
+ get_mm();
+ getuser(&CC->usersupp, CC->curr_user);
+ CtdlGetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+
+ /* Load the message list */
+ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->quickroom.QRnumber, sizeof(long));
+ if (cdbfr != NULL) {
+ msglist = mallok(cdbfr->len);
+ memcpy(msglist, cdbfr->ptr, cdbfr->len);
+ num_msgs = cdbfr->len / sizeof(long);
+ cdb_free(cdbfr);
+ } else {
+ return; /* No messages at all? No further action. */
+ }
+
+ lprintf(9, "before optimize: %s\n", vbuf.v_seen);
+ strcpy(newseen, "");
+
+ for (i=0; i<num_msgs; ++i) {
+ is_seen = 0;
+
+ if (msglist[i] == target_msgnum) {
+ is_seen = target_setting;
+ }
+ else {
+ if (is_msg_in_mset(vbuf.v_seen, msglist[i])) {
+ is_seen = 1;
+ }
+ }
+
+ if (is_seen == 1) {
+ if (lo < 0L) lo = msglist[i];
+ hi = msglist[i];
+ }
+ if ( ((is_seen == 0) && (was_seen == 1))
+ || ((is_seen == 1) && (i == num_msgs-1)) ) {
+ size_t tmp;
+
+ if ( (strlen(newseen) + 20) > SIZ) {
+ strcpy(newseen, &newseen[20]);
+ newseen[0] = '*';
+ }
+ tmp = strlen(newseen);
+ if (tmp > 0) {
+ strcat(newseen, ",");
+ tmp++;
+ }
+ if (lo == hi) {
+ snprintf(&newseen[tmp], sizeof newseen - tmp,
+ "%ld", lo);
+ }
+ else {
+ snprintf(&newseen[tmp], sizeof newseen - tmp,
+ "%ld:%ld", lo, hi);
+ }
+ lo = (-1L);
+ hi = (-1L);
+ }
+ was_seen = is_seen;
+ }
+
+ safestrncpy(vbuf.v_seen, newseen, SIZ);
+ lprintf(9, " after optimize: %s\n", vbuf.v_seen);
+ phree(msglist);
+ CtdlSetRelationship(&vbuf, &CC->usersupp, &CC->quickroom);
+}
/*
* API function to perform an operation for each qualifying message in the
- * current room.
+ * current room. (Returns the number of messages processed.)
*/
-void CtdlForEachMessage(int mode, long ref,
+int CtdlForEachMessage(int mode, long ref,
+ int moderation_level,
char *content_type,
struct CtdlMessage *compare,
- void (*CallBack) (long msgnum))
+ void (*CallBack) (long, void *),
+ void *userdata)
{
int a;
struct cdbdata *cdbfr;
long *msglist = NULL;
int num_msgs = 0;
+ int num_processed = 0;
long thismsg;
- struct SuppMsgInfo smi;
+ struct MetaData smi;
struct CtdlMessage *msg;
+ int is_seen;
+ long lastold = 0L;
+ int printed_lastold = 0;
/* Learn about the user and room in question */
get_mm();
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
} else {
- return; /* No messages at all? No further action. */
+ return 0; /* No messages at all? No further action. */
}
- /* If the caller is looking for a specific MIME type, then filter
- * out all messages which are not of the type requested.
+ /*
+ * Now begin the traversal.
*/
- if (num_msgs > 0)
- if (content_type != NULL)
- if (strlen(content_type) > 0)
- for (a = 0; a < num_msgs; ++a) {
- lprintf(9, "Trying %ld\n", msglist[a]);
- GetSuppMsgInfo(&smi, msglist[a]);
- lprintf(9, "ct is %s\n", smi.smi_content_type);
- if (strcasecmp(smi.smi_content_type, content_type)) {
- msglist[a] = 0L;
- }
- }
+ if (num_msgs > 0) for (a = 0; a < num_msgs; ++a) {
+ GetMetaData(&smi, msglist[a]);
+
+ /* Filter out messages that are moderated below the level
+ * currently being viewed at.
+ */
+ if (smi.meta_mod < moderation_level) {
+ msglist[a] = 0L;
+ }
+
+ /* If the caller is looking for a specific MIME type, filter
+ * out all messages which are not of the type requested.
+ */
+ if (content_type != NULL) if (strlen(content_type) > 0) {
+ if (strcasecmp(smi.meta_content_type, content_type)) {
+ msglist[a] = 0L;
+ }
+ }
+ }
num_msgs = sort_msglist(msglist, num_msgs);
if (num_msgs > 0)
for (a = 0; a < num_msgs; ++a) {
thismsg = msglist[a];
- if ((thismsg > 0)
+ is_seen = is_msg_in_mset(vbuf.v_seen, thismsg);
+ if (is_seen) lastold = thismsg;
+ if ((thismsg > 0L)
&& (
(mode == MSGS_ALL)
- || ((mode == MSGS_OLD) && (thismsg <= vbuf.v_lastseen))
- || ((mode == MSGS_NEW) && (thismsg > vbuf.v_lastseen))
- || ((mode == MSGS_NEW) && (thismsg >= vbuf.v_lastseen)
- && (CC->usersupp.flags & US_LASTOLD))
+ || ((mode == MSGS_OLD) && (is_seen))
+ || ((mode == MSGS_NEW) && (!is_seen))
|| ((mode == MSGS_LAST) && (a >= (num_msgs - ref)))
|| ((mode == MSGS_FIRST) && (a < ref))
|| ((mode == MSGS_GT) && (thismsg > ref))
+ || ((mode == MSGS_EQ) && (thismsg == ref))
)
) {
- CallBack(thismsg);
+ if ((mode == MSGS_NEW) && (CC->usersupp.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);
+ ++num_processed;
}
}
phree(msglist); /* Clean up */
+ return num_processed;
}
void cmd_msgs(char *cmdbuf)
{
int mode = 0;
- char which[256];
- char buf[256];
- char tfield[256];
- char tvalue[256];
+ char which[SIZ];
+ char buf[SIZ];
+ char tfield[SIZ];
+ char tvalue[SIZ];
int cm_ref = 0;
int i;
int with_template = 0;
cprintf("%d Message list...\n", LISTING_FOLLOWS);
}
- CtdlForEachMessage(mode, cm_ref, NULL, template, simple_listing);
+ CtdlForEachMessage(mode, cm_ref,
+ CC->usersupp.moderation_filter,
+ NULL, template, simple_listing, NULL);
if (template != NULL) CtdlFreeMessage(template);
cprintf("000\n");
}
*/
void help_subst(char *strbuf, char *source, char *dest)
{
- char workbuf[256];
+ char workbuf[SIZ];
int p;
while (p = pattern2(strbuf, source), (p >= 0)) {
help_subst(buffer, "^humannode", config.c_humannode);
help_subst(buffer, "^fqdn", config.c_fqdn);
help_subst(buffer, "^username", CC->usersupp.fullname);
- sprintf(buf2, "%ld", CC->usersupp.usernum);
+ snprintf(buf2, sizeof buf2, "%ld", CC->usersupp.usernum);
help_subst(buffer, "^usernum", buf2);
help_subst(buffer, "^sysadm", config.c_sysadm);
help_subst(buffer, "^variantname", CITADEL);
- sprintf(buf2, "%d", config.c_maxsessions);
+ snprintf(buf2, sizeof buf2, "%d", config.c_maxsessions);
help_subst(buffer, "^maxsessions", buf2);
}
void memfmout(
int width, /* screen width to use */
char *mptr, /* where are we going to get our text from? */
- char subst) /* nonzero if we should do substitutions */
+ char subst, /* nonzero if we should do substitutions */
+ char *nl) /* string to terminate lines with */
{
int a, b, c;
int real = 0;
int old = 0;
CIT_UBYTE ch;
char aaa[140];
- char buffer[256];
+ char buffer[SIZ];
strcpy(aaa, "");
old = 255;
strcpy(buffer, "");
c = 1; /* c is the current pos */
-FMTA: if (subst) {
- while (ch = *mptr, ((ch != 0) && (strlen(buffer) < 126))) {
- ch = *mptr++;
- buffer[strlen(buffer) + 1] = 0;
- buffer[strlen(buffer)] = ch;
- }
+ do {
+ if (subst) {
+ while (ch = *mptr, ((ch != 0) && (strlen(buffer) < 126))) {
+ ch = *mptr++;
+ buffer[strlen(buffer) + 1] = 0;
+ buffer[strlen(buffer)] = ch;
+ }
- if (buffer[0] == '^')
- do_help_subst(buffer);
+ if (buffer[0] == '^')
+ do_help_subst(buffer);
- buffer[strlen(buffer) + 1] = 0;
- a = buffer[0];
- strcpy(buffer, &buffer[1]);
- } else {
- ch = *mptr++;
- }
+ buffer[strlen(buffer) + 1] = 0;
+ a = buffer[0];
+ strcpy(buffer, &buffer[1]);
+ } else {
+ ch = *mptr++;
+ }
- old = real;
- real = ch;
- if (ch <= 0)
- goto FMTEND;
+ old = real;
+ real = ch;
- if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
- ch = 32;
- if (((old == 13) || (old == 10)) && (isspace(real))) {
- cprintf("\n");
- c = 1;
- }
- if (ch > 126)
- goto FMTA;
+ if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
+ ch = 32;
+ if (((old == 13) || (old == 10)) && (isspace(real))) {
+ cprintf("%s", nl);
+ c = 1;
+ }
+ if (ch > 126)
+ continue;
- if (ch > 32) {
- if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
- cprintf("\n%s", aaa);
- c = strlen(aaa);
- aaa[0] = 0;
+ if (ch > 32) {
+ if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
+ cprintf("%s%s", nl, aaa);
+ c = strlen(aaa);
+ aaa[0] = 0;
+ }
+ b = strlen(aaa);
+ aaa[b] = ch;
+ aaa[b + 1] = 0;
}
- b = strlen(aaa);
- aaa[b] = ch;
- aaa[b + 1] = 0;
- }
- if (ch == 32) {
- if ((strlen(aaa) + c) > (width - 5)) {
- cprintf("\n");
+ if (ch == 32) {
+ if ((strlen(aaa) + c) > (width - 5)) {
+ cprintf("%s", nl);
+ c = 1;
+ }
+ cprintf("%s ", aaa);
+ ++c;
+ c = c + strlen(aaa);
+ strcpy(aaa, "");
+ }
+ if ((ch == 13) || (ch == 10)) {
+ cprintf("%s%s", aaa, nl);
c = 1;
+ strcpy(aaa, "");
}
- cprintf("%s ", aaa);
- ++c;
- c = c + strlen(aaa);
- strcpy(aaa, "");
- goto FMTA;
- }
- if ((ch == 13) || (ch == 10)) {
- cprintf("%s\n", aaa);
- c = 1;
- strcpy(aaa, "");
- goto FMTA;
- }
- goto FMTA;
-FMTEND: cprintf("%s\n", aaa);
+ } while (ch > 0);
+
+ cprintf("%s%s", aaa, nl);
}
* Callback function for mime parser that simply lists the part
*/
void list_this_part(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length)
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
{
- cprintf("part=%s|%s|%s|%s|%s|%d\n",
- name, filename, partnum, disp, cbtype, length);
+ cprintf("part=%s|%s|%s|%s|%s|%ld\n",
+ name, filename, partnum, disp, cbtype, (long)length);
}
* Callback function for mime parser that opens a section for downloading
*/
void mime_download(char *name, char *filename, char *partnum, char *disp,
- void *content, char *cbtype, size_t length)
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
{
/* Silently go away if there's already a download open... */
if (is_valid_message(msg) == 0) return;
for (i = 0; i < 256; ++i)
- if (msg->cm_fields[i] != NULL)
+ if (msg->cm_fields[i] != NULL) {
phree(msg->cm_fields[i]);
+ }
msg->cm_magic = 0; /* just in case */
phree(msg);
/*
- * Get a message off disk. (return value is the message's timestamp)
- *
+ * Pre callback function for multipart/alternative
+ *
+ * NOTE: this differs from the standard behavior for a reason. Normally when
+ * displaying multipart/alternative you want to show the _last_ usable
+ * format in the message. Here we show the _first_ one, because it's
+ * usually text/plain. Since this set of functions is designed for text
+ * output to non-MIME-aware clients, this is the desired behavior.
+ *
*/
-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? */
- FILE *outfp,
- int outsock,
- int crlf /* Use CRLF newlines instead of LF? */
-) {
- int a, i, k;
- char buf[1024];
- time_t xtime;
- CIT_UBYTE ch;
- char allkeys[256];
- char display_name[256];
- struct CtdlMessage *TheMessage;
- char *mptr;
- char *nl; /* newline string */
-
- /* buffers needed for RFC822 translation */
- char suser[256];
- char luser[256];
- char snode[256];
- char lnode[256];
- char mid[256];
- /* */
-
-
- /* BEGIN NESTED FUNCTION omprintf() */
- void omprintf(const char *format, ...) {
- va_list arg_ptr;
- char buf[256];
-
- va_start(arg_ptr, format);
- if (vsnprintf(buf, sizeof buf, format, arg_ptr) == -1)
- buf[sizeof buf - 2] = '\n';
- if (outfp != NULL) {
- fwrite(buf, strlen(buf), 1, outfp);
- }
- else if (outsock >= 0) {
- write(outsock, buf, strlen(buf));
- }
- else {
- client_write(buf, strlen(buf));
- }
- va_end(arg_ptr);
- }
- /* END NESTED FUNCTION omprintf() */
-
- /* BEGIN NESTED FUNCTION omfmout() */
- void omfmout(char *mptr) {
- int b, c;
- int real = 0;
- int old = 0;
- CIT_UBYTE ch;
- char aaa[140];
- char buffer[256];
-
- strcpy(aaa, "");
- old = 255;
- strcpy(buffer, "");
- c = 1; /* c is the current pos */
-
-FMTA: ch = *mptr++;
- old = real;
- real = ch;
- if (ch <= 0)
- goto FMTEND;
-
- if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
- ch = 32;
- if (((old == 13) || (old == 10)) && (isspace(real))) {
- omprintf("%s", nl);
- c = 1;
- }
- if (ch > 126)
- goto FMTA;
-
- if (ch > 32) {
- if (((strlen(aaa) + c) > (75)) && (strlen(aaa) > (75))) {
- omprintf("%s%s", nl, aaa);
- c = strlen(aaa);
- aaa[0] = 0;
- }
- b = strlen(aaa);
- aaa[b] = ch;
- aaa[b + 1] = 0;
- }
- if (ch == 32) {
- if ((strlen(aaa) + c) > (75)) {
- omprintf("%s", nl);
- c = 1;
- }
- omprintf("%s ", aaa);
- ++c;
- c = c + strlen(aaa);
- strcpy(aaa, "");
- goto FMTA;
- }
- if ((ch == 13) || (ch == 10)) {
- omprintf("%s%s", aaa, nl);
- c = 1;
- strcpy(aaa, "");
- goto FMTA;
+void fixed_output_pre(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
+{
+ lprintf(9, "fixed_output_pre() type=<%s>\n", cbtype);
+ if (!strcasecmp(cbtype, "multipart/alternative")) {
+ ma->is_ma = 1;
+ ma->did_print = 0;
+ return;
}
- goto FMTA;
+}
-FMTEND: omprintf("%s%s", aaa, nl);
- }
- /* END NESTED FUNCTION omfmout() */
+/*
+ * Post callback function for multipart/alternative
+ */
+void fixed_output_post(char *name, char *filename, char *partnum, char *disp,
+ void *content, char *cbtype, size_t length, char *encoding,
+ void *cbuserdata)
+{
+ lprintf(9, "fixed_output_post() type=<%s>\n", cbtype);
+ if (!strcasecmp(cbtype, "multipart/alternative")) {
+ ma->is_ma = 0;
+ ma->did_print = 0;
+ return;
+ }
+}
- /* BEGIN NESTED FUNCTION fixed_output() */
- /*
- * 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, size_t length)
+/*
+ * 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, size_t length, char *encoding,
+ void *cbuserdata)
{
char *ptr;
char *wptr;
size_t wlen;
-
- if (!strcasecmp(cbtype, "multipart/alternative")) {
- strcpy(ma->prefix, partnum);
- strcat(ma->prefix, ".");
- ma->is_ma = 1;
- ma->did_print = 0;
- return;
- }
-
- if ( (!strncasecmp(partnum, ma->prefix, strlen(ma->prefix)))
- && (ma->is_ma == 1)
- && (ma->did_print == 1) ) {
+ CIT_UBYTE ch = 0;
+
+ lprintf(9, "fixed_output() type=<%s>\n", cbtype);
+
+ /*
+ * 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(9, "Skipping part %s (%s)\n", partnum, cbtype);
return;
}
-
ma->did_print = 1;
- if (!strcasecmp(cbtype, "text/plain")) {
+ if ( (!strcasecmp(cbtype, "text/plain"))
+ || (strlen(cbtype)==0) ) {
wlen = length;
wptr = content;
while (wlen--) {
ch = *wptr++;
- if (ch==10) omprintf("%s", nl);
- else omprintf("%c", ch);
+ /**********
+ if (ch==10) cprintf("\r\n");
+ else cprintf("%c", ch);
+ **********/
+ cprintf("%c", ch);
}
+ if (ch != '\n') cprintf("\n");
}
else if (!strcasecmp(cbtype, "text/html")) {
ptr = html_to_ascii(content, 80, 0);
wptr = ptr;
while (wlen--) {
ch = *wptr++;
- if (ch==10) omprintf("%s", nl);
- else omprintf("%c", ch);
+ if (ch==10) cprintf("\r\n");
+ else cprintf("%c", ch);
}
phree(ptr);
}
else if (strncasecmp(cbtype, "multipart/", 10)) {
- omprintf("Part %s: %s (%s) (%d bytes)%s",
- partnum, filename, cbtype, length, nl);
+ cprintf("Part %s: %s (%s) (%ld bytes)\r\n",
+ partnum, filename, cbtype, (long)length);
}
}
- /* END NESTED FUNCTION fixed_output() */
+/*
+ * 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? */
+) {
+ struct CtdlMessage *TheMessage;
+ int retcode;
+
+ lprintf(7, "CtdlOutputMsg() msgnum=%ld, mode=%d\n",
+ msg_num, mode);
TheMessage = NULL;
- sprintf(mid, "%ld", msg_num);
- nl = (crlf ? "\r\n" : "\n");
if ((!(CC->logged_in)) && (!(CC->internal_pgm))) {
if (do_proto) cprintf("%d Not logged in.\n",
return(om_not_logged_in);
}
- /* FIX ... small security issue
+ /* FIXME ... small security issue
* We need to check to make sure the requested message is actually
* in the current room, and set msg_ok to 1 only if it is. This
* functionality is currently missing because I'm in a hurry to replace
ERROR, msg_num);
return(om_no_such_msg);
}
+
+ retcode = CtdlOutputPreLoadedMsg(
+ TheMessage, msg_num, mode,
+ headers_only, do_proto, crlf);
+
+ CtdlFreeMessage(TheMessage);
+ return(retcode);
+}
+
+
+/*
+ * Get a message off disk. (returns om_* values found in msgbase.h)
+ *
+ */
+int CtdlOutputPreLoadedMsg(struct CtdlMessage *TheMessage,
+ long msg_num,
+ 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 i, k;
+ char buf[1024];
+ CIT_UBYTE ch;
+ char allkeys[SIZ];
+ char display_name[SIZ];
+ char *mptr;
+ char *nl; /* newline string */
+ int suppress_f = 0;
+
+ /* buffers needed for RFC822 translation */
+ char suser[SIZ];
+ char luser[SIZ];
+ char fuser[SIZ];
+ char snode[SIZ];
+ char lnode[SIZ];
+ char mid[SIZ];
+ char datestamp[SIZ];
+ /* */
+
+ snprintf(mid, sizeof mid, "%ld", msg_num);
+ nl = (crlf ? "\r\n" : "\n");
+
+ if (!is_valid_message(TheMessage)) {
+ lprintf(1, "ERROR: invalid preloaded message for output\n");
+ return(om_no_such_msg);
+ }
/* Are we downloading a MIME component? */
if (mode == MT_DOWNLOAD) {
} else {
/* Parse the message text component */
mptr = TheMessage->cm_fields['M'];
- mime_parser(mptr, NULL, *mime_download);
+ mime_parser(mptr, NULL,
+ *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
*/
desired_section);
}
}
- CtdlFreeMessage(TheMessage);
return((CC->download_fp != NULL) ? om_ok : om_mime_error);
}
}
/* nhdr=yes means that we're only displaying headers, no body */
- if ((TheMessage->cm_anon_type == MES_ANON) && (mode == MT_CITADEL)) {
+ if ((TheMessage->cm_anon_type == MES_ANONONLY) && (mode == MT_CITADEL)) {
if (do_proto) cprintf("nhdr=yes\n");
}
if (TheMessage->cm_fields['A']) {
strcpy(buf, TheMessage->cm_fields['A']);
PerformUserHooks(buf, (-1L), EVT_OUTPUTMSG);
- if (TheMessage->cm_anon_type == MES_ANON)
+ if (TheMessage->cm_anon_type == MES_ANONONLY) {
strcpy(display_name, "****");
- else if (TheMessage->cm_anon_type == MES_AN2)
+ }
+ else if (TheMessage->cm_anon_type == MES_ANONOPT) {
strcpy(display_name, "anonymous");
- else
+ }
+ else {
strcpy(display_name, buf);
+ }
if ((is_room_aide())
- && ((TheMessage->cm_anon_type == MES_ANON)
- || (TheMessage->cm_anon_type == MES_AN2))) {
- sprintf(&display_name[strlen(display_name)],
- " [%s]", buf);
+ && ((TheMessage->cm_anon_type == MES_ANONONLY)
+ || (TheMessage->cm_anon_type == MES_ANONOPT))) {
+ size_t tmp = strlen(display_name);
+ snprintf(&display_name[tmp],
+ sizeof display_name - tmp,
+ " [%s]", buf);
}
}
+ /* Don't show Internet address for users on the
+ * local Citadel network.
+ */
+ suppress_f = 0;
+ if (TheMessage->cm_fields['N'] != NULL)
+ if (strlen(TheMessage->cm_fields['N']) > 0)
+ if (haschar(TheMessage->cm_fields['N'], '.') == 0) {
+ suppress_f = 1;
+ }
+
+ /* Now spew the header fields in the order we like them. */
strcpy(allkeys, FORDER);
for (i=0; i<strlen(allkeys); ++i) {
k = (int) allkeys[i];
if (k != 'M') {
- if (TheMessage->cm_fields[k] != NULL) {
+ if ( (TheMessage->cm_fields[k] != NULL)
+ && (msgkeys[k] != NULL) ) {
if (k == 'A') {
if (do_proto) cprintf("%s=%s\n",
msgkeys[k],
display_name);
}
+ else if ((k == 'F') && (suppress_f)) {
+ /* do nothing */
+ }
+ /* Masquerade display name if needed */
else {
if (do_proto) cprintf("%s=%s\n",
msgkeys[k],
strcpy(suser, "");
strcpy(luser, "");
+ strcpy(fuser, "");
strcpy(snode, NODENAME);
strcpy(lnode, HUMANNODE);
if (mode == MT_RFC822) {
+ cprintf("X-UIDL: %ld%s", msg_num, nl);
for (i = 0; i < 256; ++i) {
if (TheMessage->cm_fields[i]) {
mptr = TheMessage->cm_fields[i];
if (i == 'A') {
strcpy(luser, mptr);
- } else if (i == 'P') {
- omprintf("Path: %s%s", mptr, nl);
- for (a = 0; a < strlen(mptr); ++a) {
- if (mptr[a] == '!') {
- strcpy(mptr, &mptr[a + 1]);
- a = 0;
- }
- }
strcpy(suser, mptr);
- } else if (i == 'U')
- omprintf("Subject: %s%s", mptr, nl);
+ }
+/****
+ "Path:" removed for now because it confuses brain-dead Microsoft shitware
+ into thinking that mail messages are newsgroup messages instead. When we
+ add NNTP support back into Citadel we'll have to add code to only output
+ this field when appropriate.
+ else if (i == 'P') {
+ cprintf("Path: %s%s", mptr, nl);
+ }
+ ****/
+ else if (i == 'U')
+ cprintf("Subject: %s%s", mptr, nl);
else if (i == 'I')
- strcpy(mid, mptr);
+ safestrncpy(mid, mptr, sizeof mid);
else if (i == 'H')
- strcpy(lnode, mptr);
+ safestrncpy(lnode, mptr, sizeof lnode);
+ else if (i == 'F')
+ safestrncpy(fuser, mptr, sizeof fuser);
else if (i == 'O')
- omprintf("X-Citadel-Room: %s%s",
+ cprintf("X-Citadel-Room: %s%s",
mptr, nl);
else if (i == 'N')
- strcpy(snode, mptr);
+ safestrncpy(snode, mptr, sizeof snode);
else if (i == 'R')
- omprintf("To: %s%s", mptr, nl);
+ cprintf("To: %s%s", mptr, nl);
else if (i == 'T') {
- xtime = atol(mptr);
- omprintf("Date: %s", asctime(localtime(&xtime)));
+ datestring(datestamp, sizeof datestamp, atol(mptr),
+ DATESTRING_RFC822 );
+ cprintf("Date: %s%s", datestamp, nl);
}
}
}
}
+ for (i=0; i<strlen(suser); ++i) {
+ suser[i] = tolower(suser[i]);
+ if (!isalnum(suser[i])) suser[i]='_';
+ }
+
if (mode == MT_RFC822) {
if (!strcasecmp(snode, NODENAME)) {
strcpy(snode, FQDN);
}
- omprintf("Message-ID: <%s@%s>%s", mid, snode, nl);
+
+ /* Construct a fun message id */
+ cprintf("Message-ID: <%s", mid);
+ if (strchr(mid, '@')==NULL) {
+ cprintf("@%s", snode);
+ }
+ cprintf(">%s", nl);
+
PerformUserHooks(luser, (-1L), EVT_OUTPUTMSG);
- omprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
- omprintf("Organization: %s%s", lnode, nl);
+
+ if (strlen(fuser) > 0) {
+ cprintf("From: %s (%s)%s", fuser, luser, nl);
+ }
+ else {
+ cprintf("From: %s@%s (%s)%s", suser, snode, luser, nl);
+ }
+
+ cprintf("Organization: %s%s", lnode, nl);
}
/* end header processing loop ... at this point, we're in the text */
mptr = TheMessage->cm_fields['M'];
/* Tell the client about the MIME parts in this message */
- if (TheMessage->cm_format_type == FMT_RFC822) { /* legacy text dump */
+ if (TheMessage->cm_format_type == FMT_RFC822) {
if (mode == MT_CITADEL) {
- mime_parser(mptr, NULL, *list_this_part);
+ mime_parser(mptr, NULL,
+ *list_this_part, NULL, NULL,
+ NULL, 0);
}
else if (mode == MT_MIME) { /* list parts only */
- mime_parser(mptr, NULL, *list_this_part);
+ mime_parser(mptr, NULL,
+ *list_this_part, NULL, NULL,
+ NULL, 0);
+ if (do_proto) cprintf("000\n");
+ return(om_ok);
+ }
+ else if (mode == MT_RFC822) { /* unparsed RFC822 dump */
+ /* FIXME ... we have to put some code in here to avoid
+ * printing duplicate header information when both
+ * Citadel and RFC822 headers exist. Preference should
+ * probably be given to the RFC822 headers.
+ */
+ while (ch=*(mptr++), ch!=0) {
+ if (ch==13) ;
+ else if (ch==10) cprintf("%s", nl);
+ else cprintf("%c", ch);
+ }
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
}
if (headers_only) {
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
/* signify start of msg text */
if (mode == MT_CITADEL)
if (do_proto) cprintf("text\n");
- /* if ((mode == MT_RFC822) && (TheMessage->cm_format_type != FMT_RFC822)) { */
if (mode == MT_RFC822) {
- omprintf("%s", nl);
+ if (TheMessage->cm_fields['U'] == NULL) {
+ cprintf("Subject: (no subject)%s", nl);
+ }
+ cprintf("%s", nl);
}
/* If the format type on disk is 1 (fixed-format), then we want
if (ch == 13)
ch = 10;
if ((ch == 10) || (strlen(buf) > 250)) {
- omprintf("%s%s", buf, nl);
+ cprintf("%s%s", buf, nl);
strcpy(buf, "");
} else {
buf[strlen(buf) + 1] = 0;
}
}
if (strlen(buf) > 0)
- omprintf("%s%s", buf, nl);
+ cprintf("%s%s", buf, nl);
}
/* If the message on disk is format 0 (Citadel vari-format), we
* message to the reader's screen width.
*/
if (TheMessage->cm_format_type == FMT_CITADEL) {
- omfmout(mptr);
+ memfmout(80, mptr, 0, nl);
}
/* If the message on disk is format 4 (MIME), we've gotta hand it
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);
+ mime_parser(mptr, NULL,
+ *fixed_output, *fixed_output_pre, *fixed_output_post,
+ NULL, 0);
}
/* now we're done */
if (do_proto) cprintf("000\n");
- CtdlFreeMessage(TheMessage);
return(om_ok);
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, NULL, -1, 0);
+ CtdlOutputMsg(msgid, MT_CITADEL, headers_only, 1, 0);
return;
}
msgid = extract_long(cmdbuf, 0);
headers_only = extract_int(cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, NULL, -1, 1);
+ CtdlOutputMsg(msgid, MT_RFC822, headers_only, 1, 1);
}
return;
}
- cprintf("%d %ld\n", BINARY_FOLLOWS, smr.len);
+ cprintf("%d %ld\n", BINARY_FOLLOWS, (long)smr.len);
client_write(smr.ser, smr.len);
phree(smr.ser);
}
/*
- * display a message (mode 4 - MIME) (FIX ... still evolving, not complete)
+ * display a message (mode 4 - MIME) (FIXME ... still evolving, not complete)
*/
void cmd_msg4(char *cmdbuf)
{
long msgid;
msgid = extract_long(cmdbuf, 0);
- CtdlOutputMsg(msgid, MT_MIME, 0, 1, NULL, -1, 0);
+ CtdlOutputMsg(msgid, MT_MIME, 0, 1, 0);
}
/*
{
long msgid;
- CtdlAllocUserData(SYM_DESIRED_SECTION, 64);
+ CtdlAllocUserData(SYM_DESIRED_SECTION, SIZ);
msgid = extract_long(cmdbuf, 0);
extract(desired_section, cmdbuf, 1);
- CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, NULL, -1, 1);
+ CtdlOutputMsg(msgid, MT_DOWNLOAD, 0, 1, 1);
}
* Message base operation to send a message to the master file
* (returns new message number)
*
- * This is the back end for CtdlSaveMsg() and should not be directly
+ * This is the back end for CtdlSubmitMsg() and should not be directly
* called by server-side modules.
*
*/
long send_message(struct CtdlMessage *msg, /* pointer to buffer */
- int generate_id, /* generate 'I' field? */
FILE *save_a_copy) /* save a copy to disk? */
{
long newmsgid;
long retval;
- char msgidbuf[32];
+ char msgidbuf[SIZ];
struct ser_ret smr;
/* Get a new message number */
newmsgid = get_new_message_number();
- sprintf(msgidbuf, "%ld", newmsgid);
+ snprintf(msgidbuf, sizeof msgidbuf, "%ld@%s", newmsgid, config.c_fqdn);
- if (generate_id) {
+ /* Generate an ID if we don't have one already */
+ if (msg->cm_fields['I']==NULL) {
msg->cm_fields['I'] = strdoop(msgidbuf);
}
}
/* Write our little bundle of joy into the message base */
- begin_critical_section(S_MSGMAIN);
if (cdb_store(CDB_MSGMAIN, &newmsgid, sizeof(long),
smr.ser, smr.len) < 0) {
lprintf(2, "Can't store message\n");
} else {
retval = newmsgid;
}
- end_critical_section(S_MSGMAIN);
/* If the caller specified that a copy should be saved to a particular
* file handle, do that now too.
ret->len = ret->len +
strlen(msg->cm_fields[(int)forder[i]]) + 2;
- lprintf(9, "calling malloc\n");
+ lprintf(9, "serialize_message() calling malloc(%ld)\n", (long)ret->len);
ret->ser = mallok(ret->len);
if (ret->ser == NULL) {
ret->len = 0;
strcpy(&ret->ser[wlen], msg->cm_fields[(int)forder[i]]);
wlen = wlen + strlen(msg->cm_fields[(int)forder[i]]) + 1;
}
- if (ret->len != wlen) lprintf(3, "ERROR: len=%d wlen=%d\n",
- ret->len, wlen);
+ if (ret->len != wlen) lprintf(3, "ERROR: len=%ld wlen=%ld\n",
+ (long)ret->len, (long)wlen);
return;
}
/*
* Back end for the ReplicationChecks() function
*/
-void check_repl(long msgnum) {
+void check_repl(long msgnum, void *userdata) {
struct CtdlMessage *msg;
time_t timestamp = (-1L);
lprintf(9, "older!\n");
/* Existing isn't newer? Then delete the old one(s). */
- CtdlDeleteMessages(CC->quickroom.QRname, msgnum, NULL);
+ CtdlDeleteMessages(CC->quickroom.QRname, msgnum, "");
}
memset(template, 0, sizeof(struct CtdlMessage));
template->cm_fields['E'] = strdoop(msg->cm_fields['E']);
- CtdlForEachMessage(MSGS_ALL, 0L, NULL, template, check_repl);
+ CtdlForEachMessage(MSGS_ALL, 0L, (-127), NULL, template,
+ check_repl, NULL);
/* If a newer message exists with the same Extended ID, abort
* this save.
/*
- * Save a message to disk
+ * Save a message to disk and submit it into the delivery system.
*/
-long CtdlSaveMsg(struct CtdlMessage *msg, /* message to save */
- char *rec, /* Recipient (mail) */
- char *force, /* force a particular room? */
- int mailtype, /* local or remote type */
- int generate_id) /* 1 = generate 'I' field */
-{
- char aaa[100];
+long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */
+ struct recptypes *recps, /* recipients (if mail) */
+ char *force /* force a particular room? */
+) {
+ char aaa[SIZ];
char hold_rm[ROOMNAMELEN];
char actual_rm[ROOMNAMELEN];
char force_room[ROOMNAMELEN];
- char content_type[256]; /* We have to learn this */
- char recipient[256];
+ char content_type[SIZ]; /* We have to learn this */
+ char recipient[SIZ];
long newmsgid;
char *mptr = NULL;
struct usersupp userbuf;
- int a;
- struct SuppMsgInfo smi;
+ int a, i;
+ struct MetaData smi;
FILE *network_fp = NULL;
static int seqnum = 1;
- struct CtdlMessage *imsg;
+ struct CtdlMessage *imsg = NULL;
char *instr;
+ struct ser_ret smr;
+ char *hold_R, *hold_D;
- lprintf(9, "CtdlSaveMsg() called\n");
+ lprintf(9, "CtdlSubmitMsg() called\n");
if (is_valid_message(msg) == 0) return(-1); /* self check */
/* If this message has no timestamp, we take the liberty of
*/
if (msg->cm_fields['T'] == NULL) {
lprintf(9, "Generating timestamp\n");
- sprintf(aaa, "%ld", time(NULL));
+ snprintf(aaa, sizeof aaa, "%ld", (long)time(NULL));
msg->cm_fields['T'] = strdoop(aaa);
}
strcpy(force_room, force);
- /* Strip non-printable characters out of the recipient name */
- strcpy(recipient, rec);
- for (a = 0; a < strlen(recipient); ++a)
- if (!isprint(recipient[a]))
- 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");
if (msg->cm_fields['M'] == NULL) {
/* advance past header fields */
mptr = msg->cm_fields['M'];
a = strlen(mptr);
- while (--a) {
+ while ((--a) > 0) {
if (!strncasecmp(mptr, "Content-type: ", 14)) {
safestrncpy(content_type, mptr,
sizeof(content_type));
lprintf(9, "Switching rooms\n");
strcpy(hold_rm, CC->quickroom.QRname);
strcpy(actual_rm, CC->quickroom.QRname);
+ if (recps != NULL) {
+ strcpy(actual_rm, SENTITEMS);
+ }
/* If the user is a twit, move to the twit room for posting */
lprintf(9, "Handling twit stuff\n");
}
lprintf(9, "Possibly relocating\n");
- if (strcasecmp(actual_rm, CC->quickroom.QRname))
+ if (strcasecmp(actual_rm, CC->quickroom.QRname)) {
getroom(&CC->quickroom, actual_rm);
+ }
+
+ /*
+ * If this message has no O (room) field, generate one.
+ */
+ if (msg->cm_fields['O'] == NULL) {
+ msg->cm_fields['O'] = strdoop(CC->quickroom.QRname);
+ }
/* Perform "before save" hooks (aborting if any return nonzero) */
lprintf(9, "Performing before-save hooks\n");
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_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);
- network_fp = fopen(aaa, "ab+");
- if (network_fp == NULL)
- lprintf(2, "ERROR: %s\n", strerror(errno));
- }
-
/* 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 &");
- }
-
+ newmsgid = send_message(msg, NULL);
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;
- safestrncpy(smi.smi_content_type, content_type, 64);
- PutSuppMsgInfo(&smi);
+ lprintf(9, "Creating MetaData record\n");
+ memset(&smi, 0, sizeof(struct MetaData));
+ smi.meta_msgnum = newmsgid;
+ smi.meta_refcount = 0;
+ safestrncpy(smi.meta_content_type, content_type, 64);
+ PutMetaData(&smi);
/* Now figure out where to store the pointers */
lprintf(9, "Storing pointers\n");
* 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)) {
- CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
+ if ((!CC->internal_pgm) || (recps == NULL)) {
+ if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0) != 0) {
+ lprintf(3, "ERROR saving message pointer!\n");
+ CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+ }
}
/* For internet mail, drop a copy in the outbound queue room */
- if (mailtype == MES_INTERNET) {
+ if (recps != NULL)
+ if (recps->num_internet > 0) {
CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0);
}
+ /* If other rooms are specified, drop them there too. */
+ if (recps != NULL)
+ if (recps->num_room > 0)
+ for (i=0; i<num_tokens(recps->recp_room, '|'); ++i) {
+ extract(recipient, recps->recp_room, i);
+ lprintf(9, "Delivering to local room <%s>\n", recipient);
+ CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0);
+ }
+
/* Bump this user's messages posted counter. */
lprintf(9, "Updating user\n");
lgetuser(&CC->usersupp, CC->curr_user);
/* If this is private, local mail, make a copy in the
* recipient's mailbox and bump the reference count.
*/
- if ((strlen(recipient) > 0) && (mailtype == MES_LOCAL)) {
+ if (recps != NULL)
+ if (recps->num_local > 0)
+ for (i=0; i<num_tokens(recps->recp_local, '|'); ++i) {
+ extract(recipient, recps->recp_local, i);
+ lprintf(9, "Delivering private local mail to <%s>\n",
+ recipient);
if (getuser(&userbuf, recipient) == 0) {
- lprintf(9, "Delivering private mail\n");
MailboxName(actual_rm, &userbuf, MAILROOM);
CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0);
}
+ else {
+ lprintf(9, "No user <%s>\n", recipient);
+ CtdlSaveMsgPointerInRoom(AIDEROOM, newmsgid, 0);
+ }
}
/* Perform "after save" hooks */
lprintf(9, "Performing after-save hooks\n");
PerformMessageHooks(msg, EVT_AFTERSAVE);
- /* */
+ /* 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)
+ if (recps->num_ignet > 0)
+ for (i=0; i<num_tokens(recps->recp_ignet, '|'); ++i) {
+ extract(recipient, recps->recp_ignet, i);
+
+ hold_R = msg->cm_fields['R'];
+ hold_D = msg->cm_fields['D'];
+ msg->cm_fields['R'] = mallok(SIZ);
+ msg->cm_fields['D'] = mallok(SIZ);
+ extract_token(msg->cm_fields['R'], recipient, 0, '@');
+ extract_token(msg->cm_fields['D'], recipient, 1, '@');
+
+ serialize_message(&smr, msg);
+ if (smr.len > 0) {
+ snprintf(aaa, sizeof aaa,
+ "./network/spoolin/netmail.%04lx.%04x.%04x",
+ (long) getpid(), CC->cs_pid, ++seqnum);
+ network_fp = fopen(aaa, "wb+");
+ if (network_fp != NULL) {
+ fwrite(smr.ser, smr.len, 1, network_fp);
+ fclose(network_fp);
+ }
+ phree(smr.ser);
+ }
+
+ phree(msg->cm_fields['R']);
+ phree(msg->cm_fields['D']);
+ msg->cm_fields['R'] = hold_R;
+ msg->cm_fields['D'] = hold_D;
+ }
+
+ /* Go back to the room we started from */
lprintf(9, "Returning to original room\n");
if (strcasecmp(hold_rm, CC->quickroom.QRname))
getroom(&CC->quickroom, hold_rm);
- /* For internet mail, generate delivery instructions
- * (Yes, this is recursive! Deal with it!)
+ /* 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 (mailtype == MES_INTERNET) {
+ if (recps != NULL)
+ if (recps->num_internet > 0) {
lprintf(9, "Generating delivery instructions\n");
- instr = mallok(2048);
- sprintf(instr,
+ instr = mallok(SIZ * 2);
+ snprintf(instr, SIZ * 2,
"Content-type: %s\n\nmsgid|%ld\nsubmitted|%ld\n"
- "remote|%s|0||\n",
- SPOOLMIME, newmsgid, time(NULL), recipient );
+ "bounceto|%s@%s\n",
+ SPOOLMIME, newmsgid, (long)time(NULL),
+ msg->cm_fields['A'], msg->cm_fields['N']
+ );
+
+ for (i=0; i<num_tokens(recps->recp_internet, '|'); ++i) {
+ size_t tmp = strlen(instr);
+ extract(recipient, recps->recp_internet, i);
+ snprintf(&instr[tmp], SIZ * 2 - tmp,
+ "remote|%s|0||\n", recipient);
+ }
imsg = mallok(sizeof(struct CtdlMessage));
memset(imsg, 0, sizeof(struct CtdlMessage));
imsg->cm_format_type = FMT_RFC822;
imsg->cm_fields['A'] = strdoop("Citadel");
imsg->cm_fields['M'] = instr;
- CtdlSaveMsg(imsg, "", SMTP_SPOOLOUT_ROOM, MES_LOCAL, 1);
+ CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM);
CtdlFreeMessage(imsg);
}
msg->cm_fields['R'] = strdoop(to);
msg->cm_fields['M'] = strdoop(text);
- CtdlSaveMsg(msg, "", room, MES_LOCAL, 1);
+ CtdlSubmitMsg(msg, NULL, room);
CtdlFreeMessage(msg);
syslog(LOG_NOTICE, text);
}
char *exist /* if non-null, append to it;
exist is ALWAYS freed */
) {
- char buf[256];
+ char buf[SIZ];
+ int linelen;
size_t message_len = 0;
size_t buffer_len = 0;
- char *ptr, *append;
+ char *ptr;
char *m;
if (exist == NULL) {
m = mallok(4096);
+ m[0] = 0;
+ buffer_len = 4096;
+ message_len = 0;
}
else {
- m = reallok(exist, strlen(exist) + 4096);
- if (m == NULL) phree(exist);
+ message_len = strlen(exist);
+ buffer_len = message_len + 4096;
+ m = reallok(exist, buffer_len);
+ if (m == NULL) {
+ phree(exist);
+ return m;
+ }
}
+
+ /* flush the input if we have nowhere to store it */
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) ) {
+ /* strip trailing newline type stuff */
+ if (buf[strlen(buf)-1]==10) buf[strlen(buf)-1]=0;
+ if (buf[strlen(buf)-1]==13) buf[strlen(buf)-1]=0;
+
+ linelen = strlen(buf);
+
/* augment the buffer if we have to */
- if ((message_len + strlen(buf) + 2) > buffer_len) {
+ if ((message_len + linelen + 2) > buffer_len) {
lprintf(9, "realloking\n");
ptr = reallok(m, (buffer_len * 2) );
if (ptr == NULL) { /* flush if can't allocate */
} else {
buffer_len = (buffer_len * 2);
m = ptr;
- append = NULL;
- lprintf(9, "buffer_len is %d\n", buffer_len);
+ lprintf(9, "buffer_len is %ld\n", (long)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;
+ /* Add the new line to the buffer. NOTE: this loop must avoid
+ * using functions like strcat() and strlen() because they
+ * traverse the entire buffer upon every call, and doing that
+ * for a multi-megabyte message slows it down beyond usability.
+ */
+ strcpy(&m[message_len], buf);
+ m[message_len + linelen] = '\n';
+ m[message_len + linelen + 1] = 0;
+ message_len = message_len + linelen + 1;
/* if we've hit the max msg length, flush the rest */
if (message_len >= maxlen) {
- while ( (client_gets(buf)>0) && strcmp(buf, terminator)) ;;
+ while ( (client_gets(buf)>0)
+ && strcmp(buf, terminator)) ;;
return(m);
}
}
* Build a binary message to be saved on disk.
*/
-struct CtdlMessage *make_message(
+static struct CtdlMessage *make_message(
struct usersupp *author, /* author's usersupp structure */
char *recipient, /* NULL if it's not mail */
char *room, /* room where it's going */
int type, /* see MES_ types in header file */
- int net_type, /* see MES_ types in header file */
- int format_type, /* local or remote (see citadel.h) */
- char *fake_name) /* who we're masquerading as */
-{
-
- int a;
- char dest_node[32];
- char buf[256];
+ int format_type, /* variformat, plain text, MIME... */
+ char *fake_name, /* who we're masquerading as */
+ char *subject /* Subject (optional) */
+) {
+ char dest_node[SIZ];
+ char buf[SIZ];
struct CtdlMessage *msg;
msg = mallok(sizeof(struct CtdlMessage));
/* Don't confuse the poor folks if it's not routed mail. */
strcpy(dest_node, "");
- /* If net_type is MES_BINARY, split out the destination node. */
- if (net_type == MES_BINARY) {
- strcpy(dest_node, NODENAME);
- for (a = 0; a < strlen(recipient); ++a) {
- if (recipient[a] == '@') {
- recipient[a] = 0;
- strcpy(dest_node, &recipient[a + 1]);
- }
- }
- }
-
- /* if net_type is MES_INTERNET, set the dest node to 'internet' */
- if (net_type == MES_INTERNET) {
- strcpy(dest_node, "internet");
- }
-
- while (isspace(recipient[strlen(recipient) - 1]))
- recipient[strlen(recipient) - 1] = 0;
+ striplt(recipient);
- sprintf(buf, "cit%ld", author->usernum); /* Path */
+ snprintf(buf, sizeof buf, "cit%ld", author->usernum); /* Path */
msg->cm_fields['P'] = strdoop(buf);
- sprintf(buf, "%ld", time(NULL)); /* timestamp */
+ snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */
msg->cm_fields['T'] = strdoop(buf);
if (fake_name[0]) /* author */
else
msg->cm_fields['A'] = strdoop(author->fullname);
- if (CC->quickroom.QRflags & QR_MAILBOX) /* room */
+ if (CC->quickroom.QRflags & QR_MAILBOX) { /* room */
msg->cm_fields['O'] = strdoop(&CC->quickroom.QRname[11]);
- else
+ }
+ else {
msg->cm_fields['O'] = strdoop(CC->quickroom.QRname);
+ }
msg->cm_fields['N'] = strdoop(NODENAME); /* nodename */
msg->cm_fields['H'] = strdoop(HUMANNODE); /* hnodename */
- if (recipient[0] != 0)
+ if (recipient[0] != 0) {
msg->cm_fields['R'] = strdoop(recipient);
- if (dest_node[0] != 0)
+ }
+ if (dest_node[0] != 0) {
msg->cm_fields['D'] = strdoop(dest_node);
+ }
+ if ( (author == &CC->usersupp) && (CC->cs_inet_email != NULL) ) {
+ msg->cm_fields['F'] = strdoop(CC->cs_inet_email);
+ }
+
+ if (subject != NULL) {
+ striplt(subject);
+ if (strlen(subject) > 0) {
+ msg->cm_fields['U'] = strdoop(subject);
+ }
+ }
msg->cm_fields['M'] = CtdlReadMessageBody("000",
config.c_maxmsglen, NULL);
-
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) {
+
+ if (!(CC->logged_in)) {
+ snprintf(errmsgbuf, n, "Not logged in.");
+ return (ERROR + NOT_LOGGED_IN);
+ }
+
+ if ((CC->usersupp.axlevel < 2)
+ && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)) {
+ snprintf(errmsgbuf, n, "Need to be validated to enter "
+ "(except in %s> to sysop)", MAILROOM);
+ return (ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ if ((CC->usersupp.axlevel < 4)
+ && (CC->quickroom.QRflags & QR_NETWORK)) {
+ snprintf(errmsgbuf, n, "Need net privileges to enter here.");
+ return (ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ if ((CC->usersupp.axlevel < 6)
+ && (CC->quickroom.QRflags & QR_READONLY)) {
+ snprintf(errmsgbuf, n, "Sorry, this is a read-only room.");
+ return (ERROR + HIGHER_ACCESS_REQUIRED);
+ }
+
+ strcpy(errmsgbuf, "Ok");
+ return(0);
+}
+
+
+/*
+ * Validate recipients, count delivery types and errors, and handle aliasing
+ * FIXME check for dupes!!!!!
+ */
+struct recptypes *validate_recipients(char *recipients) {
+ struct recptypes *ret;
+ char this_recp[SIZ];
+ char this_recp_cooked[SIZ];
+ char append[SIZ];
+ int num_recps;
+ int i, j;
+ int mailtype;
+ int invalid;
+ struct usersupp tempUS;
+ struct quickroom tempQR;
+
+ /* Initialize */
+ ret = (struct recptypes *) malloc(sizeof(struct recptypes));
+ if (ret == NULL) return(NULL);
+ memset(ret, 0, sizeof(struct recptypes));
+
+ ret->num_local = 0;
+ ret->num_internet = 0;
+ ret->num_ignet = 0;
+ ret->num_error = 0;
+ ret->num_room = 0;
+
+ if (recipients == NULL) {
+ num_recps = 0;
+ }
+ else if (strlen(recipients) == 0) {
+ num_recps = 0;
+ }
+ else {
+ /* Change all valid separator characters to commas */
+ for (i=0; i<strlen(recipients); ++i) {
+ if ((recipients[i] == ';') || (recipients[i] == '|')) {
+ recipients[i] = ',';
+ }
+ }
+
+ /* Count 'em up */
+ num_recps = num_tokens(recipients, ',');
+ }
+
+ if (num_recps > 0) for (i=0; i<num_recps; ++i) {
+ extract_token(this_recp, recipients, i, ',');
+ striplt(this_recp);
+ lprintf(9, "Evaluating recipient #%d <%s>\n", i, this_recp);
+ mailtype = alias(this_recp);
+ mailtype = alias(this_recp);
+ mailtype = alias(this_recp);
+ for (j=0; j<=strlen(this_recp); ++j) {
+ if (this_recp[j]=='_') {
+ this_recp_cooked[j] = ' ';
+ }
+ else {
+ this_recp_cooked[j] = this_recp[j];
+ }
+ }
+ invalid = 0;
+ switch(mailtype) {
+ case MES_LOCAL:
+ if (!strcasecmp(this_recp, "sysop")) {
+ ++ret->num_room;
+ strcpy(this_recp, AIDEROOM);
+ if (strlen(ret->recp_room) > 0) {
+ strcat(ret->recp_room, "|");
+ }
+ strcat(ret->recp_room, this_recp);
+ }
+ else if (getuser(&tempUS, this_recp) == 0) {
+ ++ret->num_local;
+ strcpy(this_recp, tempUS.fullname);
+ if (strlen(ret->recp_local) > 0) {
+ strcat(ret->recp_local, "|");
+ }
+ strcat(ret->recp_local, this_recp);
+ }
+ else if (getuser(&tempUS, this_recp_cooked) == 0) {
+ ++ret->num_local;
+ strcpy(this_recp, tempUS.fullname);
+ if (strlen(ret->recp_local) > 0) {
+ strcat(ret->recp_local, "|");
+ }
+ strcat(ret->recp_local, this_recp);
+ }
+ else if ( (!strncasecmp(this_recp, "room_", 5))
+ && (!getroom(&tempQR, &this_recp_cooked[5])) ) {
+ ++ret->num_room;
+ if (strlen(ret->recp_room) > 0) {
+ strcat(ret->recp_room, "|");
+ }
+ strcat(ret->recp_room, &this_recp_cooked[5]);
+ }
+ else {
+ ++ret->num_error;
+ invalid = 1;
+ }
+ break;
+ case MES_INTERNET:
+ ++ret->num_internet;
+ if (strlen(ret->recp_internet) > 0) {
+ strcat(ret->recp_internet, "|");
+ }
+ strcat(ret->recp_internet, this_recp);
+ break;
+ case MES_IGNET:
+ ++ret->num_ignet;
+ if (strlen(ret->recp_ignet) > 0) {
+ strcat(ret->recp_ignet, "|");
+ }
+ strcat(ret->recp_ignet, this_recp);
+ break;
+ case MES_ERROR:
+ ++ret->num_error;
+ invalid = 1;
+ break;
+ }
+ if (invalid) {
+ if (strlen(ret->errormsg) == 0) {
+ snprintf(append, sizeof append,
+ "Invalid recipient: %s",
+ this_recp);
+ }
+ else {
+ snprintf(append, sizeof append,
+ ", %s", this_recp);
+ }
+ if ( (strlen(ret->errormsg) + strlen(append)) < SIZ) {
+ strcat(ret->errormsg, append);
+ }
+ }
+ else {
+ if (strlen(ret->display_recp) == 0) {
+ 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);
+ }
+ }
+ }
+
+ if ((ret->num_local + ret->num_internet + ret->num_ignet +
+ ret->num_room + ret->num_error) == 0) {
+ ++ret->num_error;
+ strcpy(ret->errormsg, "No recipients specified.");
+ }
+
+ lprintf(9, "validate_recipients()\n");
+ lprintf(9, " local: %d <%s>\n", ret->num_local, ret->recp_local);
+ lprintf(9, " room: %d <%s>\n", ret->num_room, ret->recp_room);
+ lprintf(9, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet);
+ lprintf(9, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet);
+ lprintf(9, " error: %d <%s>\n", ret->num_error, ret->errormsg);
+
+ return(ret);
+}
void cmd_ent0(char *entargs)
{
int post = 0;
- char recipient[256];
+ char recp[SIZ];
+ char masquerade_as[SIZ];
int anon_flag = 0;
int format_type = 0;
- char newusername[256];
+ char newusername[SIZ];
struct CtdlMessage *msg;
- int a, b;
- int e = 0;
- int mtsflag = 0;
- struct usersupp tempUS;
- char buf[256];
+ int anonymous = 0;
+ char errmsg[SIZ];
+ int err = 0;
+ struct recptypes *valid = NULL;
+ char subject[SIZ];
post = extract_int(entargs, 0);
- extract(recipient, entargs, 1);
+ extract(recp, entargs, 1);
anon_flag = extract_int(entargs, 2);
format_type = extract_int(entargs, 3);
+ extract(subject, entargs, 4);
/* first check to make sure the request is valid. */
- if (!(CC->logged_in)) {
- cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN);
- return;
- }
- if ((CC->usersupp.axlevel < 2) && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)) {
- cprintf("%d Need to be validated to enter ",
- ERROR + HIGHER_ACCESS_REQUIRED);
- cprintf("(except in %s> to sysop)\n", MAILROOM);
- return;
- }
- if ((CC->usersupp.axlevel < 4) && (CC->quickroom.QRflags & QR_NETWORK)) {
- cprintf("%d Need net privileges to enter here.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
- return;
- }
- if ((CC->usersupp.axlevel < 6) && (CC->quickroom.QRflags & QR_READONLY)) {
- cprintf("%d Sorry, this is a read-only room.\n",
- ERROR + HIGHER_ACCESS_REQUIRED);
+ err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, sizeof errmsg);
+ if (err) {
+ cprintf("%d %s\n", err, errmsg);
return;
}
- mtsflag = 0;
+ /* Check some other permission type things. */
if (post == 2) {
- if (CC->usersupp.axlevel < 6) {
+ if (CC->usersupp.axlevel < 6) {
cprintf("%d You don't have permission to masquerade.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
extract(newusername, entargs, 4);
- memset(CC->fake_postname, 0, 32);
- strcpy(CC->fake_postname, newusername);
- cprintf("%d Ok\n", OK);
+ memset(CC->fake_postname, 0, sizeof(CC->fake_postname) );
+ safestrncpy(CC->fake_postname, newusername,
+ sizeof(CC->fake_postname) );
+ cprintf("%d ok\n", OK);
return;
}
CC->cs_flags |= CS_POSTING;
- buf[0] = 0;
- if (CC->quickroom.QRflags & QR_MAILBOX) {
- if (CC->usersupp.axlevel >= 2) {
- strcpy(buf, recipient);
- } else
- strcpy(buf, "sysop");
- e = alias(buf); /* alias and mail type */
- if ((buf[0] == 0) || (e == MES_ERROR)) {
- cprintf("%d Unknown address - cannot send message.\n",
- ERROR + NO_SUCH_USER);
+ /* In the Mail> room we have to behave a little differently --
+ * make sure the user has specified at least one recipient. Then
+ * validate the recipient(s).
+ */
+ if ( (CC->quickroom.QRflags & QR_MAILBOX)
+ && (!strcasecmp(&CC->quickroom.QRname[11], MAILROOM)) ) {
+
+ if (CC->usersupp.axlevel < 2) {
+ strcpy(recp, "sysop");
+ }
+
+ valid = validate_recipients(recp);
+ if (valid->num_error > 0) {
+ cprintf("%d %s\n",
+ ERROR + NO_SUCH_USER, valid->errormsg);
+ phree(valid);
return;
}
- if ((e != MES_LOCAL) && (CC->usersupp.axlevel < 4)) {
- cprintf("%d Net privileges required for network mail.\n",
+
+ if ( ( (valid->num_internet + valid->num_ignet) > 0)
+ && (CC->usersupp.axlevel < 4) ) {
+ cprintf("%d Higher access required for network mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
+ phree(valid);
return;
}
- if ((RESTRICT_INTERNET == 1) && (e == MES_INTERNET)
+
+ if ((RESTRICT_INTERNET == 1) && (valid->num_internet > 0)
&& ((CC->usersupp.flags & US_INTERNET) == 0)
&& (!CC->internal_pgm)) {
cprintf("%d You don't have access to Internet mail.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
+ phree(valid);
return;
}
- if (!strcasecmp(buf, "sysop")) {
- mtsflag = 1;
- goto SKFALL;
- }
- if (e != MES_LOCAL)
- goto SKFALL; /* don't search local file */
- if (!strcasecmp(buf, CC->usersupp.fullname)) {
- cprintf("%d Can't send mail to yourself!\n",
- ERROR + NO_SUCH_USER);
- return;
- }
- /* Check to make sure the user exists; also get the correct
- * upper/lower casing of the name.
- */
- a = getuser(&tempUS, buf);
- if (a != 0) {
- cprintf("%d No such user.\n", ERROR + NO_SUCH_USER);
- return;
- }
- strcpy(buf, tempUS.fullname);
+
}
-SKFALL: b = MES_NORMAL;
- if (CC->quickroom.QRflags & QR_ANONONLY)
- b = MES_ANON;
+ /* Is this a room which has anonymous-only or anonymous-option? */
+ anonymous = MES_NORMAL;
+ if (CC->quickroom.QRflags & QR_ANONONLY) {
+ anonymous = MES_ANONONLY;
+ }
if (CC->quickroom.QRflags & QR_ANONOPT) {
- if (anon_flag == 1)
- b = MES_AN2;
+ if (anon_flag == 1) { /* only if the user requested it */
+ anonymous = MES_ANONOPT;
+ }
+ }
+
+ if ((CC->quickroom.QRflags & QR_MAILBOX) == 0) {
+ recp[0] = 0;
}
- if ((CC->quickroom.QRflags & QR_MAILBOX) == 0)
- buf[0] = 0;
/* If we're only checking the validity of the request, return
* success without creating the message.
*/
if (post == 0) {
- cprintf("%d %s\n", OK, buf);
+ cprintf("%d %s\n", OK,
+ ((valid != NULL) ? valid->display_recp : "") );
+ phree(valid);
return;
}
- cprintf("%d send message\n", SEND_LISTING);
+ /* Handle author masquerading */
+ if (CC->fake_postname[0]) {
+ strcpy(masquerade_as, CC->fake_postname);
+ }
+ else if (CC->fake_username[0]) {
+ strcpy(masquerade_as, CC->fake_username);
+ }
+ else {
+ strcpy(masquerade_as, "");
+ }
/* Read in the message from the client. */
- if (CC->fake_postname[0])
- msg = make_message(&CC->usersupp, buf,
- CC->quickroom.QRname, b, e, format_type,
- CC->fake_postname);
- else if (CC->fake_username[0])
- msg = make_message(&CC->usersupp, buf,
- CC->quickroom.QRname, b, e, format_type,
- CC->fake_username);
- else
- msg = make_message(&CC->usersupp, buf,
- CC->quickroom.QRname, b, e, format_type, "");
+ cprintf("%d send message\n", SEND_LISTING);
+ msg = make_message(&CC->usersupp, recp,
+ CC->quickroom.QRname, anonymous, format_type,
+ masquerade_as, subject);
- if (msg != NULL)
- CtdlSaveMsg(msg, buf, (mtsflag ? AIDEROOM : ""), e, 1);
+ if (msg != NULL) {
+ CtdlSubmitMsg(msg, valid, "");
CtdlFreeMessage(msg);
+ }
CC->fake_postname[0] = '\0';
+ phree(valid);
return;
}
-/*
- * message entry - mode 3 (raw)
- */
-void cmd_ent3(char *entargs)
-{
- char recp[256];
- int a;
- int e = 0;
- int valid_msg = 1;
- unsigned char ch, which_field;
- struct usersupp tempUS;
- long msglen;
- struct CtdlMessage *msg;
- char *tempbuf;
-
- if (CC->internal_pgm == 0) {
- cprintf("%d This command is for internal programs only.\n",
- ERROR);
- return;
- }
-
- /* See if there's a recipient, but make sure it's a real one */
- extract(recp, entargs, 1);
- for (a = 0; a < strlen(recp); ++a)
- if (!isprint(recp[a]))
- strcpy(&recp[a], &recp[a + 1]);
- while (isspace(recp[0]))
- strcpy(recp, &recp[1]);
- while (isspace(recp[strlen(recp) - 1]))
- recp[strlen(recp) - 1] = 0;
-
- /* If we're in Mail, check the recipient */
- if (strlen(recp) > 0) {
- e = alias(recp); /* alias and mail type */
- if ((recp[0] == 0) || (e == MES_ERROR)) {
- cprintf("%d Unknown address - cannot send message.\n",
- ERROR + NO_SUCH_USER);
- return;
- }
- if (e == MES_LOCAL) {
- a = getuser(&tempUS, recp);
- if (a != 0) {
- cprintf("%d No such user.\n",
- ERROR + NO_SUCH_USER);
- return;
- }
- }
- }
-
- /* At this point, message has been approved. */
- if (extract_int(entargs, 0) == 0) {
- cprintf("%d OK to send\n", OK);
- return;
- }
-
- msglen = extract_long(entargs, 2);
- msg = mallok(sizeof(struct CtdlMessage));
- if (msg == NULL) {
- cprintf("%d Out of memory\n", ERROR+INTERNAL_ERROR);
- return;
- }
-
- memset(msg, 0, sizeof(struct CtdlMessage));
- tempbuf = mallok(msglen);
- if (tempbuf == NULL) {
- cprintf("%d Out of memory\n", ERROR+INTERNAL_ERROR);
- phree(msg);
- return;
- }
-
- cprintf("%d %ld\n", SEND_BINARY, msglen);
-
- client_read(&ch, 1); /* 0xFF magic number */
- msg->cm_magic = CTDLMESSAGE_MAGIC;
- client_read(&ch, 1); /* anon type */
- msg->cm_anon_type = ch;
- client_read(&ch, 1); /* format type */
- msg->cm_format_type = ch;
- msglen = msglen - 3;
-
- while (msglen > 0) {
- client_read(&which_field, 1);
- if (!isalpha(which_field)) valid_msg = 0;
- --msglen;
- tempbuf[0] = 0;
- do {
- client_read(&ch, 1);
- --msglen;
- a = strlen(tempbuf);
- tempbuf[a+1] = 0;
- tempbuf[a] = ch;
- } while ( (ch != 0) && (msglen > 0) );
- if (valid_msg)
- msg->cm_fields[which_field] = strdoop(tempbuf);
- }
-
- msg->cm_flags = CM_SKIP_HOOKS;
- if (valid_msg) CtdlSaveMsg(msg, recp, "", e, 0);
- CtdlFreeMessage(msg);
- phree(tempbuf);
-}
-
-
/*
* 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 */
long dmsgnum, /* or "0" for any */
- char *content_type /* or NULL for any */
+ char *content_type /* or "" for any */
)
{
struct quickroom qrbuf;
struct cdbdata *cdbfr;
long *msglist = NULL;
+ long *dellist = NULL;
int num_msgs = 0;
int i;
int num_deleted = 0;
int delete_this;
- struct SuppMsgInfo smi;
+ struct MetaData smi;
lprintf(9, "CtdlDeleteMessages(%s, %ld, %s)\n",
room_name, dmsgnum, content_type);
if (cdbfr != NULL) {
msglist = mallok(cdbfr->len);
+ dellist = mallok(cdbfr->len);
memcpy(msglist, cdbfr->ptr, cdbfr->len);
num_msgs = cdbfr->len / sizeof(long);
cdb_free(cdbfr);
if ((dmsgnum == 0L) || (msglist[i] == dmsgnum)) {
delete_this |= 0x01;
}
- if (content_type == NULL) {
+ if (strlen(content_type) == 0) {
delete_this |= 0x02;
} else {
- GetSuppMsgInfo(&smi, msglist[i]);
- if (!strcasecmp(smi.smi_content_type,
+ GetMetaData(&smi, msglist[i]);
+ if (!strcasecmp(smi.meta_content_type,
content_type)) {
delete_this |= 0x02;
}
/* Delete message only if all bits are set */
if (delete_this == 0x03) {
- AdjRefCount(msglist[i], -1);
+ dellist[num_deleted++] = msglist[i];
msglist[i] = 0L;
- ++num_deleted;
}
}
msglist, (num_msgs * sizeof(long)));
qrbuf.QRhighest = msglist[num_msgs - 1];
- phree(msglist);
}
lputroom(&qrbuf);
+
+ /* Go through the messages we pulled out of the index, and decrement
+ * their reference counts by 1. If this is the only room the message
+ * was in, the reference count will reach zero and the message will
+ * automatically be deleted from the database. We do this in a
+ * separate pass because there might be plug-in hooks getting called,
+ * and we don't want that happening during an S_QUICKROOM critical
+ * section.
+ */
+ if (num_deleted) for (i=0; i<num_deleted; ++i) {
+ PerformDeleteHooks(qrbuf.QRname, dellist[i]);
+ AdjRefCount(dellist[i], -1);
+ }
+
+ /* Now free the memory we used, and go away. */
+ if (msglist != NULL) phree(msglist);
+ if (dellist != NULL) phree(dellist);
lprintf(9, "%d message(s) deleted.\n", num_deleted);
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) {
+ getuser(&CC->usersupp, CC->curr_user);
+ if ((CC->usersupp.axlevel < 6)
+ && (CC->usersupp.usernum != CC->quickroom.QRroomaide)
+ && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)
+ && (!(CC->internal_pgm))) {
+ return(0);
+ }
+ return(1);
+}
+
+
+
/*
* Delete message from current room
*/
long delnum;
int num_deleted;
- getuser(&CC->usersupp, CC->curr_user);
- if ((CC->usersupp.axlevel < 6)
- && (CC->usersupp.usernum != CC->quickroom.QRroomaide)
- && ((CC->quickroom.QRflags & QR_MAILBOX) == 0)
- && (!(CC->internal_pgm))) {
+ if (CtdlDoIHavePermissionToDeleteMessagesFromThisRoom() == 0) {
cprintf("%d Higher access required.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
delnum = extract_long(delstr, 0);
- num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, NULL);
+ num_deleted = CtdlDeleteMessages(CC->quickroom.QRname, delnum, "");
if (num_deleted) {
cprintf("%d %d message%s deleted.\n", OK,
}
+/*
+ * Back end API function for moves and deletes
+ */
+int CtdlCopyMsgToRoom(long msgnum, char *dest) {
+ int err;
+
+ err = CtdlSaveMsgPointerInRoom(dest, msgnum,
+ (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+ if (err != 0) return(err);
+
+ return(0);
+}
+
+
+
/*
* move or copy a message to another room
*/
void cmd_move(char *args)
{
long num;
- char targ[256];
+ char targ[SIZ];
struct quickroom qtemp;
int err;
int is_copy = 0;
targ[ROOMNAMELEN - 1] = 0;
is_copy = extract_int(args, 2);
+ if (getroom(&qtemp, targ) != 0) {
+ cprintf("%d '%s' does not exist.\n", ERROR, targ);
+ return;
+ }
+
getuser(&CC->usersupp, CC->curr_user);
+ /* Aides can move/copy */
if ((CC->usersupp.axlevel < 6)
- && (CC->usersupp.usernum != CC->quickroom.QRroomaide)) {
+ /* Roomaides can move/copy */
+ && (CC->usersupp.usernum != CC->quickroom.QRroomaide)
+ /* Permit move/copy to/from personal rooms */
+ && (!((CC->quickroom.QRflags & QR_MAILBOX)
+ && (qtemp.QRflags & QR_MAILBOX)))
+ /* Permit only copy from public to personal room */
+ && (!(is_copy && !(CC->quickroom.QRflags & QR_MAILBOX)
+ && (qtemp.QRflags & QR_MAILBOX)))) {
cprintf("%d Higher access required.\n",
ERROR + HIGHER_ACCESS_REQUIRED);
return;
}
- if (getroom(&qtemp, targ) != 0) {
- cprintf("%d '%s' does not exist.\n", ERROR, targ);
- return;
- }
-
- err = CtdlSaveMsgPointerInRoom(targ, num,
- (SM_VERIFY_GOODNESS | SM_DO_REPL_CHECK) );
+ err = CtdlCopyMsgToRoom(num, targ);
if (err != 0) {
cprintf("%d Cannot store message in %s: error %d\n",
err, targ, err);
/* 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);
+ if (is_copy == 0) {
+ CtdlDeleteMessages(CC->quickroom.QRname, num, "");
+ }
cprintf("%d Message %s.\n", OK, (is_copy ? "copied" : "moved") );
}
/*
- * GetSuppMsgInfo() - Get the supplementary record for a message
+ * GetMetaData() - Get the supplementary record for a message
*/
-void GetSuppMsgInfo(struct SuppMsgInfo *smibuf, long msgnum)
+void GetMetaData(struct MetaData *smibuf, long msgnum)
{
struct cdbdata *cdbsmi;
long TheIndex;
- memset(smibuf, 0, sizeof(struct SuppMsgInfo));
- smibuf->smi_msgnum = msgnum;
- smibuf->smi_refcount = 1; /* Default reference count is 1 */
+ memset(smibuf, 0, sizeof(struct MetaData));
+ smibuf->meta_msgnum = msgnum;
+ smibuf->meta_refcount = 1; /* Default reference count is 1 */
/* Use the negative of the message number for its supp record index */
TheIndex = (0L - msgnum);
return; /* record not found; go with defaults */
}
memcpy(smibuf, cdbsmi->ptr,
- ((cdbsmi->len > sizeof(struct SuppMsgInfo)) ?
- sizeof(struct SuppMsgInfo) : cdbsmi->len));
+ ((cdbsmi->len > sizeof(struct MetaData)) ?
+ sizeof(struct MetaData) : cdbsmi->len));
cdb_free(cdbsmi);
return;
}
/*
- * PutSuppMsgInfo() - (re)write supplementary record for a message
+ * PutMetaData() - (re)write supplementary record for a message
*/
-void PutSuppMsgInfo(struct SuppMsgInfo *smibuf)
+void PutMetaData(struct MetaData *smibuf)
{
long TheIndex;
- /* Use the negative of the message number for its supp record index */
- TheIndex = (0L - smibuf->smi_msgnum);
+ /* Use the negative of the message number for the metadata db index */
+ TheIndex = (0L - smibuf->meta_msgnum);
- lprintf(9, "PuttSuppMsgInfo(%ld) - ref count is %d\n",
- smibuf->smi_msgnum, smibuf->smi_refcount);
+ lprintf(9, "PutMetaData(%ld) - ref count is %d\n",
+ smibuf->meta_msgnum, smibuf->meta_refcount);
cdb_store(CDB_MSGMAIN,
&TheIndex, sizeof(long),
- smibuf, sizeof(struct SuppMsgInfo));
+ smibuf, sizeof(struct MetaData));
}
void AdjRefCount(long msgnum, int incr)
{
- struct SuppMsgInfo smi;
+ struct MetaData smi;
long delnum;
/* This is a *tight* critical section; please keep it that way, as
* Complicating this any further will surely cause deadlock!
*/
begin_critical_section(S_SUPPMSGMAIN);
- GetSuppMsgInfo(&smi, msgnum);
+ GetMetaData(&smi, msgnum);
lprintf(9, "Ref count for message <%ld> before write is <%d>\n",
- msgnum, smi.smi_refcount);
- smi.smi_refcount += incr;
- PutSuppMsgInfo(&smi);
+ msgnum, smi.meta_refcount);
+ smi.meta_refcount += incr;
+ PutMetaData(&smi);
end_critical_section(S_SUPPMSGMAIN);
lprintf(9, "Ref count for message <%ld> after write is <%d>\n",
- msgnum, smi.smi_refcount);
+ msgnum, smi.meta_refcount);
/* If the reference count is now zero, delete the message
* (and its supplementary record as well).
*/
- if (smi.smi_refcount == 0) {
+ if (smi.meta_refcount == 0) {
lprintf(9, "Deleting message <%ld>\n", msgnum);
delnum = msgnum;
cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));
+
+ /* We have to delete the metadata record too! */
delnum = (0L - msgnum);
cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));
}
FILE *fp, *tempfp;
char filename[PATH_MAX];
- char cmdbuf[256];
- int ch;
+ char cmdbuf[SIZ];
+ char ch;
struct quickroom qrbuf;
char roomname[ROOMNAMELEN];
struct CtdlMessage *msg;
fprintf(fp, "Content-transfer-encoding: base64\n\n");
fclose(tempfp);
fclose(fp);
- sprintf(cmdbuf, "./base64 -e <%s >>%s",
+ snprintf(cmdbuf, sizeof cmdbuf, "./base64 -e <%s >>%s",
tempfilename, filename);
system(cmdbuf);
}
/* Create the requested room if we have to. */
if (getroom(&qrbuf, roomname) != 0) {
create_room(roomname,
- ( (is_mailbox != NULL) ? 4 : 3 ),
- "", 0);
+ ( (is_mailbox != NULL) ? 5 : 3 ),
+ "", 0, 1);
}
/* If the caller specified this object as unique, delete all
* other objects of this type that are currently in the room.
CtdlDeleteMessages(roomname, 0L, content_type));
}
/* Now write the data */
- CtdlSaveMsg(msg, "", roomname, MES_LOCAL, 1);
+ CtdlSubmitMsg(msg, NULL, roomname);
CtdlFreeMessage(msg);
}
-void CtdlGetSysConfigBackend(long msgnum) {
+void CtdlGetSysConfigBackend(long msgnum, void *userdata) {
config_msgnum = msgnum;
}
long msgnum;
char *conf;
struct CtdlMessage *msg;
- char buf[256];
+ char buf[SIZ];
strcpy(hold_rm, CC->quickroom.QRname);
if (getroom(&CC->quickroom, SYSCONFIGROOM) != 0) {
/* We want the last (and probably only) config in this room */
begin_critical_section(S_CONFIG);
config_msgnum = (-1L);
- CtdlForEachMessage(MSGS_LAST, 1, sysconfname, NULL,
- CtdlGetSysConfigBackend);
+ CtdlForEachMessage(MSGS_LAST, 1, (-127), sysconfname, NULL,
+ CtdlGetSysConfigBackend, NULL);
msgnum = config_msgnum;
end_critical_section(S_CONFIG);
getroom(&CC->quickroom, hold_rm);
- lprintf(9, "eggstracting...\n");
if (conf != NULL) do {
extract_token(buf, conf, 0, '\n');
- lprintf(9, "eggstracted <%s>\n", buf);
strcpy(conf, &conf[strlen(buf)+1]);
} while ( (strlen(conf)>0) && (strlen(buf)>0) );
CtdlWriteObject(SYSCONFIGROOM, sysconfname, temp, NULL, 0, 1, 0);
unlink(temp);
}
-
-