X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=5178f2c5157c38e33750f95f50693dbbd27eec0f;hb=63262a64633e72e4096aaeedda6950c02fb4d990;hp=12e3e5f1205b53bb44c3e3f105883dcde3c4dcef;hpb=8a824f04789e5ae92f15101c2c12bb28b5f921ac;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 12e3e5f12..5178f2c51 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -3,6 +3,21 @@ * * Implements the message store. * + * Copyright (c) 1987-2010 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. + * + * 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" @@ -281,6 +296,28 @@ void headers_listing(long msgnum, void *userdata) CtdlFreeMessage(msg); } +/* + * Back end for the MSGS command: output EUID header. + */ +void headers_euid(long msgnum, void *userdata) +{ + struct CtdlMessage *msg; + + msg = CtdlFetchMessage(msgnum, 0); + if (msg == NULL) { + cprintf("%ld||\n", msgnum); + return; + } + + 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); +} + + + /* Determine if a given message matches the fields in a message template. @@ -319,7 +356,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); @@ -344,7 +381,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; @@ -353,7 +390,6 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, StrBuf *histr; const char *pvset; char *is_set; /* actually an array of booleans */ - int w = 0; /* Don't bother doing *anything* if we were passed a list of zero messages */ if (num_target_msgnums < 1) { @@ -425,7 +461,6 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, histr = NewStrBuf(); pvset = NULL; while (StrBufExtract_NextToken(setstr, vset, &pvset, ',') >= 0) { - /* CtdlLogPrintf(CTDL_DEBUG, "Token: '%s'\n", ChrPtr(setstr)); NOTE ZERO-LENGTH TOKENS */ StrBufExtract_token(lostr, setstr, 0, ':'); if (StrBufNum_tokens(setstr, ':') >= 2) { @@ -470,14 +505,11 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, } } - w = 0; /* set to 1 if we write something to the string */ - if ((was_seen == 0) && (is_seen == 1)) { lo = msglist[i]; } else if ((was_seen == 1) && (is_seen == 0)) { hi = msglist[i-1]; - w = 1; if (StrLength(vset) > 0) { StrBufAppendBufPlain(vset, HKEY(","), 0); @@ -489,8 +521,8 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, StrBufAppendPrintf(vset, "%ld:%ld", lo, hi); } } - else if ((is_seen) && (i == num_msgs - 1)) { - w = 1; + + if ((is_seen) && (i == num_msgs - 1)) { if (StrLength(vset) > 0) { StrBufAppendBufPlain(vset, HKEY(","), 0); } @@ -502,26 +534,47 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, } } - /* If the string is getting too long, truncate it at the beginning; repeat up to 9 times * / - if (w) for (j=0; j<9; ++j) { - if ((StrLength(vset) + 20) > sizeof vset) { - remove_token(vset, 0, ','); - if (which_set == ctdlsetseen_seen) { - char temp[SIZ]; - sprintf(temp, "1:%ld,", atol(vset)-1L); - strcat(temp, vset); - strcpy(vset, temp); - } - } - } - we don't get to long anymore. - */ - was_seen = is_seen; } - while (StrLength(vset) > SIZ) + /* + * We will have to stuff this string back into a 4096 byte buffer, so if it's + * larger than that now, truncate it by removing tokens from the beginning. + * The limit of 100 iterations is there to prevent an infinite loop in case + * something unexpected happens. + */ + int number_of_truncations = 0; + while ( (StrLength(vset) > SIZ) && (number_of_truncations < 100) ) { StrBufRemove_token(vset, 0, ','); + ++number_of_truncations; + } + + /* + * If we're truncating the sequence set of messages marked with the 'seen' flag, + * we want the earliest messages (the truncated ones) to be marked, not unmarked. + * Otherwise messages at the beginning will suddenly appear to be 'unseen'. + */ + if ( (which_set == ctdlsetseen_seen) && (number_of_truncations > 0) ) { + StrBuf *first_tok; + first_tok = NewStrBuf(); + StrBufExtract_token(first_tok, vset, 0, ','); + StrBufRemove_token(vset, 0, ','); + + if (StrBufNum_tokens(first_tok, ':') > 1) { + StrBufRemove_token(first_tok, 0, ':'); + } + + StrBuf *new_set; + new_set = NewStrBuf(); + StrBufAppendBufPlain(new_set, HKEY("1:"), 0); + StrBufAppendBuf(new_set, first_tok, 0); + StrBufAppendBufPlain(new_set, HKEY(":"), 0); + StrBufAppendBuf(new_set, vset, 0); + + FreeStrBuf(&vset); + FreeStrBuf(&first_tok); + vset = new_set; + } CtdlLogPrintf(CTDL_DEBUG, " after update: %s\n", ChrPtr(vset)); @@ -549,12 +602,12 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, int CtdlForEachMessage(int mode, long ref, char *search_string, char *content_type, struct CtdlMessage *compare, - void (*CallBack) (long, void *), + ForEachMsgCallback CallBack, void *userdata) { int a, i, j; - struct visit vbuf; + visit vbuf; struct cdbdata *cdbfr; long *msglist = NULL; int num_msgs = 0; @@ -577,7 +630,7 @@ int CtdlForEachMessage(int mode, long ref, char *search_string, } /* Learn about the user and room in question */ - getuser(&CC->user, CC->curr_user); + CtdlGetUser(&CC->user, CC->curr_user); CtdlGetRelationship(&vbuf, &CC->user, &CC->room); /* Load the message list */ @@ -707,6 +760,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)) ) ) { @@ -742,14 +796,26 @@ void cmd_msgs(char *cmdbuf) int i; int with_template = 0; struct CtdlMessage *template = NULL; - int with_headers = 0; char search_string[1024]; + ForEachMsgCallback CallBack; extract_token(which, cmdbuf, 0, '|', sizeof which); cm_ref = extract_int(cmdbuf, 1); extract_token(search_string, cmdbuf, 1, '|', sizeof search_string); with_template = extract_int(cmdbuf, 2); - with_headers = extract_int(cmdbuf, 3); + switch (extract_int(cmdbuf, 3)) + { + default: + case MSG_HDRS_BRIEF: + CallBack = simple_listing; + break; + case MSG_HDRS_ALL: + CallBack = headers_listing; + break; + case MSG_HDRS_EUID: + CallBack = headers_euid; + break; + } strcat(which, " "); if (!strncasecmp(which, "OLD", 3)) @@ -762,6 +828,8 @@ 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 @@ -805,13 +873,12 @@ void cmd_msgs(char *cmdbuf) } CtdlForEachMessage(mode, - ( (mode == MSGS_SEARCH) ? 0 : cm_ref ), - ( (mode == MSGS_SEARCH) ? search_string : NULL ), - NULL, - template, - (with_headers ? headers_listing : simple_listing), - NULL - ); + ( (mode == MSGS_SEARCH) ? 0 : cm_ref ), + ( (mode == MSGS_SEARCH) ? search_string : NULL ), + NULL, + template, + CallBack, + NULL); if (template != NULL) CtdlFreeMessage(template); cprintf("000\n"); } @@ -863,79 +930,56 @@ 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; - } - - 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; + 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') { + client_write(outbuf, len); + len = 0; + client_write(nl, nllen); + 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 */ + client_write(outbuf, len); + len = 0; + client_write(nl, nllen); + 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; } - cprintf("%s ", aaa); - ++c; - c = c + strlen(aaa); - strcpy(aaa, ""); } - if ((ch == 13) || (ch == 10)) { - cprintf("%s%s", aaa, nl); - c = 1; - strcpy(aaa, ""); + else { + outbuf[len++] = ch; + ++column; + if (column > 1000) { /* Beyond 1000 columns, break anywhere */ + client_write(outbuf, len); + len = 0; + client_write(nl, nllen); + column = 0; + } } - - } while (ch > 0); - - cprintf("%s%s", aaa, nl); + } + if (len) { + client_write(outbuf, len); + len = 0; + client_write(nl, nllen); + column = 0; + } } @@ -951,8 +995,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); } } @@ -1040,11 +1091,12 @@ 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); } @@ -1121,7 +1173,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); } } @@ -1415,6 +1468,16 @@ void extract_encapsulated_message(char *name, char *filename, char *partnum, cha + + +int CtdlDoIHavePermissionToReadMessagesInThisRoom(void) { + if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { + return(om_not_logged_in); + } + return(om_ok); +} + + /* * Get a message off disk. (returns om_* values found in msgbase.h) * @@ -1425,21 +1488,29 @@ int CtdlOutputMsg(long msg_num, /* message number (local) to fetch */ int do_proto, /* do Citadel protocol responses? */ int crlf, /* Use CRLF newlines instead of LF? */ char *section, /* NULL or a message/rfc822 section */ - int flags /* should the bessage be exported clean? */ + int flags /* various flags; see msgbase.h */ ) { struct CtdlMessage *TheMessage = NULL; int retcode = om_no_such_msg; struct encapmsg encap; + int r; - CtdlLogPrintf(CTDL_DEBUG, "CtdlOutputMsg() msgnum=%ld, mode=%d, section=%s\n", + CtdlLogPrintf(CTDL_DEBUG, "CtdlOutputMsg(msgnum=%ld, mode=%d, section=%s)\n", msg_num, mode, (section ? section : "<>") ); - if ((!(CC->logged_in)) && (!(CC->internal_pgm))) { - if (do_proto) cprintf("%d Not logged in.\n", - ERROR + NOT_LOGGED_IN); - return(om_not_logged_in); + r = CtdlDoIHavePermissionToReadMessagesInThisRoom(); + if (r != om_ok) { + if (do_proto) { + if (r == om_not_logged_in) { + cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); + } + else { + cprintf("%d An unknown error has occurred.\n", ERROR); + } + } + return(r); } /* FIXME: check message id against msglist for this room */ @@ -1505,7 +1576,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; @@ -1523,6 +1594,8 @@ char *qp_encode_email_addrs(char *source) if (source == NULL) return source; if (IsEmptyStr(source)) return source; + cit_backtrace(); + CtdlLogPrintf(CTDL_DEBUG, "qp_encode_email_addrs: [%s]\n", source); AddrPtr = malloc (sizeof (long) * nAddrPtrMax); AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax); @@ -1570,6 +1643,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'; @@ -1613,6 +1690,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; @@ -1643,6 +1724,330 @@ 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; + + 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) { + client_write(outbuf, outlen); + outlen = 0; + } + } + if (outlen > 0) { + 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'; + + client_write(buf, buflen); + *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) @@ -1655,15 +2060,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 @@ -1675,7 +2074,6 @@ 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", ((TheMessage == NULL) ? "NULL" : "not null"), @@ -1691,6 +2089,13 @@ int CtdlOutputPreLoadedMsg( return(om_no_such_msg); } + /* Suppress envelope recipients if required to avoid disclosing BCC addresses. + * Pad it with spaces in order to avoid changing the RFC822 length of the message. + */ + if ( (flags & SUPPRESS_ENV_TO) && (TheMessage->cm_fields['V'] != NULL) ) { + memset(TheMessage->cm_fields['V'], ' ', strlen(TheMessage->cm_fields['V'])); + } + /* Are we downloading a MIME component? */ if (mode == MT_DOWNLOAD) { if (TheMessage->cm_format_type != FMT_RFC822) { @@ -1763,164 +2168,27 @@ int CtdlOutputPreLoadedMsg( cprintf("nhdr=yes\n"); } - /* begin header processing loop for Citadel message format */ - - 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] - ); - } - } - } - } + if ((mode == MT_CITADEL) || (mode == MT_MIME)) + OutputCtdlMsgHeaders(TheMessage, do_proto); - } /* 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]); @@ -1961,11 +2229,11 @@ 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), @@ -1974,56 +2242,11 @@ START_TEXT: (void *)&ma, 0); } 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; } } @@ -2037,34 +2260,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 @@ -2074,10 +2274,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 @@ -2113,7 +2315,6 @@ DONE: /* now we're done */ } - /* * display a message (mode 0 - Citadel proprietary) */ @@ -2260,8 +2461,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; @@ -2276,8 +2477,9 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms 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); + "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); @@ -2287,7 +2489,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms if (num_newmsgs > 1) supplied_msg = NULL; /* Now the regular stuff */ - if (lgetroom(&CC->room, + if (CtdlGetRoomLock(&CC->room, ((roomname != NULL) ? roomname : CC->room.QRname) ) != 0) { CtdlLogPrintf(CTDL_ERR, "No such room <%s>\n", roomname); @@ -2354,7 +2556,7 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms /* Update the highest-message pointer and unlock the room. */ CC->room.QRhighest = highest_msg; - lputroom(&CC->room); + CtdlPutRoomLock(&CC->room); /* Perform replication checks if necessary */ if ( (DoesThisRoomNeedEuidIndexing(&CC->room)) && (do_repl_check) ) { @@ -2395,11 +2597,13 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms PerformRoomHooks(&CC->room); /* Go back to the room we were in before we wandered here... */ - getroom(&CC->room, hold_rm); + CtdlGetRoom(&CC->room, hold_rm); /* Bump the reference count for all messages which were merged */ - for (i=0; i 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); CtdlDeleteMessages(CC->room.QRname, &old_msgnum, 1, ""); @@ -2628,7 +2832,7 @@ 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? */ + int flags /* should the message be exported clean? */ ) { char submit_filename[128]; char generated_timestamp[32]; @@ -2638,7 +2842,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; @@ -2651,9 +2855,9 @@ 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; @@ -2735,7 +2939,7 @@ 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"); @@ -2749,8 +2953,8 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ CtdlLogPrintf(CTDL_DEBUG, "Final selection: %s\n", actual_rm); if (strcasecmp(actual_rm, CCC->room.QRname)) { - /* getroom(&CCC->room, actual_rm); */ - usergoto(actual_rm, 0, 1, NULL, NULL); + /* CtdlGetRoom(&CCC->room, actual_rm); */ + CtdlUserGoto(actual_rm, 0, 1, NULL, NULL); } /* @@ -2802,15 +3006,11 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ CtdlLogPrintf(CTDL_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); @@ -2844,9 +3044,9 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* Bump this user's messages posted counter. */ CtdlLogPrintf(CTDL_DEBUG, "Updating user\n"); - lgetuser(&CCC->user, CCC->curr_user); + CtdlGetUserLock(&CCC->user, CCC->curr_user); CCC->user.posted = CCC->user.posted + 1; - lputuser(&CCC->user); + CtdlPutUserLock(&CCC->user); /* Decide where bounces need to be delivered */ if ((recps != NULL) && (recps->bounce_to != NULL)) { @@ -2868,12 +3068,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ '|', sizeof recipient); CtdlLogPrintf(CTDL_DEBUG, "Delivering private local mail to <%s>\n", recipient); - if (getuser(&userbuf, recipient) == 0) { + if (CtdlGetUser(&userbuf, recipient) == 0) { // Add a flag so the Funambol module knows its mail msg->cm_fields['W'] = strdup(recipient); - MailboxName(actual_rm, sizeof actual_rm, &userbuf, MAILROOM); + 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 @@ -2954,7 +3154,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); if (strcasecmp(hold_rm, CCC->room.QRname)) - usergoto(hold_rm, 0, 1, NULL, NULL); + CtdlUserGoto(hold_rm, 0, 1, NULL, NULL); /* For internet mail, generate delivery instructions. * Yes, this is recursive. Deal with it. Infinite recursion does @@ -3009,7 +3209,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ if (collected_addresses != NULL) { aptr = (struct addresses_to_be_filed *) malloc(sizeof(struct addresses_to_be_filed)); - MailboxName(actual_rm, sizeof actual_rm, + CtdlMailboxName(actual_rm, sizeof actual_rm, &CCC->user, USERCONTACTSROOM); aptr->roomname = strdup(actual_rm); aptr->collected_addresses = collected_addresses; @@ -3047,7 +3247,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ JournalBackgroundSubmit(msg, saved_rfc822_version, recps); } else { - free(saved_rfc822_version); + FreeStrBuf(&saved_rfc822_version); } } @@ -3057,6 +3257,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ +void aide_message (char *text, char *subject) +{ + quickie_message("Citadel",NULL,NULL,AIDEROOM,text,FMT_CITADEL,subject); +} /* @@ -3109,105 +3313,102 @@ 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) < 0) || + (*sock == -1)) + finished = 1; } else { - if (client_getln(buf, (sizeof buf - 3)) < 1) finished = 1; - } - if (!strcmp(buf, terminator)) finished = 1; - if (crlf) { - strcat(buf, "\r\n"); - } - else { - strcat(buf, "\n"); - } - - /* Unescape SMTP-style input of two dots at the beginning of the line */ - if (dotdot) { - if (!strncmp(buf, "..", 2)) { - strcpy(buf, &buf[1]); - } + if (CtdlClientGetLine(LineBuf) < 0) finished = 1; } + if ((StrLength(LineBuf) == tlen) && + (!strcmp(ChrPtr(LineBuf), terminator))) + finished = 1; 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 (crlf) { + StrBufAppendBufPlain(LineBuf, HKEY("\r\n"), 0); } - - /* 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; + 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 (message_len >= maxlen) flushing = 1; + if (StrLength(Message) >= maxlen) flushing = 1; } while (!finished); - return(m); + FreeStrBuf(&LineBuf); + return Message; } +/* + * 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); +} /* @@ -3333,7 +3534,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); @@ -3405,7 +3606,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); @@ -3430,7 +3631,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); @@ -3439,7 +3640,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); @@ -3455,7 +3656,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; @@ -3566,7 +3767,7 @@ struct recptypes *validate_recipients(char *supplied_recipients, strcat(ret->recp_room, this_recp); } else if ( (!strncasecmp(this_recp, "room_", 5)) - && (!getroom(&tempQR, &this_recp_cooked[5])) ) { + && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) { /* Save room so we can restore it later */ tempQR2 = CC->room; @@ -3595,7 +3796,7 @@ struct recptypes *validate_recipients(char *supplied_recipients, CC->room = tempQR2; } - else if (getuser(&tempUS, this_recp) == 0) { + else if (CtdlGetUser(&tempUS, this_recp) == 0) { ++ret->num_local; strcpy(this_recp, tempUS.fullname); if (!IsEmptyStr(ret->recp_local)) { @@ -3603,7 +3804,7 @@ struct recptypes *validate_recipients(char *supplied_recipients, } strcat(ret->recp_local, this_recp); } - else if (getuser(&tempUS, this_recp_cooked) == 0) { + else if (CtdlGetUser(&tempUS, this_recp_cooked) == 0) { ++ret->num_local; strcpy(this_recp, tempUS.fullname); if (!IsEmptyStr(ret->recp_local)) { @@ -3791,7 +3992,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)) ) { @@ -3841,7 +4042,7 @@ void cmd_ent0(char *entargs) 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->user.axlevel < AxProbU) { strcpy(recp, "sysop"); strcpy(cc, ""); strcpy(bcc, ""); @@ -3893,7 +4094,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); @@ -4056,7 +4257,7 @@ int CtdlDeleteMessages(char *room_name, /* which room */ room_name, num_dmsgnums, content_type); /* get room record, obtaining a lock... */ - if (lgetroom(&qrbuf, room_name) != 0) { + if (CtdlGetRoomLock(&qrbuf, room_name) != 0) { CtdlLogPrintf(CTDL_ERR, "CtdlDeleteMessages(): Room <%s> not found\n", room_name); if (need_to_free_re) regfree(&re); @@ -4111,9 +4312,12 @@ 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; } - lputroom(&qrbuf); + CtdlPutRoomLock(&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 @@ -4230,7 +4434,7 @@ void cmd_move(char *args) targ[ROOMNAMELEN - 1] = 0; is_copy = extract_int(args, 2); - if (getroom(&qtemp, targ) != 0) { + if (CtdlGetRoom(&qtemp, targ) != 0) { cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, targ); return; } @@ -4240,7 +4444,7 @@ void cmd_move(char *args) return; } - getuser(&CC->user, CC->curr_user); + CtdlGetUser(&CC->user, CC->curr_user); CtdlRoomAccess(&qtemp, &CC->user, &ra, NULL); /* Check for permission to perform this operation. @@ -4249,7 +4453,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; @@ -4291,7 +4495,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); @@ -4365,6 +4569,10 @@ void AdjRefCount(long msgnum, int incr) struct arcq new_arcq; int rv = 0; + CtdlLogPrintf(CTDL_DEBUG, "AdjRefCount() msg %ld ref count delta %+d\n", + msgnum, incr + ); + begin_critical_section(S_SUPPMSGMAIN); if (arcfp == NULL) { arcfp = fopen(file_arcq, "ab+"); @@ -4478,8 +4686,9 @@ 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); + CtdlLogPrintf(CTDL_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). @@ -4525,7 +4734,7 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ char *encoded_message = NULL; if (is_mailbox != NULL) { - MailboxName(roomname, sizeof roomname, is_mailbox, req_room); + CtdlMailboxName(roomname, sizeof roomname, is_mailbox, req_room); } else { safestrncpy(roomname, req_room, sizeof(roomname)); @@ -4584,8 +4793,8 @@ void CtdlWriteObject(char *req_room, /* Room to stuff it in */ msg->cm_fields['M'] = encoded_message; /* Create the requested room if we have to. */ - if (getroom(&qrbuf, roomname) != 0) { - create_room(roomname, + if (CtdlGetRoom(&qrbuf, roomname) != 0) { + CtdlCreateRoom(roomname, ( (is_mailbox != NULL) ? 5 : 3 ), "", 0, 1, 0, VIEW_BBS); } @@ -4620,8 +4829,8 @@ char *CtdlGetSysConfig(char *sysconfname) { char buf[SIZ]; strcpy(hold_rm, CC->room.QRname); - if (getroom(&CC->room, SYSCONFIGROOM) != 0) { - getroom(&CC->room, hold_rm); + if (CtdlGetRoom(&CC->room, SYSCONFIGROOM) != 0) { + CtdlGetRoom(&CC->room, hold_rm); return NULL; } @@ -4648,7 +4857,7 @@ char *CtdlGetSysConfig(char *sysconfname) { } } - getroom(&CC->room, hold_rm); + CtdlGetRoom(&CC->room, hold_rm); if (conf != NULL) do { extract_token(buf, conf, 0, '\n', sizeof buf); @@ -4718,18 +4927,20 @@ 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$";