X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=2de00fd2909475770ebbcdfb4b616487e03b04e7;hb=981c64649e8886f81cb64e31ac80d8bc56b0923d;hp=066e1382bebb73c0d031f686de42d2d141efd9d2;hpb=1dc2cbb85c19d50776e1877701bd8414b8999cde;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index 066e1382b..2de00fd29 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -2,7 +2,22 @@ * $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. * + * 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|\n", + msgnum, + (msg->cm_fields['U'] ? msg->cm_fields['U'] : "") + ); + CtdlFreeMessage(msg); +} + + + /* Determine if a given message matches the fields in a message template. @@ -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) { @@ -469,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); @@ -488,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); } @@ -504,34 +537,43 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, was_seen = is_seen; } - while (StrLength(vset) > SIZ) { - /* - * 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) { - StrBuf *first_tok; - first_tok = NewStrBuf(); - StrBufRemove_token(vset, 0, ','); - 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; + /* + * 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)); @@ -560,7 +602,7 @@ 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) { @@ -588,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 */ @@ -753,14 +795,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)) @@ -816,13 +870,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"); } @@ -1426,6 +1479,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) * @@ -1436,21 +1499,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 */ @@ -1702,6 +1773,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) { @@ -1809,7 +1887,7 @@ int CtdlOutputPreLoadedMsg( 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; i 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); @@ -2365,7 +2443,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) ) { @@ -2406,7 +2484,7 @@ 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; iroom.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); } /* @@ -2855,9 +2933,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)) { @@ -2879,10 +2957,10 @@ 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); if (!IsEmptyStr(config.c_funambol_host) || !IsEmptyStr(config.c_pager_program)) { @@ -2965,7 +3043,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 @@ -3020,7 +3098,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; @@ -3068,6 +3146,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); +} /* @@ -3577,7 +3659,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; @@ -3606,7 +3688,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)) { @@ -3614,7 +3696,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)) { @@ -4067,7 +4149,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); @@ -4124,7 +4206,7 @@ int CtdlDeleteMessages(char *room_name, /* which room */ qrbuf.QRhighest = msglist[num_msgs - 1]; } - 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 @@ -4241,7 +4323,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; } @@ -4251,7 +4333,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. @@ -4536,7 +4618,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)); @@ -4595,8 +4677,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); } @@ -4631,8 +4713,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; } @@ -4659,7 +4741,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);