/*
* Message journaling functions.
+ *
+ * Copyright (c) 1987-2020 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3.
+ *
+ * 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.
*/
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
-#include <fcntl.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-
-#include <ctype.h>
-#include <string.h>
-#include <limits.h>
-#include <errno.h>
-#include <stdarg.h>
-#include <sys/stat.h>
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "database.h"
-#include "msgbase.h"
-#include "support.h"
-#include "sysdep_decls.h"
+#include "ctdl_module.h"
#include "citserver.h"
-#include "room_ops.h"
-#include "user_ops.h"
-#include "file_ops.h"
#include "config.h"
-#include "control.h"
-#include "genstamp.h"
-#include "internet_addressing.h"
+#include "user_ops.h"
#include "serv_vcard.h" /* Needed for vcard_getuser and extract_inet_email_addrs */
+#include "internet_addressing.h"
#include "journaling.h"
-#include "ctdl_module.h"
-#include "threads.h"
-
struct jnlq *jnlq = NULL; /* journal queue */
/*
*/
void JournalBackgroundSubmit(struct CtdlMessage *msg,
StrBuf *saved_rfc822_version,
- struct recptypes *recps) {
+ recptypes *recps) {
struct jnlq *jptr = NULL;
return;
}
memset(jptr, 0, sizeof(struct jnlq));
- if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(struct recptypes));
+ if (recps != NULL) memcpy(&jptr->recps, recps, sizeof(recptypes));
if (!CM_IsEmpty(msg, eAuthor)) jptr->from = strdup(msg->cm_fields[eAuthor]);
- if (!CM_IsEmpty(msg, eNodeName)) jptr->node = strdup(msg->cm_fields[eNodeName]);
if (!CM_IsEmpty(msg, erFc822Addr)) jptr->rfca = strdup(msg->cm_fields[erFc822Addr]);
if (!CM_IsEmpty(msg, eMsgSubject)) jptr->subj = strdup(msg->cm_fields[eMsgSubject]);
if (!CM_IsEmpty(msg, emessageId)) jptr->msgn = strdup(msg->cm_fields[emessageId]);
/*
* Convert a local user name to an internet email address for the journal
- */
-
-/*
- * TODODRW: change this into a CtdlModuleDo type function that returns alternative address info
- * for this local user. Something like CtdlModuleGoGetAddr(char *localuser, int type, char *alt_addr, size_t alt_addr_len)
- * where type can be ADDR_EMAIL, ADDR_FIDO, ADDR_UUCP, ADDR_WEB, ADDR_POSTAL etc etc.
- * This then begs the question of what should be returned. Is it wise to return a single char* using a comma as a
- * delimiter? Or would it be better to return a linked list of some kind?
+ * FIXME - grab the user's Internet email address from the user record, not from vCard !!!!
*/
void local_to_inetemail(char *inetemail, char *localuser, size_t inetemail_len) {
struct ctdluser us;
void JournalRunQueueMsg(struct jnlq *jmsg) {
struct CtdlMessage *journal_msg = NULL;
- struct recptypes *journal_recps = NULL;
+ recptypes *journal_recps = NULL;
StrBuf *message_text = NULL;
char mime_boundary[256];
long mblen;
if (jmsg == NULL)
return;
- journal_recps = validate_recipients(config.c_journal_dest, NULL, 0);
+ journal_recps = validate_recipients(CtdlGetConfigStr("c_journal_dest"), NULL, 0);
if (journal_recps != NULL) {
if ( (journal_recps->num_local > 0)
|| (journal_recps->num_internet > 0)
- || (journal_recps->num_ignet > 0)
|| (journal_recps->num_room > 0)
) {
journal_msg->cm_anon_type = MES_NORMAL;
journal_msg->cm_format_type = FMT_RFC822;
CM_SetField(journal_msg, eJournal, HKEY("is journal"));
- CM_SetField(journal_msg, eAuthor, jmsg->from, strlen(jmsg->from));
- CM_SetField(journal_msg, eNodeName, jmsg->node, strlen(jmsg->node));
- CM_SetField(journal_msg, erFc822Addr, jmsg->rfca, strlen(jmsg->rfca));
- CM_SetField(journal_msg, eMsgSubject, jmsg->subj, strlen(jmsg->subj));
+
+ if (!IsEmptyStr(jmsg->from)) {
+ CM_SetField(journal_msg, eAuthor, jmsg->from, -1);
+ }
+
+ if (!IsEmptyStr(jmsg->rfca)) {
+ CM_SetField(journal_msg, erFc822Addr, jmsg->rfca, -1);
+ }
+
+ if (!IsEmptyStr(jmsg->subj)) {
+ CM_SetField(journal_msg, eMsgSubject, jmsg->subj, -1);
+ }
mblen = snprintf(mime_boundary, sizeof(mime_boundary),
"--Citadel-Journal-%08lx-%04x--", time(NULL), ++seq);
- rfc822len = strlen(jmsg->rfc822);
-
- message_text = NewStrBufPlain(NULL, rfc822len + sizeof(struct recptypes) + 1024);
+
+ if (!IsEmptyStr(jmsg->rfc822)) {
+ rfc822len = strlen(jmsg->rfc822);
+ }
+ else {
+ rfc822len = 0;
+ }
+
+ message_text = NewStrBufPlain(NULL, rfc822len + sizeof(recptypes) + 1024);
/*
* Here is where we begin to compose the journalized message.
- * NOTE: the superfluous "Content-Identifer: ExJournalReport" header was
- * requested by a paying customer, and yes, it is intentionally
- * spelled wrong. Do NOT remove or change it.
+ * (The "ExJournalReport" header is consumed by some email retention services which assume the journaling agent is Exchange.)
*/
StrBufAppendBufPlain(
message_text,
- HKEY("Content-type: multipart/mixed; boundary=\""), 0);
+ HKEY("Content-type: multipart/mixed; boundary=\""),
+ 0
+ );
StrBufAppendBufPlain(message_text, mime_boundary, mblen, 0);
StrBufAppendBufPlain(
message_text,
HKEY("\"\r\n"
- "Content-Identifer: ExJournalReport\r\n"
+ "Content-Identifier: ExJournalReport\r\n"
"MIME-Version: 1.0\r\n"
"\n"
- "--"), 0);
+ "--"),
+ 0
+ );
StrBufAppendBufPlain(message_text, mime_boundary, mblen, 0);
StrBufAppendPrintf(message_text, " <%s>",
journal_msg->cm_fields[erFc822Addr]);
}
- else if (!CM_IsEmpty(journal_msg, eNodeName)) {
- StrBufAppendPrintf(message_text, " @ %s",
- journal_msg->cm_fields[eNodeName]);
- }
- else
- StrBufAppendBufPlain(
- message_text,
- HKEY(" "), 0);
-
- StrBufAppendBufPlain(
- message_text,
- HKEY("\r\n"
- "Message-ID: <"), 0);
+ StrBufAppendBufPlain(message_text, HKEY("\r\nMessage-ID: <"), 0);
StrBufAppendBufPlain(message_text, jmsg->msgn, -1, 0);
- StrBufAppendBufPlain(
- message_text,
- HKEY(">\r\n"
- "Recipients:\r\n"), 0);
+ StrBufAppendBufPlain(message_text, HKEY(">\r\nRecipients:\r\n"), 0);
if (jmsg->recps.num_local > 0) {
for (i=0; i<jmsg->recps.num_local; ++i) {
- extract_token(recipient, jmsg->recps.recp_local,
- i, '|', sizeof recipient);
+ extract_token(recipient, jmsg->recps.recp_local, i, '|', sizeof recipient);
local_to_inetemail(inetemail, recipient, sizeof inetemail);
- StrBufAppendPrintf(message_text,
- " %s <%s>\r\n", recipient, inetemail);
- }
- }
-
- if (jmsg->recps.num_ignet > 0) {
- for (i=0; i<jmsg->recps.num_ignet; ++i) {
- extract_token(recipient, jmsg->recps.recp_ignet,
- i, '|', sizeof recipient);
- StrBufAppendPrintf(message_text,
- " %s\r\n", recipient);
+ StrBufAppendPrintf(message_text, " %s <%s>\r\n", recipient, inetemail);
}
}
if (jmsg->recps.num_internet > 0) {
for (i=0; i<jmsg->recps.num_internet; ++i) {
- extract_token(recipient, jmsg->recps.recp_internet,
- i, '|', sizeof recipient);
- StrBufAppendPrintf(message_text,
- " %s\r\n", recipient);
+ extract_token(recipient, jmsg->recps.recp_internet, i, '|', sizeof recipient);
+ StrBufAppendPrintf(message_text, " %s\r\n", recipient);
}
}
- StrBufAppendBufPlain(
- message_text,
- HKEY("\r\n"
- "--"), 0);
-
+ StrBufAppendBufPlain(message_text, HKEY("\r\n" "--"), 0);
StrBufAppendBufPlain(message_text, mime_boundary, mblen, 0);
-
- StrBufAppendBufPlain(
- message_text,
- HKEY("\r\n"
- "Content-type: message/rfc822\r\n"
- "\r\n"), 0);
-
+ StrBufAppendBufPlain(message_text, HKEY("\r\nContent-type: message/rfc822\r\n\r\n"), 0);
StrBufAppendBufPlain(message_text, jmsg->rfc822, rfc822len, 0);
-
- StrBufAppendBufPlain(
- message_text,
- HKEY("--"), 0);
-
+ StrBufAppendBufPlain(message_text, HKEY("--"), 0);
StrBufAppendBufPlain(message_text, mime_boundary, mblen, 0);
-
- StrBufAppendBufPlain(
- message_text,
- HKEY("--\r\n"), 0);
+ StrBufAppendBufPlain(message_text, HKEY("--\r\n"), 0);
CM_SetAsFieldSB(journal_msg, eMesageText, &message_text);
free(jmsg->rfc822);
jmsg->msgn = NULL;
/* Submit journal message */
- CtdlSubmitMsg(journal_msg, journal_recps, "", 0);
+ CtdlSubmitMsg(journal_msg, journal_recps, "");
CM_Free(journal_msg);
}
projects / citadel.git / blobdiff