X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=d46ec6cf6814fbf7dd3c990eb160c0a5b33da733;hb=c1b1936458ccd0d517148615a6ed753f6a3e30c2;hp=d290e192f0239d034feb68ffa078533e8a27d0b8;hpb=20e9d8cc3be1a2708ded2f027c41c797a9c75e4f;p=citadel.git diff --git a/citadel/msgbase.c b/citadel/msgbase.c index d290e192f..d46ec6cf6 100644 --- a/citadel/msgbase.c +++ b/citadel/msgbase.c @@ -54,6 +54,8 @@ #include "serv_network.h" #include "threads.h" +#include "ctdl_module.h" + long config_msgnum; struct addresses_to_be_filed *atbf = NULL; @@ -298,6 +300,8 @@ int CtdlMsgCmp(struct CtdlMessage *msg, struct CtdlMessage *template) { for (i='A'; i<='Z'; ++i) { if (template->cm_fields[i] != NULL) { if (msg->cm_fields[i] == NULL) { + /* Considered equal if temmplate is empty string */ + if (IsEmptyStr(template->cm_fields[i])) continue; return 1; } if (strcasecmp(msg->cm_fields[i], @@ -335,7 +339,7 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, int target_setting, int which_set, struct ctdluser *which_user, struct ctdlroom *which_room) { struct cdbdata *cdbfr; - int i, j, k; + int i, k; int is_seen = 0; int was_seen = 0; long lo = (-1L); @@ -343,12 +347,12 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, struct visit vbuf; long *msglist; int num_msgs = 0; - char vset[SIZ]; + StrBuf *vset; + StrBuf *setstr; + StrBuf *lostr; + StrBuf *histr; + const char *pvset; char *is_set; /* actually an array of booleans */ - int num_sets; - int s; - int w = 0; - char setstr[SIZ], lostr[SIZ], histr[SIZ]; /* Don't bother doing *anything* if we were passed a list of zero messages */ if (num_target_msgnums < 1) { @@ -390,12 +394,14 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, /* Decide which message set we're manipulating */ switch(which_set) { - case ctdlsetseen_seen: - safestrncpy(vset, vbuf.v_seen, sizeof vset); - break; - case ctdlsetseen_answered: - safestrncpy(vset, vbuf.v_answered, sizeof vset); - break; + case ctdlsetseen_seen: + vset = NewStrBufPlain(vbuf.v_seen, -1); + break; + case ctdlsetseen_answered: + vset = NewStrBufPlain(vbuf.v_answered, -1); + break; + default: + vset = NewStrBuf(); } @@ -410,26 +416,29 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, } #endif - CtdlLogPrintf(CTDL_DEBUG, "before update: %s\n", vset); + CtdlLogPrintf(CTDL_DEBUG, "before update: %s\n", ChrPtr(vset)); /* Translate the existing sequence set into an array of booleans */ - num_sets = num_tokens(vset, ','); - for (s=0; s= 2) { - extract_token(histr, setstr, 1, ':', sizeof histr); + setstr = NewStrBuf(); + lostr = NewStrBuf(); + histr = NewStrBuf(); + pvset = NULL; + while (StrBufExtract_NextToken(setstr, vset, &pvset, ',') >= 0) { + + StrBufExtract_token(lostr, setstr, 0, ':'); + if (StrBufNum_tokens(setstr, ':') >= 2) { + StrBufExtract_token(histr, setstr, 1, ':'); } else { - strcpy(histr, lostr); + FlushStrBuf(histr); + StrBufAppendBuf(histr, lostr, 0); } - lo = atol(lostr); - if (!strcmp(histr, "*")) { + lo = StrTol(lostr); + if (!strcmp(ChrPtr(histr), "*")) { hi = LONG_MAX; } else { - hi = atol(histr); + hi = StrTol(histr); } for (i = 0; i < num_msgs; ++i) { @@ -438,10 +447,13 @@ void CtdlSetSeen(long *target_msgnums, int num_target_msgnums, } } } + FreeStrBuf(&setstr); + FreeStrBuf(&lostr); + FreeStrBuf(&histr); /* Now translate the array of booleans back into a sequence set */ - strcpy(vset, ""); + FlushStrBuf(vset); was_seen = 0; lo = (-1); hi = (-1); @@ -456,69 +468,93 @@ 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 (!IsEmptyStr(vset)) { - strcat(vset, ","); + if (StrLength(vset) > 0) { + StrBufAppendBufPlain(vset, HKEY(","), 0); } if (lo == hi) { - sprintf(&vset[strlen(vset)], "%ld", hi); + StrBufAppendPrintf(vset, "%ld", hi); } else { - sprintf(&vset[strlen(vset)], "%ld:%ld", lo, hi); + StrBufAppendPrintf(vset, "%ld:%ld", lo, hi); } } - else if ((is_seen) && (i == num_msgs - 1)) { - w = 1; - if (!IsEmptyStr(vset)) { - strcat(vset, ","); + + if ((is_seen) && (i == num_msgs - 1)) { + if (StrLength(vset) > 0) { + StrBufAppendBufPlain(vset, HKEY(","), 0); } if ((i==0) || (was_seen == 0)) { - sprintf(&vset[strlen(vset)], "%ld", msglist[i]); + StrBufAppendPrintf(vset, "%ld", msglist[i]); } else { - sprintf(&vset[strlen(vset)], "%ld:%ld", lo, msglist[i]); + StrBufAppendPrintf(vset, "%ld:%ld", lo, msglist[i]); } } - /* 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 ((strlen(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); - } - } + was_seen = is_seen; + } + + /* + * 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); - was_seen = is_seen; + FreeStrBuf(&vset); + FreeStrBuf(&first_tok); + vset = new_set; } - CtdlLogPrintf(CTDL_DEBUG, " after update: %s\n", vset); + CtdlLogPrintf(CTDL_DEBUG, " after update: %s\n", ChrPtr(vset)); /* Decide which message set we're manipulating */ switch (which_set) { case ctdlsetseen_seen: - safestrncpy(vbuf.v_seen, vset, sizeof vbuf.v_seen); + safestrncpy(vbuf.v_seen, ChrPtr(vset), sizeof vbuf.v_seen); break; case ctdlsetseen_answered: - safestrncpy(vbuf.v_answered, vset, sizeof vbuf.v_answered); + safestrncpy(vbuf.v_answered, ChrPtr(vset), sizeof vbuf.v_answered); break; } free(is_set); free(msglist); CtdlSetRelationship(&vbuf, which_user, which_room); + FreeStrBuf(&vset); } @@ -981,6 +1017,7 @@ void mime_download(char *name, char *filename, char *partnum, char *disp, void *content, char *cbtype, char *cbcharset, size_t length, char *encoding, char *cbid, void *cbuserdata) { + int rv = 0; /* Silently go away if there's already a download open. */ if (CC->download_fp != NULL) @@ -994,7 +1031,7 @@ void mime_download(char *name, char *filename, char *partnum, char *disp, if (CC->download_fp == NULL) return; - fwrite(content, length, 1, CC->download_fp); + rv = fwrite(content, length, 1, CC->download_fp); fflush(CC->download_fp); rewind(CC->download_fp); @@ -1404,7 +1441,7 @@ 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; @@ -1670,6 +1707,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) { @@ -1777,7 +1821,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); @@ -2333,7 +2377,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) ) { @@ -2374,7 +2418,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); } /* @@ -2806,14 +2852,12 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ } /* For internet mail, drop a copy in the outbound queue room */ - if (recps != NULL) - if (recps->num_internet > 0) { + if ((recps != NULL) && (recps->num_internet > 0)) { CtdlSaveMsgPointerInRoom(SMTP_SPOOLOUT_ROOM, newmsgid, 0, msg); } /* If other rooms are specified, drop them there too. */ - if (recps != NULL) - if (recps->num_room > 0) + if ((recps != NULL) && (recps->num_room > 0)) for (i=0; irecp_room, '|'); ++i) { extract_token(recipient, recps->recp_room, i, '|', sizeof recipient); @@ -2828,7 +2872,10 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ lputuser(&CCC->user); /* Decide where bounces need to be delivered */ - if (CCC->logged_in) { + if ((recps != NULL) && (recps->bounce_to != NULL)) { + safestrncpy(bounce_to, recps->bounce_to, sizeof bounce_to); + } + else if (CCC->logged_in) { snprintf(bounce_to, sizeof bounce_to, "%s@%s", CCC->user.fullname, config.c_nodename); } else { @@ -2838,8 +2885,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ /* If this is private, local mail, make a copy in the * recipient's mailbox and bump the reference count. */ - if (recps != NULL) - if (recps->num_local > 0) + if ((recps != NULL) && (recps->num_local > 0)) for (i=0; irecp_local, '|'); ++i) { extract_token(recipient, recps->recp_local, i, '|', sizeof recipient); @@ -2896,8 +2942,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ * node. We'll revisit this again in a year or so when everyone has * a network spool receiver that can handle the new style messages. */ - if (recps != NULL) - if (recps->num_ignet > 0) + if ((recps != NULL) && (recps->num_ignet > 0)) for (i=0; irecp_ignet, '|'); ++i) { extract_token(recipient, recps->recp_ignet, i, '|', sizeof recipient); @@ -2917,7 +2962,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ (long) getpid(), CCC->cs_pid, ++seqnum); network_fp = fopen(submit_filename, "wb+"); if (network_fp != NULL) { - fwrite(smr.ser, smr.len, 1, network_fp); + rv = fwrite(smr.ser, smr.len, 1, network_fp); fclose(network_fp); } free(smr.ser); @@ -2932,15 +2977,14 @@ 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 * not happen because the delivery instructions message does not * contain a recipient. */ - if (recps != NULL) - if (recps->num_internet > 0) { + if ((recps != NULL) && (recps->num_internet > 0)) { CtdlLogPrintf(CTDL_DEBUG, "Generating delivery instructions\n"); instr_alloc = 1024; instr = malloc(instr_alloc); @@ -2951,8 +2995,13 @@ long CtdlSubmitMsg(struct CtdlMessage *msg, /* message to save */ bounce_to ); + if (recps->envelope_from != NULL) { + tmp = strlen(instr); + snprintf(&instr[tmp], instr_alloc-tmp, "envelope_from|%s\n", recps->envelope_from); + } + for (i=0; irecp_internet, '|'); ++i) { - size_t tmp = strlen(instr); + tmp = strlen(instr); extract_token(recipient, recps->recp_internet, i, '|', sizeof recipient); if ((tmp + strlen(recipient) + 32) > instr_alloc) { instr_alloc = instr_alloc * 2; @@ -3219,8 +3268,8 @@ struct CtdlMessage *CtdlMakeMessage( /* Don't confuse the poor folks if it's not routed mail. */ strcpy(dest_node, ""); - striplt(recipient); - striplt(recp_cc); + if (recipient != NULL) striplt(recipient); + if (recp_cc != NULL) striplt(recp_cc); /* Path or Return-Path */ if (my_email == NULL) my_email = ""; @@ -3237,10 +3286,12 @@ struct CtdlMessage *CtdlMakeMessage( snprintf(buf, sizeof buf, "%ld", (long)time(NULL)); /* timestamp */ msg->cm_fields['T'] = strdup(buf); - if (fake_name[0]) /* author */ + if ((fake_name != NULL) && (fake_name[0])) { /* author */ msg->cm_fields['A'] = strdup(fake_name); - else + } + else { msg->cm_fields['A'] = strdup(author->fullname); + } if (CC->room.QRflags & QR_MAILBOX) { /* room */ msg->cm_fields['O'] = strdup(&CC->room.QRname[11]); @@ -3252,10 +3303,10 @@ struct CtdlMessage *CtdlMakeMessage( msg->cm_fields['N'] = strdup(NODENAME); /* nodename */ msg->cm_fields['H'] = strdup(HUMANNODE); /* hnodename */ - if (recipient[0] != 0) { + if ((recipient != NULL) && (recipient[0] != 0)) { msg->cm_fields['R'] = strdup(recipient); } - if (recp_cc[0] != 0) { + if ((recp_cc != NULL) && (recp_cc[0] != 0)) { msg->cm_fields['Y'] = strdup(recp_cc); } if (dest_node[0] != 0) { @@ -3538,7 +3589,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; @@ -3684,6 +3735,8 @@ void free_recipients(struct recptypes *valid) { if (valid->recp_ignet != NULL) free(valid->recp_ignet); if (valid->recp_room != NULL) free(valid->recp_room); if (valid->display_recp != NULL) free(valid->display_recp); + if (valid->bounce_to != NULL) free(valid->bounce_to); + if (valid->envelope_from != NULL) free(valid->envelope_from); free(valid); } @@ -4026,7 +4079,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); @@ -4083,7 +4136,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 @@ -4168,19 +4221,6 @@ void cmd_dele(char *args) } -/* - * Back end API function for moves and deletes (multiple messages) - */ -int CtdlCopyMsgsToRoom(long *msgnums, int num_msgs, char *dest) { - int err; - - err = CtdlSaveMsgPointersInRoom(dest, msgnums, num_msgs, 1, NULL); - if (err != 0) return(err); - - return(0); -} - - /* @@ -4213,9 +4253,13 @@ void cmd_move(char *args) targ[ROOMNAMELEN - 1] = 0; is_copy = extract_int(args, 2); - if (getroom(&qtemp, targ) != 0) { - cprintf("%d '%s' does not exist.\n", - ERROR + ROOM_NOT_FOUND, targ); + if (CtdlGetRoom(&qtemp, targ) != 0) { + cprintf("%d '%s' does not exist.\n", ERROR + ROOM_NOT_FOUND, targ); + return; + } + + if (!strcasecmp(qtemp.QRname, CC->room.QRname)) { + cprintf("%d Source and target rooms are the same.\n", ERROR + ALREADY_EXISTS); return; } @@ -4270,7 +4314,7 @@ void cmd_move(char *args) /* * Do the copy */ - err = CtdlCopyMsgsToRoom(msgs, num_msgs, targ); + err = CtdlSaveMsgPointersInRoom(targ, msgs, num_msgs, 1, NULL); if (err != 0) { cprintf("%d Cannot store message(s) in %s: error %d\n", err, targ, err); @@ -4342,6 +4386,7 @@ void PutMetaData(struct MetaData *smibuf) void AdjRefCount(long msgnum, int incr) { struct arcq new_arcq; + int rv = 0; begin_critical_section(S_SUPPMSGMAIN); if (arcfp == NULL) { @@ -4371,7 +4416,7 @@ void AdjRefCount(long msgnum, int incr) new_arcq.arcq_msgnum = msgnum; new_arcq.arcq_delta = incr; - fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp); + rv = fwrite(&new_arcq, sizeof(struct arcq), 1, arcfp); fflush(arcfp); return; @@ -4562,8 +4607,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); } @@ -4598,8 +4643,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; } @@ -4626,7 +4671,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); @@ -4688,3 +4733,27 @@ void cmd_isme(char *argbuf) { } } + + +/*****************************************************************************/ +/* MODULE INITIALIZATION STUFF */ +/*****************************************************************************/ + +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"); + + /* return our Subversion id for the Log */ + return "$Id$"; +}