X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=9c86ba9ff4bbdbacc48efd9b6c187a283033a8f5;hb=064d34f72d3faff6967bb2aa0b0e7e664512761a;hp=2de00fd2909475770ebbcdfb4b616487e03b04e7;hpb=981c64649e8886f81cb64e31ac80d8bc56b0923d;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 2de00fd29..9c86ba9ff 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -1,23 +1,21 @@ /* - * $Id$ - * * Implements the message store. - * - * Copyright (c) 1987-2009 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * Copyright (c) 1987-2011 by the citadel.org team * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is open source software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -200,7 +198,7 @@ int alias(char *name) } if (strcasecmp(original_name, name)) { - CtdlLogPrintf(CTDL_INFO, "%s is being forwarded to %s\n", original_name, name); + syslog(LOG_INFO, "%s is being forwarded to %s\n", original_name, name); } /* Change "user @ xxx" to "user" if xxx is an alias for this host */ @@ -208,7 +206,7 @@ int alias(char *name) if (name[a] == '@') { if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) { name[a] = 0; - CtdlLogPrintf(CTDL_INFO, "Changed to <%s>\n", name); + syslog(LOG_INFO, "Changed to <%s>\n", name); } } } @@ -309,10 +307,10 @@ void headers_euid(long msgnum, void *userdata) return; } - cprintf("%ld|%s|\n", - msgnum, - (msg->cm_fields['U'] ? msg->cm_fields['U'] : "") - ); + cprintf("%ld|%s|%s\n", + msgnum, + (msg->cm_fields['E'] ? msg->cm_fields['E'] : ""), + (msg->cm_fields['T'] ? msg->cm_fields['T'] : "0")); CtdlFreeMessage(msg); } @@ -356,7 +354,7 @@ int CtdlMsgCmp(struct CtdlMessage *msg, struct CtdlMessage *template) { * Retrieve the "seen" message list for the current room. */ void CtdlGetSeen(char *buf, int which_set) { - struct visit vbuf; + visit vbuf; /* Learn about the user and room in question */ CtdlGetRelationship(&vbuf, &CC->user, &CC->room); @@ -381,7 +379,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, int was_seen = 0; long lo = (-1L); long hi = (-1L); - struct visit vbuf; + visit vbuf; long *msglist; int num_msgs = 0; StrBuf *vset; @@ -406,7 +404,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, which_user = &CC->user; } - CtdlLogPrintf(CTDL_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n", + syslog(LOG_DEBUG, "CtdlSetSeen(%d msgs starting with %ld, %s, %d) in <%s>\n", num_target_msgnums, target_msgnums[0], (target_setting ? "SET" : "CLEAR"), which_set, @@ -443,17 +441,17 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, #if 0 /* This is a special diagnostic section. Do not allow it to run during normal operation. */ - CtdlLogPrintf(CTDL_DEBUG, "There are %d messages in the room.\n", num_msgs); + syslog(LOG_DEBUG, "There are %d messages in the room.\n", num_msgs); for (i=0; i 0) && (msglist[i] <= msglist[i-1])) abort(); } - CtdlLogPrintf(CTDL_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums); + syslog(LOG_DEBUG, "We are twiddling %d of them.\n", num_target_msgnums); for (k=0; k 0) && (target_msgnums[k] <= target_msgnums[k-1])) abort(); } #endif - CtdlLogPrintf(CTDL_DEBUG, "before update: %s\n", ChrPtr(vset)); + syslog(LOG_DEBUG, "before update: %s\n", ChrPtr(vset)); /* Translate the existing sequence set into an array of booleans */ setstr = NewStrBuf(); @@ -576,7 +574,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, vset = new_set; } - CtdlLogPrintf(CTDL_DEBUG, " after update: %s\n", ChrPtr(vset)); + syslog(LOG_DEBUG, " after update: %s\n", ChrPtr(vset)); /* Decide which message set we're manipulating */ switch (which_set) { @@ -607,7 +605,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, { int a, i, j; - struct visit vbuf; + visit vbuf; struct cdbdata *cdbfr; long *msglist = NULL; int num_msgs = 0; @@ -635,14 +633,28 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, /* Load the message list */ cdbfr = cdb_fetch(CDB_MSGLISTS, &CC->room.QRnumber, sizeof(long)); - if (cdbfr != NULL) { - msglist = (long *) cdbfr->ptr; - num_msgs = cdbfr->len / sizeof(long); - } else { + if (cdbfr == NULL) { if (need_to_free_re) regfree(&re); return 0; /* No messages at all? No further action. */ } + msglist = (long *) cdbfr->ptr; + num_msgs = cdbfr->len / sizeof(long); + + cdbfr->ptr = NULL; /* clear this so that cdb_free() doesn't free it */ + cdb_free(cdbfr); /* we own this memory now */ + + /* + * We cache the most recent msglist in order to do security checks later + */ + if (CC->client_socket > 0) { + if (CC->cached_msglist != NULL) { + free(CC->cached_msglist); + } + + CC->cached_msglist = msglist; + CC->cached_num_msgs = num_msgs; + } /* * Now begin the traversal. @@ -760,6 +772,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, || ((mode == MSGS_LAST) && (a >= (num_msgs - ref))) || ((mode == MSGS_FIRST) && (a < ref)) || ((mode == MSGS_GT) && (thismsg > ref)) + || ((mode == MSGS_LT) && (thismsg < ref)) || ((mode == MSGS_EQ) && (thismsg == ref)) ) ) { @@ -773,8 +786,8 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, ++num_processed; } } - cdb_free(cdbfr); /* Clean up */ if (need_to_free_re) regfree(&re); + if (CC->client_socket <= 0) free(msglist); return num_processed; } @@ -798,6 +811,8 @@ void cmd_msgs(char *cmdbuf) char search_string[1024]; ForEachMsgCallback CallBack; + if (CtdlAccessCheck(ac_logged_in_or_guest)) return; + extract_token(which, cmdbuf, 0, '|', sizeof which); cm_ref = extract_int(cmdbuf, 1); extract_token(search_string, cmdbuf, 1, '|', sizeof search_string); @@ -827,16 +842,13 @@ void cmd_msgs(char *cmdbuf) mode = MSGS_LAST; else if (!strncasecmp(which, "GT", 2)) mode = MSGS_GT; + else if (!strncasecmp(which, "LT", 2)) + mode = MSGS_LT; else if (!strncasecmp(which, "SEARCH", 6)) mode = MSGS_SEARCH; else mode = MSGS_ALL; - if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { - cprintf("%d not logged in\n", ERROR + NOT_LOGGED_IN); - return; - } - if ( (mode == MSGS_SEARCH) && (!config.c_enable_fulltext) ) { cprintf("%d Full text index is not enabled on this server.\n", ERROR + CMD_NOT_SUPPORTED); @@ -927,79 +939,84 @@ void do_help_subst(char *buffer) */ void memfmout( char *mptr, /* where are we going to get our text from? */ - 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_uint8_t ch; - char aaa[140]; - char buffer[SIZ]; - static int width = 80; - - strcpy(aaa, ""); - old = 255; - strcpy(buffer, ""); - c = 1; /* c is the current pos */ - - do { - if (subst) { - while (ch = *mptr, ((ch != 0) && (strlen(buffer) < 126))) { - ch = *mptr++; - buffer[strlen(buffer) + 1] = 0; - buffer[strlen(buffer)] = ch; + const char *nl /* string to terminate lines with */ +) { + int column = 0; + unsigned char ch = 0; + char outbuf[1024]; + int len = 0; + int nllen = 0; + + if (!mptr) return; + nllen = strlen(nl); + while (ch=*(mptr++), ch != 0) { + + if (ch == '\n') { + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; } - - if (buffer[0] == '^') - do_help_subst(buffer); - - buffer[strlen(buffer) + 1] = 0; - a = buffer[0]; - strcpy(buffer, &buffer[1]); - } else { - ch = *mptr++; - } - - old = real; - real = ch; - - if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10)) { - ch = 32; + len = 0; + if (client_write(nl, nllen) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } + column = 0; } - if (((old == 13) || (old == 10)) && (isspace(real))) { - cprintf("%s", nl); - c = 1; + else if (ch == '\r') { + /* Ignore carriage returns. Newlines are always LF or CRLF but never CR. */ } - if (ch > 32) { - if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) { - cprintf("%s%s", nl, aaa); - c = strlen(aaa); - aaa[0] = 0; + else if (isspace(ch)) { + if (column > 72) { /* Beyond 72 columns, break on the next space */ + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } + len = 0; + if (client_write(nl, nllen) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } + column = 0; } - b = strlen(aaa); - aaa[b] = ch; - aaa[b + 1] = 0; - } - if (ch == 32) { - if ((strlen(aaa) + c) > (width - 5)) { - cprintf("%s", nl); - c = 1; + else { + outbuf[len++] = ch; + ++column; + } + } + else { + outbuf[len++] = ch; + ++column; + if (column > 1000) { /* Beyond 1000 columns, break anywhere */ + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } + len = 0; + if (client_write(nl, nllen) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; + } + column = 0; } - cprintf("%s ", aaa); - ++c; - c = c + strlen(aaa); - strcpy(aaa, ""); } - if ((ch == 13) || (ch == 10)) { - cprintf("%s%s", aaa, nl); - c = 1; - strcpy(aaa, ""); + } + if (len) { + if (client_write(outbuf, len) == -1) + { + syslog(LOG_ERR, "memfmout(): aborting due to write failure.\n"); + return; } - - } while (ch > 0); - - cprintf("%s%s", aaa, nl); + len = 0; + client_write(nl, nllen); + column = 0; + } } @@ -1015,8 +1032,15 @@ void list_this_part(char *name, char *filename, char *partnum, char *disp, ma = (struct ma_info *)cbuserdata; if (ma->is_ma == 0) { - cprintf("part=%s|%s|%s|%s|%s|%ld|%s\n", - name, filename, partnum, disp, cbtype, (long)length, cbid); + cprintf("part=%s|%s|%s|%s|%s|%ld|%s|%s\n", + name, + filename, + partnum, + disp, + cbtype, + (long)length, + cbid, + cbcharset); } } @@ -1104,18 +1128,18 @@ void mime_spew_section(char *name, char *filename, char *partnum, char *disp, || (!IsEmptyStr(cbid) && (!strcasecmp(CC->download_desired_section, cbid))) ) { *found_it = 1; - cprintf("%d %d|-1|%s|%s\n", + cprintf("%d %d|-1|%s|%s|%s\n", BINARY_FOLLOWS, (int)length, filename, - cbtype + cbtype, + cbcharset ); client_write(content, length); } } - /* * Load a message from disk into memory. * This is used by CtdlOutputMsg() and other fetch functions. @@ -1132,8 +1156,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) cit_uint8_t ch; cit_uint8_t field_header; - CtdlLogPrintf(CTDL_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); - + syslog(LOG_DEBUG, "CtdlFetchMessage(%ld, %d)\n", msgnum, with_body); dmsgtext = cdb_fetch(CDB_MSGMAIN, &msgnum, sizeof(long)); if (dmsgtext == NULL) { return NULL; @@ -1148,7 +1171,7 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) */ ch = *mptr++; if (ch != 255) { - CtdlLogPrintf(CTDL_ERR, "Message %ld appears to be corrupted.\n", msgnum); + syslog(LOG_ERR, "Message %ld appears to be corrupted.\n", msgnum); cdb_free(dmsgtext); return NULL; } @@ -1185,7 +1208,8 @@ struct CtdlMessage *CtdlFetchMessage(long msgnum, int with_body) if ( (ret->cm_fields['M'] == NULL) && (with_body) ) { dmsgtext = cdb_fetch(CDB_BIGMSGS, &msgnum, sizeof(long)); if (dmsgtext != NULL) { - ret->cm_fields['M'] = strdup(dmsgtext->ptr); + ret->cm_fields['M'] = dmsgtext->ptr; + dmsgtext->ptr = NULL; cdb_free(dmsgtext); } } @@ -1211,7 +1235,7 @@ int is_valid_message(struct CtdlMessage *msg) { if (msg == NULL) return 0; if ((msg->cm_magic) != CTDLMESSAGE_MAGIC) { - CtdlLogPrintf(CTDL_WARNING, "is_valid_message() -- self-check failed\n"); + syslog(LOG_WARNING, "is_valid_message() -- self-check failed\n"); return 0; } return 1; @@ -1258,7 +1282,7 @@ void fixed_output_pre(char *name, char *filename, char *partnum, char *disp, struct ma_info *ma; ma = (struct ma_info *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype); + syslog(LOG_DEBUG, "fixed_output_pre() type=<%s>\n", cbtype); if (!strcasecmp(cbtype, "multipart/alternative")) { ++ma->is_ma; ma->did_print = 0; @@ -1278,7 +1302,7 @@ void fixed_output_post(char *name, char *filename, char *partnum, char *disp, struct ma_info *ma; ma = (struct ma_info *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, "fixed_output_post() type=<%s>\n", cbtype); + syslog(LOG_DEBUG, "fixed_output_post() type=<%s>\n", cbtype); if (!strcasecmp(cbtype, "multipart/alternative")) { --ma->is_ma; ma->did_print = 0; @@ -1302,7 +1326,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp, ma = (struct ma_info *)cbuserdata; - CtdlLogPrintf(CTDL_DEBUG, + syslog(LOG_DEBUG, "fixed_output() part %s: %s (%s) (%ld bytes)\n", partnum, filename, cbtype, (long)length); @@ -1311,7 +1335,7 @@ void fixed_output(char *name, char *filename, char *partnum, char *disp, * we've already printed another section, skip this one. */ if ( (ma->is_ma) && (ma->did_print) ) { - CtdlLogPrintf(CTDL_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype); + syslog(LOG_DEBUG, "Skipping part %s (%s)\n", partnum, cbtype); return; } ma->did_print = 1; @@ -1383,7 +1407,7 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); if ( (!strcasecmp(buf, cbtype)) && (!ma->freeze) ) { if (i < ma->chosen_pref) { - CtdlLogPrintf(CTDL_DEBUG, "Setting chosen part: <%s>\n", partnum); + syslog(LOG_DEBUG, "Setting chosen part: <%s>\n", partnum); safestrncpy(ma->chosen_part, partnum, sizeof ma->chosen_part); ma->chosen_pref = i; } @@ -1394,16 +1418,27 @@ void choose_preferred(char *name, char *filename, char *partnum, char *disp, /* * 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, char *cbid, void *cbuserdata) +void output_preferred(char *name, + char *filename, + char *partnum, + char *disp, + void *content, + char *cbtype, + char *cbcharset, + size_t length, + char *encoding, + char *cbid, + void *cbuserdata) { int i; char buf[128]; int add_newline = 0; char *text_content; struct ma_info *ma; - + char *decoded = NULL; + size_t bytes_decoded; + int rc = 0; + ma = (struct ma_info *)cbuserdata; /* This is not the MIME part you're looking for... */ @@ -1416,8 +1451,21 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, extract_token(buf, CC->preferred_formats, i, '|', sizeof buf); if (!strcasecmp(buf, cbtype)) { /* Yeah! Go! W00t!! */ + if (ma->dont_decode == 0) + rc = mime_decode_now (content, + length, + encoding, + &decoded, + &bytes_decoded); + if (rc < 0) + break; /* Give us the chance, maybe theres another one. */ + + if (rc == 0) text_content = (char *)content; + else { + text_content = decoded; + length = bytes_decoded; + } - text_content = (char *)content; if (text_content[length-1] != '\n') { ++add_newline; } @@ -1435,16 +1483,38 @@ void output_preferred(char *name, char *filename, char *partnum, char *disp, } cprintf("X-Citadel-MSG4-Partnum: %s\n", partnum); cprintf("\n"); - client_write(content, length); + if (client_write(text_content, length) == -1) + { + syslog(LOG_ERR, "output_preferred(): aborting due to write failure.\n"); + return; + } if (add_newline) cprintf("\n"); + if (decoded != NULL) free(decoded); return; } } /* No translations required or possible: output as text/plain */ cprintf("Content-type: text/plain\n\n"); - fixed_output(name, filename, partnum, disp, content, cbtype, cbcharset, + rc = 0; + if (ma->dont_decode == 0) + rc = mime_decode_now (content, + length, + encoding, + &decoded, + &bytes_decoded); + if (rc < 0) + return; /* Give us the chance, maybe theres another one. */ + + if (rc == 0) text_content = (char *)content; + else { + text_content = decoded; + length = bytes_decoded; + } + + fixed_output(name, filename, partnum, disp, text_content, cbtype, cbcharset, length, encoding, cbid, cbuserdata); + if (decoded != NULL) free(decoded); } @@ -1473,16 +1543,41 @@ void extract_encapsulated_message(char *name, char *filename, char *partnum, cha memcpy(encap->msg, content, length); return; } - } +/* + * Determine whether the specified message exists in the cached_msglist + * (This is a security check) + */ +int check_cached_msglist(long msgnum) { + /* cases in which we skip the check */ + if (!CC) return om_ok; /* not a session */ + if (CC->client_socket <= 0) return om_ok; /* not a client session */ + if (CC->cached_msglist == NULL) return om_access_denied; /* no msglist fetched */ + if (CC->cached_num_msgs == 0) return om_access_denied; /* nothing to check */ + /* FIXME FIXME SLOW SEARCH DO NOT LET THIS GO INTO PRODUCTION */ + int i; + for (i=0; i < CC->cached_num_msgs ; ++i) { + if (CC->cached_msglist[i] == msgnum) return om_ok; + } + + return om_access_denied; +} + +/* + * Determine whether the currently logged in session has permission to read + * messages in the current room. + */ int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) { - if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { + if ( (!(CC->logged_in)) + && (!(CC->internal_pgm)) + && (!config.c_guest_logins) + ) { return(om_not_logged_in); } return(om_ok); @@ -1506,7 +1601,7 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ struct encapmsg encap; int r; - CtdlLogPrintf(CTDL_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n", + syslog(LOG_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n", msg_num, mode, (section ? section : "<>") ); @@ -1524,7 +1619,14 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ return(r); } - /* FIXME: check message id against msglist for this room */ + r = check_cached_msglist(msg_num); + if (r == om_ok) { + syslog(LOG_DEBUG, "\033[32m PASS \033[0m\n"); + } + else { + syslog(LOG_DEBUG, "\033[31m FAIL \033[0m\n"); + } + /* FIXME after testing, this is where we deny access */ /* * Fetch the message from disk. If we're in HEADERS_FAST mode, @@ -1587,7 +1689,7 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ char *qp_encode_email_addrs(char *source) { - char user[256], node[256], name[256]; + char *user, *node, *name; const char headerStr[] = "=?UTF-8?Q?"; char *Encoded; char *EncodedName; @@ -1605,6 +1707,8 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; + cit_backtrace(); + syslog(LOG_DEBUG, "qp_encode_email_addrs: [%s]\n", source); AddrPtr = malloc (sizeof (long) * nAddrPtrMax); AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); @@ -1652,6 +1756,10 @@ char *qp_encode_email_addrs(char *source) for (i = 0; i < nColons; i++) source[AddrPtr[i]++] = '\0'; + /* TODO: if libidn, this might get larger*/ + user = malloc(SourceLen + 1); + node = malloc(SourceLen + 1); + name = malloc(SourceLen + 1); nPtr = Encoded; *nPtr = '\0'; @@ -1695,6 +1803,10 @@ char *qp_encode_email_addrs(char *source) } for (i = 0; i < nColons; i++) source[--AddrPtr[i]] = ','; + + free(user); + free(node); + free(name); free(AddrUtf8); free(AddrPtr); return Encoded; @@ -1725,6 +1837,339 @@ void sanitize_truncated_recipient(char *str) } +void OutputCtdlMsgHeaders( + struct CtdlMessage *TheMessage, + int do_proto) /* do Citadel protocol responses? */ +{ + char allkeys[30]; + int i, k, n; + int suppress_f = 0; + char buf[SIZ]; + char display_name[256]; + + /* begin header processing loop for Citadel message format */ + safestrncpy(display_name, "", sizeof display_name); + if (TheMessage->cm_fields['A']) { + strcpy(buf, TheMessage->cm_fields['A']); + if (TheMessage->cm_anon_type == MES_ANONONLY) { + safestrncpy(display_name, "****", sizeof display_name); + } + else if (TheMessage->cm_anon_type == MES_ANONOPT) { + safestrncpy(display_name, "anonymous", sizeof display_name); + } + else { + safestrncpy(display_name, buf, sizeof display_name); + } + if ((is_room_aide()) + && ((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 (!IsEmptyStr(TheMessage->cm_fields['N'])) + if (haschar(TheMessage->cm_fields['N'], '.') == 0) { + suppress_f = 1; + } + + /* Now spew the header fields in the order we like them. */ + n = safestrncpy(allkeys, FORDER, sizeof allkeys); + for (i=0; icm_fields[k] != NULL) + && (msgkeys[k] != NULL) ) { + if ((k == 'V') || (k == 'R') || (k == 'Y')) { + sanitize_truncated_recipient(TheMessage->cm_fields[k]); + } + 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], + TheMessage->cm_fields[k] + ); + } + } + } + } + +} + +void OutputRFC822MsgHeaders( + struct CtdlMessage *TheMessage, + int flags, /* should the bessage be exported clean */ + const char *nl, + char *mid, long sizeof_mid, + char *suser, long sizeof_suser, + char *luser, long sizeof_luser, + char *fuser, long sizeof_fuser, + char *snode, long sizeof_snode) +{ + char datestamp[100]; + int subject_found = 0; + char buf[SIZ]; + int i, j, k; + char *mptr = NULL; + char *mpptr = NULL; + + for (i = 0; i < 256; ++i) { + if (TheMessage->cm_fields[i]) { + mptr = mpptr = TheMessage->cm_fields[i]; + + if (i == 'A') { + safestrncpy(luser, mptr, sizeof_luser); + safestrncpy(suser, mptr, sizeof_suser); + } + else if (i == 'Y') { + if ((flags & QP_EADDR) != 0) { + mptr = qp_encode_email_addrs(mptr); + } + sanitize_truncated_recipient(mptr); + cprintf("CC: %s%s", mptr, nl); + } + else if (i == 'P') { + cprintf("Return-Path: %s%s", mptr, nl); + } + else if (i == 'L') { + cprintf("List-ID: %s%s", mptr, nl); + } + else if (i == 'V') { + if ((flags & QP_EADDR) != 0) + mptr = qp_encode_email_addrs(mptr); + cprintf("Envelope-To: %s%s", mptr, nl); + } + else if (i == 'U') { + cprintf("Subject: %s%s", mptr, nl); + subject_found = 1; + } + else if (i == 'I') + safestrncpy(mid, mptr, sizeof_mid); /// TODO: detect @ here and copy @nodename in if not found. + else if (i == 'F') + safestrncpy(fuser, mptr, sizeof_fuser); + /* else if (i == 'O') + cprintf("X-Citadel-Room: %s%s", + mptr, nl); */ + else if (i == 'N') + safestrncpy(snode, mptr, sizeof_snode); + else if (i == 'R') + { + if (haschar(mptr, '@') == 0) + { + sanitize_truncated_recipient(mptr); + cprintf("To: %s@%s", mptr, config.c_fqdn); + cprintf("%s", nl); + } + else + { + if ((flags & QP_EADDR) != 0) { + mptr = qp_encode_email_addrs(mptr); + } + sanitize_truncated_recipient(mptr); + cprintf("To: %s", mptr); + cprintf("%s", nl); + } + } + else if (i == 'T') { + datestring(datestamp, sizeof datestamp, + atol(mptr), DATESTRING_RFC822); + cprintf("Date: %s%s", datestamp, nl); + } + else if (i == 'W') { + cprintf("References: "); + k = num_tokens(mptr, '|'); + for (j=0; j", buf); + if (j == (k-1)) { + cprintf("%s", nl); + } + else { + cprintf(" "); + } + } + } + else if (i == 'K') { + cprintf("Reply-To: <%s>%s", mptr, nl); + } + if (mptr != mpptr) + free (mptr); + } + } + if (subject_found == 0) { + cprintf("Subject: (no subject)%s", nl); + } +} + + +void Dump_RFC822HeadersBody( + struct CtdlMessage *TheMessage, + int headers_only, /* eschew the message body? */ + int flags, /* should the bessage be exported clean? */ + + const char *nl) +{ + cit_uint8_t prev_ch; + int eoh = 0; + const char *StartOfText = StrBufNOTNULL; + char outbuf[1024]; + int outlen = 0; + int nllen = strlen(nl); + char *mptr; + int rc; + + mptr = TheMessage->cm_fields['M']; + + + prev_ch = '\0'; + while (*mptr != '\0') { + if (*mptr == '\r') { + /* do nothing */ + } + else { + if ((!eoh) && + (*mptr == '\n')) + { + eoh = (*(mptr+1) == '\r') && (*(mptr+2) == '\n'); + if (!eoh) + eoh = *(mptr+1) == '\n'; + if (eoh) + { + StartOfText = mptr; + StartOfText = strchr(StartOfText, '\n'); + StartOfText = strchr(StartOfText, '\n'); + } + } + if (((headers_only == HEADERS_NONE) && (mptr >= StartOfText)) || + ((headers_only == HEADERS_ONLY) && (mptr < StartOfText)) || + ((headers_only != HEADERS_NONE) && + (headers_only != HEADERS_ONLY)) + ) { + if (*mptr == '\n') { + memcpy(&outbuf[outlen], nl, nllen); + outlen += nllen; + outbuf[outlen] = '\0'; + } + else { + outbuf[outlen++] = *mptr; + } + } + } + if (flags & ESC_DOT) + { + if ((prev_ch == '\n') && + (*mptr == '.') && + ((*(mptr+1) == '\r') || (*(mptr+1) == '\n'))) + { + outbuf[outlen++] = '.'; + } + prev_ch = *mptr; + } + ++mptr; + if (outlen > 1000) { + if (client_write(outbuf, outlen) == -1) + { + syslog(LOG_ERR, "Dump_RFC822HeadersBody(): aborting due to write failure.\n"); + return; + } + outlen = 0; + } + } + if (outlen > 0) { + rc = client_write(outbuf, outlen); + outlen = 0; + } +} + + + +/* If the format type on disk is 1 (fixed-format), then we want + * everything to be output completely literally ... regardless of + * what message transfer format is in use. + */ +void DumpFormatFixed( + struct CtdlMessage *TheMessage, + int mode, /* how would you like that message? */ + const char *nl) +{ + cit_uint8_t ch; + char buf[SIZ]; + int buflen; + int xlline = 0; + int nllen = strlen (nl); + char *mptr; + + mptr = TheMessage->cm_fields['M']; + + if (mode == MT_MIME) { + cprintf("Content-type: text/plain\n\n"); + } + *buf = '\0'; + buflen = 0; + while (ch = *mptr++, ch > 0) { + if (ch == '\n') + ch = '\r'; + + if ((buflen > 250) && (!xlline)){ + int tbuflen; + tbuflen = buflen; + + while ((buflen > 0) && + (!isspace(buf[buflen]))) + buflen --; + if (buflen == 0) { + xlline = 1; + } + else { + mptr -= tbuflen - buflen; + buf[buflen] = '\0'; + ch = '\r'; + } + } + /* if we reach the outer bounds of our buffer, + abort without respect what whe purge. */ + if (xlline && + ((isspace(ch)) || + (buflen > SIZ - nllen - 2))) + ch = '\r'; + + if (ch == '\r') { + memcpy (&buf[buflen], nl, nllen); + buflen += nllen; + buf[buflen] = '\0'; + + if (client_write(buf, buflen) == -1) + { + syslog(LOG_ERR, "DumpFormatFixed(): aborting due to write failure.\n"); + return; + } + *buf = '\0'; + buflen = 0; + xlline = 0; + } else { + buf[buflen] = ch; + buflen++; + } + } + buf[buflen] = '\0'; + if (!IsEmptyStr(buf)) + cprintf("%s%s", buf, nl); +} /* * Get a message off disk. (returns om_* values found in msgbase.h) @@ -1737,15 +2182,9 @@ int CtdlOutputPreLoadedMsg( int crlf, /* Use CRLF newlines instead of LF? */ int flags /* should the bessage be exported clean? */ ) { - int i, j, k; - char buf[SIZ]; - cit_uint8_t ch, prev_ch; - char allkeys[30]; - char display_name[256]; - char *mptr, *mpptr; - char *nl; /* newline string */ - int suppress_f = 0; - int subject_found = 0; + int i; + char *mptr = NULL; + const char *nl; /* newline string */ struct ma_info ma; /* Buffers needed for RFC822 translation. These are all filled @@ -1757,9 +2196,8 @@ int CtdlOutputPreLoadedMsg( char fuser[100]; char snode[100]; char mid[100]; - char datestamp[100]; - CtdlLogPrintf(CTDL_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n", + syslog(LOG_DEBUG, "CtdlOutputPreLoadedMsg(TheMessage=%s, %d, %d, %d, %d\n", ((TheMessage == NULL) ? "NULL" : "not null"), mode, headers_only, do_proto, crlf); @@ -1767,7 +2205,7 @@ int CtdlOutputPreLoadedMsg( nl = (crlf ? "\r\n" : "\n"); if (!is_valid_message(TheMessage)) { - CtdlLogPrintf(CTDL_ERR, + syslog(LOG_ERR, "ERROR: invalid preloaded message for output\n"); cit_backtrace (); return(om_no_such_msg); @@ -1852,164 +2290,27 @@ int CtdlOutputPreLoadedMsg( cprintf("nhdr=yes\n"); } - /* begin header processing loop for Citadel message format */ + if ((mode == MT_CITADEL) || (mode == MT_MIME)) + OutputCtdlMsgHeaders(TheMessage, do_proto); - if ((mode == MT_CITADEL) || (mode == MT_MIME)) { - - safestrncpy(display_name, "", sizeof display_name); - if (TheMessage->cm_fields['A']) { - strcpy(buf, TheMessage->cm_fields['A']); - if (TheMessage->cm_anon_type == MES_ANONONLY) { - safestrncpy(display_name, "****", sizeof display_name); - } - else if (TheMessage->cm_anon_type == MES_ANONOPT) { - safestrncpy(display_name, "anonymous", sizeof display_name); - } - else { - safestrncpy(display_name, buf, sizeof display_name); - } - if ((is_room_aide()) - && ((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 (!IsEmptyStr(TheMessage->cm_fields['N'])) - if (haschar(TheMessage->cm_fields['N'], '.') == 0) { - suppress_f = 1; - } - - /* Now spew the header fields in the order we like them. */ - safestrncpy(allkeys, FORDER, sizeof allkeys); - for (i=0; icm_fields[k] != NULL) - && (msgkeys[k] != NULL) ) { - if ((k == 'V') || (k == 'R') || (k == 'Y')) { - sanitize_truncated_recipient(TheMessage->cm_fields[k]); - } - 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], - TheMessage->cm_fields[k] - ); - } - } - } - } - - } /* begin header processing loop for RFC822 transfer format */ - strcpy(suser, ""); strcpy(luser, ""); strcpy(fuser, ""); strcpy(snode, NODENAME); - if (mode == MT_RFC822) { - for (i = 0; i < 256; ++i) { - if (TheMessage->cm_fields[i]) { - mptr = mpptr = TheMessage->cm_fields[i]; - - if (i == 'A') { - safestrncpy(luser, mptr, sizeof luser); - safestrncpy(suser, mptr, sizeof suser); - } - else if (i == 'Y') { - if ((flags & QP_EADDR) != 0) { - mptr = qp_encode_email_addrs(mptr); - } - sanitize_truncated_recipient(mptr); - cprintf("CC: %s%s", mptr, nl); - } - else if (i == 'P') { - cprintf("Return-Path: %s%s", mptr, nl); - } - else if (i == 'L') { - cprintf("List-ID: %s%s", mptr, nl); - } - else if (i == 'V') { - if ((flags & QP_EADDR) != 0) - mptr = qp_encode_email_addrs(mptr); - cprintf("Envelope-To: %s%s", mptr, nl); - } - else if (i == 'U') { - cprintf("Subject: %s%s", mptr, nl); - subject_found = 1; - } - else if (i == 'I') - safestrncpy(mid, mptr, sizeof mid); - else if (i == 'F') - safestrncpy(fuser, mptr, sizeof fuser); - /* else if (i == 'O') - cprintf("X-Citadel-Room: %s%s", - mptr, nl); */ - else if (i == 'N') - safestrncpy(snode, mptr, sizeof snode); - else if (i == 'R') - { - if (haschar(mptr, '@') == 0) - { - sanitize_truncated_recipient(mptr); - cprintf("To: %s@%s", mptr, config.c_fqdn); - cprintf("%s", nl); - } - else - { - if ((flags & QP_EADDR) != 0) { - mptr = qp_encode_email_addrs(mptr); - } - sanitize_truncated_recipient(mptr); - cprintf("To: %s", mptr); - cprintf("%s", nl); - } - } - else if (i == 'T') { - datestring(datestamp, sizeof datestamp, - atol(mptr), DATESTRING_RFC822); - cprintf("Date: %s%s", datestamp, nl); - } - else if (i == 'W') { - cprintf("References: "); - k = num_tokens(mptr, '|'); - for (j=0; j", buf); - if (j == (k-1)) { - cprintf("%s", nl); - } - else { - cprintf(" "); - } - } - } - if (mptr != mpptr) - free (mptr); - } - } - if (subject_found == 0) { - cprintf("Subject: (no subject)%s", nl); - } - } + if (mode == MT_RFC822) + OutputRFC822MsgHeaders( + TheMessage, + flags, + nl, + mid, sizeof(mid), + suser, sizeof(suser), + luser, sizeof(luser), + fuser, sizeof(fuser), + snode, sizeof(snode) + ); + for (i=0; !IsEmptyStr(&suser[i]); ++i) { suser[i] = tolower(suser[i]); @@ -2050,69 +2351,24 @@ int CtdlOutputPreLoadedMsg( /* end header processing loop ... at this point, we're in the text */ START_TEXT: if (headers_only == HEADERS_FAST) goto DONE; - mptr = TheMessage->cm_fields['M']; /* Tell the client about the MIME parts in this message */ if (TheMessage->cm_format_type == FMT_RFC822) { if ( (mode == MT_CITADEL) || (mode == MT_MIME) ) { + mptr = TheMessage->cm_fields['M']; memset(&ma, 0, sizeof(struct ma_info)); mime_parser(mptr, NULL, (do_proto ? *list_this_part : NULL), (do_proto ? *list_this_pref : NULL), (do_proto ? *list_this_suff : NULL), - (void *)&ma, 0); + (void *)&ma, 1); } else if (mode == MT_RFC822) { /* unparsed RFC822 dump */ - char *start_of_text = NULL; - start_of_text = strstr(mptr, "\n\r\n"); - if (start_of_text == NULL) start_of_text = strstr(mptr, "\n\n"); - if (start_of_text == NULL) start_of_text = mptr; - ++start_of_text; - start_of_text = strstr(start_of_text, "\n"); - ++start_of_text; - - char outbuf[1024]; - int outlen = 0; - int nllen = strlen(nl); - prev_ch = 0; - while (ch=*mptr, ch!=0) { - if (ch==13) { - /* do nothing */ - } - else { - if ( - ((headers_only == HEADERS_NONE) && (mptr >= start_of_text)) - || ((headers_only == HEADERS_ONLY) && (mptr < start_of_text)) - || ((headers_only != HEADERS_NONE) && (headers_only != HEADERS_ONLY)) - ) { - if (ch == 10) { - sprintf(&outbuf[outlen], "%s", nl); - outlen += nllen; - } - else { - outbuf[outlen++] = ch; - } - } - } - if (flags & ESC_DOT) - { - if ((prev_ch == 10) && (ch == '.') && ((*(mptr+1) == 13) || (*(mptr+1) == 10))) - { - outbuf[outlen++] = '.'; - } - } - prev_ch = ch; - ++mptr; - if (outlen > 1000) { - client_write(outbuf, outlen); - outlen = 0; - } - } - if (outlen > 0) { - client_write(outbuf, outlen); - outlen = 0; - } - + Dump_RFC822HeadersBody( + TheMessage, + headers_only, + flags, + nl); goto DONE; } } @@ -2126,34 +2382,11 @@ START_TEXT: if (do_proto) cprintf("text\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 == FMT_FIXED) { - int buflen; - if (mode == MT_MIME) { - cprintf("Content-type: text/plain\n\n"); - } - *buf = '\0'; - buflen = 0; - while (ch = *mptr++, ch > 0) { - if (ch == 13) - ch = 10; - if ((ch == 10) || (buflen > 250)) { - buf[buflen] = '\0'; - cprintf("%s%s", buf, nl); - *buf = '\0'; - buflen = 0; - } else { - buf[buflen] = ch; - buflen++; - } - } - buf[buflen] = '\0'; - if (!IsEmptyStr(buf)) - cprintf("%s%s", buf, nl); - } + if (TheMessage->cm_format_type == FMT_FIXED) + DumpFormatFixed( + TheMessage, + mode, /* how would you like that message? */ + nl); /* If the message on disk is format 0 (Citadel vari-format), we * output using the formatter at 80 columns. This is the final output @@ -2163,10 +2396,12 @@ START_TEXT: * message to the reader's screen width. */ if (TheMessage->cm_format_type == FMT_CITADEL) { + mptr = TheMessage->cm_fields['M']; + if (mode == MT_MIME) { cprintf("Content-type: text/x-citadel-variformat\n\n"); } - memfmout(mptr, 0, nl); + memfmout(mptr, nl); } /* If the message on disk is format 4 (MIME), we've gotta hand it @@ -2181,11 +2416,12 @@ START_TEXT: ma.use_fo_hooks = 0; strcpy(ma.chosen_part, "1"); ma.chosen_pref = 9999; + ma.dont_decode = CC->msg4_dont_decode; mime_parser(mptr, NULL, *choose_preferred, *fixed_output_pre, - *fixed_output_post, (void *)&ma, 0); + *fixed_output_post, (void *)&ma, 1); mime_parser(mptr, NULL, - *output_preferred, NULL, NULL, (void *)&ma, CC->msg4_dont_decode); + *output_preferred, NULL, NULL, (void *)&ma, 1); } else { ma.use_fo_hooks = 1; @@ -2202,7 +2438,6 @@ DONE: /* now we're done */ } - /* * display a message (mode 0 - Citadel proprietary) */ @@ -2349,8 +2584,8 @@ void cmd_dlat(char *cmdbuf) * this mode of operation only works if we're saving a single message.) */ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newmsgs, - int do_repl_check, struct CtdlMessage *supplied_msg) -{ + int do_repl_check, struct CtdlMessage *supplied_msg, int suppress_refcount_adj +) { int i, j, unique; char hold_rm[ROOMNAMELEN]; struct cdbdata *cdbfr; @@ -2364,9 +2599,10 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms long *msgs_to_be_merged = NULL; int num_msgs_to_be_merged = 0; - CtdlLogPrintf(CTDL_DEBUG, - "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d)\n", - roomname, num_newmsgs, do_repl_check); + syslog(LOG_DEBUG, + "CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n", + roomname, num_newmsgs, do_repl_check, suppress_refcount_adj + ); strcpy(hold_rm, CC->room.QRname); @@ -2379,7 +2615,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms if (CtdlGetRoomLock(&CC->room, ((roomname != NULL) ? roomname : CC->room.QRname) ) != 0) { - CtdlLogPrintf(CTDL_ERR, "No such room <%s>\n", roomname); + syslog(LOG_ERR, "No such room <%s>\n", roomname); return(ERROR + ROOM_NOT_FOUND); } @@ -2416,14 +2652,14 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms } } - CtdlLogPrintf(9, "%d unique messages to be merged\n", num_msgs_to_be_merged); + syslog(LOG_DEBUG, "%d unique messages to be merged\n", num_msgs_to_be_merged); /* * Now merge the new messages */ msglist = realloc(msglist, (sizeof(long) * (num_msgs + num_msgs_to_be_merged)) ); if (msglist == NULL) { - CtdlLogPrintf(CTDL_ALERT, "ERROR: can't realloc message list!\n"); + syslog(LOG_ALERT, "ERROR: can't realloc message list!\n"); } memcpy(&msglist[num_msgs], msgs_to_be_merged, (sizeof(long) * num_msgs_to_be_merged) ); num_msgs += num_msgs_to_be_merged; @@ -2447,7 +2683,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms /* Perform replication checks if necessary */ if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) { - CtdlLogPrintf(CTDL_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n"); + syslog(LOG_DEBUG, "CtdlSaveMsgPointerInRoom() doing repl checks\n"); for (i=0; iroom, hold_rm); /* Bump the reference count for all messages which were merged */ - for (i=0; ilen = 0; ret->ser = NULL; return; @@ -2620,7 +2858,7 @@ void serialize_message(struct ser_ret *ret, /* return values */ ret->ser = malloc(ret->len); if (ret->ser == NULL) { - CtdlLogPrintf(CTDL_ERR, "serialize_message() malloc(%ld) failed: %s\n", + syslog(LOG_ERR, "serialize_message() malloc(%ld) failed: %s\n", (long)ret->len, strerror(errno)); ret->len = 0; ret->ser = NULL; @@ -2638,7 +2876,7 @@ void serialize_message(struct ser_ret *ret, /* return values */ safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1); wlen = wlen + fieldlen + 1; } - if (ret->len != wlen) CtdlLogPrintf(CTDL_ERR, "ERROR: len=%ld wlen=%ld\n", + if (ret->len != wlen) syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n", (long)ret->len, (long)wlen); return; @@ -2664,7 +2902,7 @@ void dump_message(struct CtdlMessage *msg, /* unserialized msg */ * Check for valid message format */ if (is_valid_message(msg) == 0) { - CtdlLogPrintf(CTDL_ERR, "dump_message() aborting due to invalid message\n"); + syslog(LOG_ERR, "dump_message() aborting due to invalid message\n"); return; } @@ -2675,7 +2913,11 @@ void dump_message(struct CtdlMessage *msg, /* unserialized msg */ for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) { snprintf (buf, Siz, " msg[%c] = %s ...\n", (char) forder[i], msg->cm_fields[(int)forder[i]]); - client_write (buf, strlen(buf)); + if (client_write (buf, strlen(buf)) == -1) + { + syslog(LOG_ERR, "dump_message(): aborting due to write failure.\n"); + return; + } } return; @@ -2692,19 +2934,19 @@ void ReplicationChecks(struct CtdlMessage *msg) { if (DoesThisRoomNeedEuidIndexing(&CC->room) == 0) return; - CtdlLogPrintf(CTDL_DEBUG, "Performing replication checks in <%s>\n", + syslog(LOG_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 (IsEmptyStr(msg->cm_fields['E'])) return; - /*CtdlLogPrintf(CTDL_DEBUG, "Exclusive ID: <%s> for room <%s>\n", + /*syslog(LOG_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); + old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields['E'], &CC->room); if (old_msgnum > 0L) { - CtdlLogPrintf(CTDL_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); + syslog(LOG_DEBUG, "ReplicationChecks() replacing message %ld\n", old_msgnum); CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, ""); } } @@ -2716,8 +2958,8 @@ void ReplicationChecks(struct CtdlMessage *msg) { */ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ struct recptypes *recps, /* recipients (if mail) */ - char *force, /* force a particular room? */ - int flags /* should the bessage be exported clean? */ + const char *force, /* force a particular room? */ + int flags /* should the message be exported clean? */ ) { char submit_filename[128]; char generated_timestamp[32]; @@ -2727,7 +2969,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ char content_type[SIZ]; /* We have to learn this */ char recipient[SIZ]; long newmsgid; - char *mptr = NULL; + const char *mptr = NULL; struct ctdluser userbuf; int a, i; struct MetaData smi; @@ -2740,14 +2982,14 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ char *hold_R, *hold_D; char *collected_addresses = NULL; struct addresses_to_be_filed *aptr = NULL; - char *saved_rfc822_version = NULL; + StrBuf *saved_rfc822_version = NULL; int qualified_for_journaling = 0; - struct CitContext *CCC = CC; /* CachedCitContext - performance boost */ + CitContext *CCC = MyContext(); char bounce_to[1024] = ""; size_t tmp = 0; int rv = 0; - CtdlLogPrintf(CTDL_DEBUG, "CtdlSubmitMsg() called\n"); + syslog(LOG_DEBUG, "CtdlSubmitMsg() called\n"); if (is_valid_message(msg) == 0) return(-1); /* self check */ /* If this message has no timestamp, we take the liberty of @@ -2783,7 +3025,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Learn about what's inside, because it's what's inside that counts */ if (msg->cm_fields['M'] == NULL) { - CtdlLogPrintf(CTDL_ERR, "ERROR: attempt to save message with NULL body\n"); + syslog(LOG_ERR, "ERROR: attempt to save message with NULL body\n"); return(-2); } @@ -2815,7 +3057,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Goto the correct room */ - CtdlLogPrintf(CTDL_DEBUG, "Selected room %s\n", (recps) ? CCC->room.QRname : SENTITEMS); + syslog(LOG_DEBUG, "Selected room %s\n", (recps) ? CCC->room.QRname : SENTITEMS); strcpy(hold_rm, CCC->room.QRname); strcpy(actual_rm, CCC->room.QRname); if (recps != NULL) { @@ -2824,10 +3066,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* If the user is a twit, move to the twit room for posting */ if (TWITDETECT) { - if (CCC->user.axlevel == 2) { + if (CCC->user.axlevel == AxProbU) { strcpy(hold_rm, actual_rm); strcpy(actual_rm, config.c_twitroom); - CtdlLogPrintf(CTDL_DEBUG, "Diverting to twit room\n"); + syslog(LOG_DEBUG, "Diverting to twit room\n"); } } @@ -2836,7 +3078,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ strcpy(actual_rm, force_room); } - CtdlLogPrintf(CTDL_DEBUG, "Final selection: %s\n", actual_rm); + syslog(LOG_DEBUG, "Final selection: %s\n", actual_rm); if (strcasecmp(actual_rm, CCC->room.QRname)) { /* CtdlGetRoom(&CCC->room, actual_rm); */ CtdlUserGoto(actual_rm, 0, 1, NULL, NULL); @@ -2850,7 +3092,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Perform "before save" hooks (aborting if any return nonzero) */ - CtdlLogPrintf(CTDL_DEBUG, "Performing before-save hooks\n"); + syslog(LOG_DEBUG, "Performing before-save hooks\n"); if (PerformMessageHooks(msg, EVT_BEFORESAVE) > 0) return(-3); /* @@ -2862,7 +3104,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Save it to disk */ - CtdlLogPrintf(CTDL_DEBUG, "Saving to disk\n"); + syslog(LOG_DEBUG, "Saving to disk\n"); newmsgid = send_message(msg); if (newmsgid <= 0L) return(-5); @@ -2870,7 +3112,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * be a critical section because nobody else knows about this message * yet. */ - CtdlLogPrintf(CTDL_DEBUG, "Creating MetaData record\n"); + syslog(LOG_DEBUG, "Creating MetaData record\n"); memset(&smi, 0, sizeof(struct MetaData)); smi.meta_msgnum = newmsgid; smi.meta_refcount = 0; @@ -2888,23 +3130,19 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * message to attach to the journalized copy. */ if (CCC->redirect_buffer != NULL) { - CtdlLogPrintf(CTDL_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n"); + syslog(LOG_ALERT, "CCC->redirect_buffer is not NULL during message submission!\n"); abort(); } - CCC->redirect_buffer = malloc(SIZ); - CCC->redirect_len = 0; - CCC->redirect_alloc = SIZ; + CCC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_RFC822, HEADERS_ALL, 0, 1, QP_EADDR); - smi.meta_rfc822_length = CCC->redirect_len; + smi.meta_rfc822_length = StrLength(CCC->redirect_buffer); saved_rfc822_version = CCC->redirect_buffer; CCC->redirect_buffer = NULL; - CCC->redirect_len = 0; - CCC->redirect_alloc = 0; PutMetaData(&smi); /* Now figure out where to store the pointers */ - CtdlLogPrintf(CTDL_DEBUG, "Storing pointers\n"); + syslog(LOG_DEBUG, "Storing pointers\n"); /* If this is being done by the networker delivering a private * message, we want to BYPASS saving the sender's copy (because there @@ -2912,7 +3150,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ */ if ((!CCC->internal_pgm) || (recps == NULL)) { if (CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 1, msg) != 0) { - CtdlLogPrintf(CTDL_ERR, "ERROR saving message pointer!\n"); + syslog(LOG_ERR, "ERROR saving message pointer!\n"); CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); } } @@ -2927,12 +3165,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_room, '|'); ++i) { extract_token(recipient, recps->recp_room, i, '|', sizeof recipient); - CtdlLogPrintf(CTDL_DEBUG, "Delivering to room <%s>\n", recipient); + syslog(LOG_DEBUG, "Delivering to room <%s>\n", recipient); CtdlSaveMsgPointerInRoom(recipient, newmsgid, 0, msg); } /* Bump this user's messages posted counter. */ - CtdlLogPrintf(CTDL_DEBUG, "Updating user\n"); + syslog(LOG_DEBUG, "Updating user\n"); CtdlGetUserLock(&CCC->user, CCC->curr_user); CCC->user.posted = CCC->user.posted + 1; CtdlPutUserLock(&CCC->user); @@ -2955,14 +3193,14 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ for (i=0; irecp_local, '|'); ++i) { extract_token(recipient, recps->recp_local, i, '|', sizeof recipient); - CtdlLogPrintf(CTDL_DEBUG, "Delivering private local mail to <%s>\n", + syslog(LOG_DEBUG, "Delivering private local mail to <%s>\n", recipient); if (CtdlGetUser(&userbuf, recipient) == 0) { // Add a flag so the Funambol module knows its mail msg->cm_fields['W'] = strdup(recipient); CtdlMailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); CtdlSaveMsgPointerInRoom(actual_rm, newmsgid, 0, msg); - BumpNewMailCounter(userbuf.usernum); + CtdlBumpNewMailCounter(userbuf.usernum); if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) { /* Generate a instruction message for the Funambol notification * server, in the same style as the SMTP queue @@ -2990,14 +3228,14 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } } else { - CtdlLogPrintf(CTDL_DEBUG, "No user <%s>\n", recipient); + syslog(LOG_DEBUG, "No user <%s>\n", recipient); CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg); } } /* Perform "after save" hooks */ - CtdlLogPrintf(CTDL_DEBUG, "Performing after-save hooks\n"); + syslog(LOG_DEBUG, "Performing after-save hooks\n"); PerformMessageHooks(msg, EVT_AFTERSAVE); /* For IGnet mail, we have to save a new copy into the spooler for @@ -3041,7 +3279,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* Go back to the room we started from */ - CtdlLogPrintf(CTDL_DEBUG, "Returning to original room %s\n", hold_rm); + syslog(LOG_DEBUG, "Returning to original room %s\n", hold_rm); if (strcasecmp(hold_rm, CCC->room.QRname)) CtdlUserGoto(hold_rm, 0, 1, NULL, NULL); @@ -3051,7 +3289,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * contain a recipient. */ if ((recps != NULL) && (recps->num_internet > 0)) { - CtdlLogPrintf(CTDL_DEBUG, "Generating delivery instructions\n"); + syslog(LOG_DEBUG, "Generating delivery instructions\n"); instr_alloc = 1024; instr = malloc(instr_alloc); snprintf(instr, instr_alloc, @@ -3136,7 +3374,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ JournalBackgroundSubmit(msg, saved_rfc822_version, recps); } else { - free(saved_rfc822_version); + FreeStrBuf(&saved_rfc822_version); } } @@ -3202,105 +3440,266 @@ void quickie_message(const char *from, const char *fromaddr, char *to, char *roo /* * Back end function used by CtdlMakeMessage() 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 */ - int crlf, /* CRLF newlines instead of LF */ - int sock /* socket handle or 0 for this session's client socket */ - ) { - char buf[1024]; - int linelen; - size_t message_len = 0; - size_t buffer_len = 0; - char *ptr; - char *m; +StrBuf *CtdlReadMessageBodyBuf(char *terminator, /* token signalling EOT */ + long tlen, + size_t maxlen, /* maximum message length */ + char *exist, /* if non-null, append to it; + exist is ALWAYS freed */ + int crlf, /* CRLF newlines instead of LF */ + int *sock /* socket handle or 0 for this session's client socket */ + ) +{ + StrBuf *Message; + StrBuf *LineBuf; int flushing = 0; int finished = 0; int dotdot = 0; + LineBuf = NewStrBufPlain(NULL, SIZ); if (exist == NULL) { - m = malloc(4096); - m[0] = 0; - buffer_len = 4096; - message_len = 0; + Message = NewStrBufPlain(NULL, 4 * SIZ); } else { - message_len = strlen(exist); - buffer_len = message_len + 4096; - m = realloc(exist, buffer_len); - if (m == NULL) { - free(exist); - return m; - } + Message = NewStrBufPlain(exist, -1); + free(exist); } /* Do we need to change leading ".." to "." for SMTP escaping? */ - if (!strcmp(terminator, ".")) { + if ((tlen == 1) && (*terminator == '.')) { dotdot = 1; } - /* flush the input if we have nowhere to store it */ - if (m == NULL) { - flushing = 1; - } - /* read in the lines of message text one by one */ do { - if (sock > 0) { - if (sock_getln(sock, buf, (sizeof buf - 3)) < 0) finished = 1; + if (sock != NULL) { + if ((CtdlSockGetLine(sock, LineBuf, 5) < 0) || + (*sock == -1)) + finished = 1; } else { - if (client_getln(buf, (sizeof buf - 3)) < 1) finished = 1; + if (CtdlClientGetLine(LineBuf) < 0) finished = 1; } - if (!strcmp(buf, terminator)) finished = 1; - if (crlf) { - strcat(buf, "\r\n"); + if ((StrLength(LineBuf) == tlen) && + (!strcmp(ChrPtr(LineBuf), terminator))) + finished = 1; + + if ( (!flushing) && (!finished) ) { + if (crlf) { + StrBufAppendBufPlain(LineBuf, HKEY("\r\n"), 0); + } + else { + StrBufAppendBufPlain(LineBuf, HKEY("\n"), 0); + } + + /* Unescape SMTP-style input of two dots at the beginning of the line */ + if ((dotdot) && + (StrLength(LineBuf) == 2) && + (!strcmp(ChrPtr(LineBuf), ".."))) + { + StrBufCutLeft(LineBuf, 1); + } + + StrBufAppendBuf(Message, LineBuf, 0); + } + + /* if we've hit the max msg length, flush the rest */ + if (StrLength(Message) >= maxlen) flushing = 1; + + } while (!finished); + FreeStrBuf(&LineBuf); + return Message; +} + +void DeleteAsyncMsg(ReadAsyncMsg **Msg) +{ + if (*Msg == NULL) + return; + FreeStrBuf(&(*Msg)->MsgBuf); + + free(*Msg); + *Msg = NULL; +} + +ReadAsyncMsg *NewAsyncMsg(const char *terminator, /* token signalling EOT */ + long tlen, + size_t maxlen, /* maximum message length */ + size_t expectlen, /* if we expect a message, how long should it be? */ + char *exist, /* if non-null, append to it; + exist is ALWAYS freed */ + long eLen, /* length of exist */ + int crlf /* CRLF newlines instead of LF */ + ) +{ + ReadAsyncMsg *NewMsg; + + NewMsg = (ReadAsyncMsg *)malloc(sizeof(ReadAsyncMsg)); + memset(NewMsg, 0, sizeof(ReadAsyncMsg)); + + if (exist == NULL) { + long len; + + if (expectlen == 0) { + len = 4 * SIZ; } else { - strcat(buf, "\n"); + len = expectlen + 10; } + NewMsg->MsgBuf = NewStrBufPlain(NULL, len); + } + else { + NewMsg->MsgBuf = NewStrBufPlain(exist, eLen); + free(exist); + } + /* Do we need to change leading ".." to "." for SMTP escaping? */ + if ((tlen == 1) && (*terminator == '.')) { + NewMsg->dodot = 1; + } - /* Unescape SMTP-style input of two dots at the beginning of the line */ - if (dotdot) { - if (!strncmp(buf, "..", 2)) { - strcpy(buf, &buf[1]); + NewMsg->terminator = terminator; + NewMsg->tlen = tlen; + + NewMsg->maxlen = maxlen; + + NewMsg->crlf = crlf; + + return NewMsg; +} + +/* + * Back end function used by CtdlMakeMessage() and similar functions + */ +eReadState CtdlReadMessageBodyAsync(AsyncIO *IO) +{ + ReadAsyncMsg *ReadMsg; + int MsgFinished = 0; + eReadState Finished = eMustReadMore; + +#ifdef BIGBAD_IODBG + char fn [SIZ]; + FILE *fd; + const char *pch = ChrPtr(IO->SendBuf.Buf); + const char *pchh = IO->SendBuf.ReadWritePointer; + long nbytes; + + if (pchh == NULL) + pchh = pch; + + nbytes = StrLength(IO->SendBuf.Buf) - (pchh - pch); + snprintf(fn, SIZ, "/tmp/foolog_ev_%s.%d", + ((CitContext*)(IO->CitContext))->ServiceName, + IO->SendBuf.fd); + + fd = fopen(fn, "a+"); +#endif + + ReadMsg = IO->ReadMsg; + + /* read in the lines of message text one by one */ + do { + Finished = StrBufChunkSipLine(IO->IOBuf, &IO->RecvBuf); + + switch (Finished) { + case eMustReadMore: /// read new from socket... +#ifdef BIGBAD_IODBG + if (IO->RecvBuf.ReadWritePointer != NULL) { + nbytes = StrLength(IO->RecvBuf.Buf) - (IO->RecvBuf.ReadWritePointer - ChrPtr(IO->RecvBuf.Buf)); + fprintf(fd, "Read; Line unfinished: %ld Bytes still in buffer [", nbytes); + + fwrite(IO->RecvBuf.ReadWritePointer, nbytes, 1, fd); + + fprintf(fd, "]\n"); + } else { + fprintf(fd, "BufferEmpty! \n"); } + fclose(fd); +#endif + return Finished; + break; + case eBufferNotEmpty: /* shouldn't happen... */ + case eReadSuccess: /// done for now... + break; + case eReadFail: /// WHUT? + ///todo: shut down! + break; } + - if ( (!flushing) && (!finished) ) { - /* Measure the line */ - linelen = strlen(buf); - - /* augment the buffer if we have to */ - if ((message_len + linelen) >= buffer_len) { - ptr = realloc(m, (buffer_len * 2) ); - if (ptr == NULL) { /* flush if can't allocate */ - flushing = 1; - } else { - buffer_len = (buffer_len * 2); - m = ptr; - CtdlLogPrintf(CTDL_DEBUG, "buffer_len is now %ld\n", (long)buffer_len); - } + if ((StrLength(IO->IOBuf) == ReadMsg->tlen) && + (!strcmp(ChrPtr(IO->IOBuf), ReadMsg->terminator))) { + MsgFinished = 1; +#ifdef BIGBAD_IODBG + fprintf(fd, "found Terminator; Message Size: %d\n", StrLength(ReadMsg->MsgBuf)); +#endif + } + else if (!ReadMsg->flushing) { + +#ifdef BIGBAD_IODBG + fprintf(fd, "Read Line: [%d][%s]\n", StrLength(IO->IOBuf), ChrPtr(IO->IOBuf)); +#endif + + /* Unescape SMTP-style input of two dots at the beginning of the line */ + if ((ReadMsg->dodot) && + (StrLength(IO->IOBuf) == 2) && /* TODO: do we just unescape lines with two dots or any line? */ + (!strcmp(ChrPtr(IO->IOBuf), ".."))) + { +#ifdef BIGBAD_IODBG + fprintf(fd, "UnEscaped!\n"); +#endif + StrBufCutLeft(IO->IOBuf, 1); } - - /* 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); - message_len += linelen; + + if (ReadMsg->crlf) { + StrBufAppendBufPlain(IO->IOBuf, HKEY("\r\n"), 0); + } + else { + StrBufAppendBufPlain(IO->IOBuf, HKEY("\n"), 0); + } + + StrBufAppendBuf(ReadMsg->MsgBuf, IO->IOBuf, 0); } /* if we've hit the max msg length, flush the rest */ - if (message_len >= maxlen) flushing = 1; + if (StrLength(ReadMsg->MsgBuf) >= ReadMsg->maxlen) ReadMsg->flushing = 1; - } while (!finished); - return(m); + } while (!MsgFinished); + +#ifdef BIGBAD_IODBG + fprintf(fd, "Done with reading; %s.\n, ", + (MsgFinished)?"Message Finished": "FAILED"); + fclose(fd); +#endif + if (MsgFinished) + return eReadSuccess; + else + return eAbort; } +/* + * Back end function used by CtdlMakeMessage() and similar functions + */ +char *CtdlReadMessageBody(char *terminator, /* token signalling EOT */ + long tlen, + size_t maxlen, /* maximum message length */ + char *exist, /* if non-null, append to it; + exist is ALWAYS freed */ + int crlf, /* CRLF newlines instead of LF */ + int *sock /* socket handle or 0 for this session's client socket */ + ) +{ + StrBuf *Message; + + Message = CtdlReadMessageBodyBuf(terminator, + tlen, + maxlen, + exist, + crlf, + sock); + if (Message == NULL) + return NULL; + else + return SmashStrBuf(&Message); +} /* @@ -3328,6 +3727,8 @@ struct CtdlMessage *CtdlMakeMessage( char dest_node[256]; char buf[1024]; struct CtdlMessage *msg; + StrBuf *FakeAuthor; + StrBuf *FakeEncAuthor = NULL; msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); @@ -3357,11 +3758,14 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_fields['T'] = strdup(buf); if ((fake_name != NULL) && (fake_name[0])) { /* author */ - msg->cm_fields['A'] = strdup(fake_name); + FakeAuthor = NewStrBufPlain (fake_name, -1); } else { - msg->cm_fields['A'] = strdup(author->fullname); + FakeAuthor = NewStrBufPlain (author->fullname, -1); } + StrBufRFC2047encode(&FakeEncAuthor, FakeAuthor); + msg->cm_fields['A'] = SmashStrBuf(&FakeEncAuthor); + FreeStrBuf(&FakeAuthor); if (CC->room.QRflags & QR_MAILBOX) { /* room */ msg->cm_fields['O'] = strdup(&CC->room.QRname[11]); @@ -3426,7 +3830,7 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_fields['M'] = preformatted_text; } else { - msg->cm_fields['M'] = CtdlReadMessageBody("000", config.c_maxmsglen, NULL, 0, 0); + msg->cm_fields['M'] = CtdlReadMessageBody(HKEY("000"), config.c_maxmsglen, NULL, 0, 0); } return(msg); @@ -3438,10 +3842,13 @@ struct CtdlMessage *CtdlMakeMessage( * room. Returns a *CITADEL ERROR CODE* and puts a message in errmsgbuf, or * returns 0 on success. */ -int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, - size_t n, - const char* RemoteIdentifier, - int PostPublic) { +int CtdlDoIHavePermissionToPostInThisRoom( + char *errmsgbuf, + size_t n, + const char* RemoteIdentifier, + int PostPublic, + int is_reply +) { int ra; if (!(CC->logged_in) && @@ -3498,7 +3905,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, } - if ((CC->user.axlevel < 2) + if ((CC->user.axlevel < AxProbU) && ((CC->room.QRflags & QR_MAILBOX) == 0)) { snprintf(errmsgbuf, n, "Need to be validated to enter " "(except in %s> to sysop)", MAILROOM); @@ -3506,7 +3913,18 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, } CtdlRoomAccess(&CC->room, &CC->user, &ra, NULL); - if (!(ra & UA_POSTALLOWED)) { + + if ( (!(ra & UA_POSTALLOWED)) && (ra & UA_REPLYALLOWED) && (!is_reply) ) { + /* + * To be thorough, we ought to check to see if the message they are + * replying to is actually a valid one in this room, but unless this + * actually becomes a problem we'll go with high performance instead. + */ + snprintf(errmsgbuf, n, "You may only reply to existing messages here."); + return (ERROR + HIGHER_ACCESS_REQUIRED); + } + + else if (!(ra & UA_POSTALLOWED)) { snprintf(errmsgbuf, n, "Higher access is required to post in this room."); return (ERROR + HIGHER_ACCESS_REQUIRED); } @@ -3523,7 +3941,7 @@ int CtdlDoIHavePermissionToPostInThisRoom(char *errmsgbuf, int CtdlCheckInternetMailPermission(struct ctdluser *who) { /* Do not allow twits to send Internet mail */ - if (who->axlevel <= 2) return(0); + if (who->axlevel <= AxProbU) return(0); /* Globally enabled? */ if (config.c_restrict == 0) return(1); @@ -3532,7 +3950,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) { if (who->flags & US_INTERNET) return(2); /* Aide level access? */ - if (who->axlevel >= 6) return(3); + if (who->axlevel >= AxAideU) return(3); /* No mail for you! */ return(0); @@ -3548,7 +3966,7 @@ int CtdlCheckInternetMailPermission(struct ctdluser *who) { * * Caller needs to free the result using free_recipients() */ -struct recptypes *validate_recipients(char *supplied_recipients, +struct recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) { struct recptypes *ret; @@ -3631,7 +4049,7 @@ struct recptypes *validate_recipients(char *supplied_recipients, striplt(this_recp); if (IsEmptyStr(this_recp)) break; - CtdlLogPrintf(CTDL_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); + syslog(LOG_DEBUG, "Evaluating recipient #%d: %s\n", num_recps, this_recp); ++num_recps; mailtype = alias(this_recp); mailtype = alias(this_recp); @@ -3666,10 +4084,12 @@ struct recptypes *validate_recipients(char *supplied_recipients, CC->room = tempQR; /* Check permissions to send mail to this room */ - err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, - sizeof errmsg, - RemoteIdentifier, - Flags + err = CtdlDoIHavePermissionToPostInThisRoom( + errmsg, + sizeof errmsg, + RemoteIdentifier, + Flags, + 0 /* 0 = not a reply */ ); if (err) { @@ -3773,12 +4193,12 @@ struct recptypes *validate_recipients(char *supplied_recipients, strcpy(ret->errormsg, "No recipients specified."); } - CtdlLogPrintf(CTDL_DEBUG, "validate_recipients()\n"); - CtdlLogPrintf(CTDL_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); - CtdlLogPrintf(CTDL_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); - CtdlLogPrintf(CTDL_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); - CtdlLogPrintf(CTDL_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); - CtdlLogPrintf(CTDL_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); + syslog(LOG_DEBUG, "validate_recipients()\n"); + syslog(LOG_DEBUG, " local: %d <%s>\n", ret->num_local, ret->recp_local); + syslog(LOG_DEBUG, " room: %d <%s>\n", ret->num_room, ret->recp_room); + syslog(LOG_DEBUG, " inet: %d <%s>\n", ret->num_internet, ret->recp_internet); + syslog(LOG_DEBUG, " ignet: %d <%s>\n", ret->num_ignet, ret->recp_ignet); + syslog(LOG_DEBUG, " error: %d <%s>\n", ret->num_error, ret->errormsg); free(recipients); return(ret); @@ -3795,7 +4215,7 @@ void free_recipients(struct recptypes *valid) { } if (valid->recptypes_magic != RECPTYPES_MAGIC) { - CtdlLogPrintf(CTDL_EMERG, "Attempt to call free_recipients() on some other data type!\n"); + syslog(LOG_EMERG, "Attempt to call free_recipients() on some other data type!\n"); abort(); } @@ -3872,7 +4292,13 @@ void cmd_ent0(char *entargs) /* first check to make sure the request is valid. */ - err = CtdlDoIHavePermissionToPostInThisRoom(errmsg, sizeof errmsg, NULL, POST_LOGGED_IN); + err = CtdlDoIHavePermissionToPostInThisRoom( + errmsg, + sizeof errmsg, + NULL, + POST_LOGGED_IN, + (!IsEmptyStr(references)) /* is this a reply? or a top-level post? */ + ); if (err) { cprintf("%d %s\n", err, errmsg); @@ -3884,7 +4310,7 @@ void cmd_ent0(char *entargs) if (IsEmptyStr(newusername)) { strcpy(newusername, CC->user.fullname); } - if ( (CC->user.axlevel < 6) + if ( (CC->user.axlevel < AxAideU) && (strcasecmp(newusername, CC->user.fullname)) && (strcasecmp(newusername, CC->cs_inet_fn)) ) { @@ -3928,13 +4354,14 @@ void cmd_ent0(char *entargs) /* In mailbox rooms we have to behave a little differently -- * make sure the user has specified at least one recipient. Then * validate the recipient(s). We do this for the Mail> room, as - * well as any room which has the "Mailbox" view set. + * well as any room which has the "Mailbox" view set - unless it + * is the DRAFTS room which does not require recipients */ - if ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) ) - || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) ) - ) { - if (CC->user.axlevel < 2) { + if ( ( ( (CC->room.QRflags & QR_MAILBOX) && (!strcasecmp(&CC->room.QRname[11], MAILROOM)) ) + || ( (CC->room.QRflags & QR_MAILBOX) && (CC->curr_view == VIEW_MAILBOX) ) + ) && (strcasecmp(&CC->room.QRname[11], USERDRAFTROOM)) !=0 ) { + if (CC->user.axlevel < AxProbU) { strcpy(recp, "sysop"); strcpy(cc, ""); strcpy(bcc, ""); @@ -3986,7 +4413,7 @@ void cmd_ent0(char *entargs) } if ( ( (valid_to->num_internet + valid_to->num_ignet + valid_cc->num_internet + valid_cc->num_ignet + valid_bcc->num_internet + valid_bcc->num_ignet) > 0) - && (CC->user.axlevel < 4) ) { + && (CC->user.axlevel < AxNetU) ) { cprintf("%d Higher access required for network mail.\n", ERROR + HIGHER_ACCESS_REQUIRED); free_recipients(valid_to); @@ -4145,12 +4572,12 @@ int CtdlDeleteMessages(char *room_name, /* which room */ regcomp(&re, content_type, 0); need_to_free_re = 1; } - CtdlLogPrintf(CTDL_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n", + syslog(LOG_DEBUG, "CtdlDeleteMessages(%s, %d msgs, %s)\n", room_name, num_dmsgnums, content_type); /* get room record, obtaining a lock... */ if (CtdlGetRoomLock(&qrbuf, room_name) != 0) { - CtdlLogPrintf(CTDL_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", + syslog(LOG_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", room_name); if (need_to_free_re) regfree(&re); return (0); /* room not found */ @@ -4204,7 +4631,10 @@ int CtdlDeleteMessages(char *room_name, /* which room */ cdb_store(CDB_MSGLISTS, &qrbuf.QRnumber, (int)sizeof(long), msglist, (int)(num_msgs * sizeof(long))); - qrbuf.QRhighest = msglist[num_msgs - 1]; + if (num_msgs > 0) + qrbuf.QRhighest = msglist[num_msgs - 1]; + else + qrbuf.QRhighest = 0; } CtdlPutRoomLock(&qrbuf); @@ -4224,7 +4654,7 @@ int CtdlDeleteMessages(char *room_name, /* which room */ /* Now free the memory we used, and go away. */ if (msglist != NULL) free(msglist); if (dellist != NULL) free(dellist); - CtdlLogPrintf(CTDL_DEBUG, "%d message(s) deleted.\n", num_deleted); + syslog(LOG_DEBUG, "%d message(s) deleted.\n", num_deleted); if (need_to_free_re) regfree(&re); return (num_deleted); } @@ -4342,7 +4772,7 @@ void cmd_move(char *args) permit = 0; /* Aides can move/copy */ - if (CC->user.axlevel >= 6) permit = 1; + if (CC->user.axlevel >= AxAideU) permit = 1; /* Room aides can move/copy */ if (CC->user.usernum == CC->room.QRroomaide) permit = 1; @@ -4384,7 +4814,7 @@ void cmd_move(char *args) /* * Do the copy */ - err = CtdlSaveMsgPointersInRoom(targ, msgs, num_msgs, 1, NULL); + err = CtdlSaveMsgPointersInRoom(targ, msgs, num_msgs, 1, NULL, 0); if (err != 0) { cprintf("%d Cannot store message(s) in %s: error %d\n", err, targ, err); @@ -4458,6 +4888,10 @@ void AdjRefCount(long msgnum, int incr) struct arcq new_arcq; int rv = 0; + syslog(LOG_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", + msgnum, incr + ); + begin_critical_section(S_SUPPMSGMAIN); if (arcfp == NULL) { arcfp = fopen(file_arcq, "ab+"); @@ -4466,7 +4900,7 @@ void AdjRefCount(long msgnum, int incr) /* msgnum < 0 means that we're trying to close the file */ if (msgnum < 0) { - CtdlLogPrintf(CTDL_DEBUG, "Closing the AdjRefCount queue file\n"); + syslog(LOG_DEBUG, "Closing the AdjRefCount queue file\n"); begin_critical_section(S_SUPPMSGMAIN); if (arcfp != NULL) { fclose(arcfp); @@ -4518,7 +4952,7 @@ int TDAP_ProcessAdjRefCountQueue(void) r = link(file_arcq, file_arcq_temp); if (r != 0) { - CtdlLogPrintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); end_critical_section(S_SUPPMSGMAIN); return(num_records_processed); } @@ -4528,7 +4962,7 @@ int TDAP_ProcessAdjRefCountQueue(void) fp = fopen(file_arcq_temp, "rb"); if (fp == NULL) { - CtdlLogPrintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); return(num_records_processed); } @@ -4540,7 +4974,7 @@ int TDAP_ProcessAdjRefCountQueue(void) fclose(fp); r = unlink(file_arcq_temp); if (r != 0) { - CtdlLogPrintf(CTDL_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); + syslog(LOG_CRIT, "%s: %s\n", file_arcq_temp, strerror(errno)); } return(num_records_processed); @@ -4571,14 +5005,15 @@ void TDAP_AdjRefCount(long msgnum, int incr) smi.meta_refcount += incr; PutMetaData(&smi); end_critical_section(S_SUPPMSGMAIN); - CtdlLogPrintf(CTDL_DEBUG, "msg %ld ref count delta %+d, is now %d\n", - msgnum, incr, smi.meta_refcount); + syslog(LOG_DEBUG, "TDAP_AdjRefCount() msg %ld ref count delta %+d, is now %d\n", + msgnum, incr, smi.meta_refcount + ); /* If the reference count is now zero, delete the message * (and its supplementary record as well). */ if (smi.meta_refcount == 0) { - CtdlLogPrintf(CTDL_DEBUG, "Deleting message <%ld>\n", msgnum); + syslog(LOG_DEBUG, "Deleting message <%ld>\n", msgnum); /* Call delete hooks with NULL room to show it has gone altogether */ PerformDeleteHooks(NULL, msgnum); @@ -4624,7 +5059,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ safestrncpy(roomname, req_room, sizeof(roomname)); } - CtdlLogPrintf(CTDL_DEBUG, "Raw length is %ld\n", (long)raw_length); + syslog(LOG_DEBUG, "Raw length is %ld\n", (long)raw_length); if (is_binary) { encoded_message = malloc((size_t) (((raw_length * 134) / 100) + 4096 ) ); @@ -4662,7 +5097,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ ); } - CtdlLogPrintf(CTDL_DEBUG, "Allocating\n"); + syslog(LOG_DEBUG, "Allocating\n"); msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); msg->cm_magic = CTDLMESSAGE_MAGIC; @@ -4686,7 +5121,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ * other objects of this type that are currently in the room. */ if (is_unique) { - CtdlLogPrintf(CTDL_DEBUG, "Deleted %d other msgs of this type\n", + syslog(LOG_DEBUG, "Deleted %d other msgs of this type\n", CtdlDeleteMessages(roomname, NULL, 0, content_type) ); } @@ -4811,19 +5246,21 @@ void cmd_isme(char *argbuf) { CTDL_MODULE_INIT(msgbase) { - CtdlRegisterProtoHook(cmd_msgs, "MSGS", "Output a list of messages in the current room"); - CtdlRegisterProtoHook(cmd_msg0, "MSG0", "Output a message in plain text format"); - CtdlRegisterProtoHook(cmd_msg2, "MSG2", "Output a message in RFC822 format"); - CtdlRegisterProtoHook(cmd_msg3, "MSG3", "Output a message in raw format (deprecated)"); - CtdlRegisterProtoHook(cmd_msg4, "MSG4", "Output a message in the client's preferred format"); - CtdlRegisterProtoHook(cmd_msgp, "MSGP", "Select preferred format for MSG4 output"); - CtdlRegisterProtoHook(cmd_opna, "OPNA", "Open an attachment for download"); - CtdlRegisterProtoHook(cmd_dlat, "DLAT", "Download an attachment"); - CtdlRegisterProtoHook(cmd_ent0, "ENT0", "Enter a message"); - CtdlRegisterProtoHook(cmd_dele, "DELE", "Delete a message"); - CtdlRegisterProtoHook(cmd_move, "MOVE", "Move or copy a message to another room"); - CtdlRegisterProtoHook(cmd_isme, "ISME", "Determine whether an email address belongs to a user"); + if (!threading) { + CtdlRegisterProtoHook(cmd_msgs, "MSGS", "Output a list of messages in the current room"); + CtdlRegisterProtoHook(cmd_msg0, "MSG0", "Output a message in plain text format"); + CtdlRegisterProtoHook(cmd_msg2, "MSG2", "Output a message in RFC822 format"); + CtdlRegisterProtoHook(cmd_msg3, "MSG3", "Output a message in raw format (deprecated)"); + CtdlRegisterProtoHook(cmd_msg4, "MSG4", "Output a message in the client's preferred format"); + CtdlRegisterProtoHook(cmd_msgp, "MSGP", "Select preferred format for MSG4 output"); + CtdlRegisterProtoHook(cmd_opna, "OPNA", "Open an attachment for download"); + CtdlRegisterProtoHook(cmd_dlat, "DLAT", "Download an attachment"); + CtdlRegisterProtoHook(cmd_ent0, "ENT0", "Enter a message"); + CtdlRegisterProtoHook(cmd_dele, "DELE", "Delete a message"); + CtdlRegisterProtoHook(cmd_move, "MOVE", "Move or copy a message to another room"); + CtdlRegisterProtoHook(cmd_isme, "ISME", "Determine whether an email address belongs to a user"); + } /* return our Subversion id for the Log */ - return "$Id$"; + return "msgbase"; }