X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=820c2fe9f6f8448b9b469ff55b2a914a57355b18;hb=0387f48886a9395d89eaca01cd40ab751610426f;hp=a8086b83b103fde4b4b0a5f9a9f2197e1c7d7bb7;hpb=951fbe7c1ee0b3554af22d6ae0d1d51c1642ae0f;p=citadel.git diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c index a8086b83b..820c2fe9f 100644 --- a/citadel/modules/network/serv_netmail.c +++ b/citadel/modules/network/serv_netmail.c @@ -1,16 +1,15 @@ /* - * This module handles shared rooms, inter-Citadel mail, and outbound - * mailing list processing. + * This module handles network mail and mailing list processing. * - * Copyright (c) 2000-2012 by the citadel.org team + * Copyright (c) 2000-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 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. + * 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. * * ** NOTE ** A word on the S_NETCONFIGS semaphore: * This is a fairly high-level type of critical section. It ensures that no @@ -72,7 +71,6 @@ #include "internet_addressing.h" #include "serv_network.h" #include "clientsocket.h" -#include "file_ops.h" #include "citadel_dirs.h" #include "threads.h" #include "context.h" @@ -87,7 +85,6 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN int i; size_t recps_len = 0; RoomNetCfgLine *nptr; - struct CitContext *CCC = CC; *recps = NULL; /* @@ -104,9 +101,7 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN *recps = NewStrBufPlain(NULL, recps_len); if (*recps == NULL) { - QN_syslog(LOG_EMERG, - "Cannot allocate %ld bytes for recps...\n", - (long)recps_len); + syslog(LOG_ERR, "netmail: cannot allocate %ld bytes for recps", (long)recps_len); abort(); } @@ -133,12 +128,11 @@ static void ListCalculateSubject(struct CtdlMessage *msg) int rlen; char *pCh; - if (msg->cm_fields[eMsgSubject] == NULL) { + if (CM_IsEmpty(msg, eMsgSubject)) { Subject = NewStrBufPlain(HKEY("(no subject)")); } else { - Subject = NewStrBufPlain( - msg->cm_fields[eMsgSubject], -1); + Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject)); } FlatSubject = NewStrBufPlain(NULL, StrLength(Subject)); StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL); @@ -165,9 +159,7 @@ static void ListCalculateSubject(struct CtdlMessage *msg) StrBufRFC2047encode(&Subject, FlatSubject); } - if (msg->cm_fields[eMsgSubject] != NULL) - free (msg->cm_fields[eMsgSubject]); - msg->cm_fields[eMsgSubject] = SmashStrBuf(&Subject); + CM_SetAsFieldSB(msg, eMsgSubject, &Subject); FreeStrBuf(&FlatSubject); } @@ -177,20 +169,17 @@ static void ListCalculateSubject(struct CtdlMessage *msg) */ void network_deliver_digest(SpoolControl *sc) { + struct CitContext *CCC = CC; + long len; char buf[SIZ]; + char *pbuf; struct CtdlMessage *msg = NULL; long msglen; - struct recptypes *valid; + recptypes *valid; char bounce_to[256]; - if (sc->Users[listrecp] == NULL) - return; - - if (sc->num_msgs_spooled < 1) { - fclose(sc->digestfp); - sc->digestfp = NULL; + if (sc->Users[digestrecp] == NULL) return; - } msg = malloc(sizeof(struct CtdlMessage)); memset(msg, 0, sizeof(struct CtdlMessage)); @@ -198,17 +187,16 @@ void network_deliver_digest(SpoolControl *sc) msg->cm_format_type = FMT_RFC822; msg->cm_anon_type = MES_NORMAL; - sprintf(buf, "%ld", time(NULL)); - msg->cm_fields[eTimestamp] = strdup(buf); - msg->cm_fields[eAuthor] = strdup(CC->room.QRname); - snprintf(buf, sizeof buf, "[%s]", CC->room.QRname); - msg->cm_fields[eMsgSubject] = strdup(buf); + CM_SetFieldLONG(msg, eTimestamp, time(NULL)); + CM_SetField(msg, eAuthor, CCC->room.QRname, strlen(CCC->room.QRname)); + len = snprintf(buf, sizeof buf, "[%s]", CCC->room.QRname); + CM_SetField(msg, eMsgSubject, buf, len); - CtdlMsgSetCM_Fields(msg, erFc822Addr, SKEY(sc->Users[roommailalias])); - CtdlMsgSetCM_Fields(msg, eRecipient, SKEY(sc->Users[roommailalias])); + CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias])); + CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias])); /* Set the 'List-ID' header */ - CtdlMsgSetCM_Fields(msg, eListID, SKEY(sc->ListID)); + CM_SetField(msg, eListID, SKEY(sc->ListID)); /* * Go fetch the contents of the digest @@ -216,30 +204,26 @@ void network_deliver_digest(SpoolControl *sc) fseek(sc->digestfp, 0L, SEEK_END); msglen = ftell(sc->digestfp); - msg->cm_fields[eMesageText] = malloc(msglen + 1); + pbuf = malloc(msglen + 1); fseek(sc->digestfp, 0L, SEEK_SET); - fread(msg->cm_fields[eMesageText], (size_t)msglen, 1, sc->digestfp); - msg->cm_fields[eMesageText][msglen] = '\0'; - - fclose(sc->digestfp); - sc->digestfp = NULL; + fread(pbuf, (size_t)msglen, 1, sc->digestfp); + pbuf[msglen] = '\0'; + CM_SetAsField(msg, eMesageText, &pbuf, msglen); /* Now generate the delivery instructions */ - if (sc->Users[listrecp] == NULL) - return; /* Where do we want bounces and other noise to be heard? - *Surely not the list members! */ - snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn); + * Surely not the list members! */ + snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn")); /* Now submit the message */ - valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0); + valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0); if (valid != NULL) { valid->bounce_to = strdup(bounce_to); valid->envelope_from = strdup(bounce_to); - CtdlSubmitMsg(msg, valid, NULL, 0); + CtdlSubmitMsg(msg, valid, NULL); } - CtdlFreeMessage(msg); + CM_Free(msg); free_recipients(valid); } @@ -249,37 +233,44 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de struct CtdlMessage *msg = NULL; - /* - * Process digest recipients - */ - if ((sc->Users[digestrecp] == NULL)|| - (sc->digestfp == NULL)) + if (sc->Users[digestrecp] == NULL) return; - msg = CtdlDuplicateMessage(omsg); + /* If there are digest recipients, we have to build a digest */ + if (sc->digestfp == NULL) { + + sc->digestfp = create_digest_file(&sc->room, 1); + + if (sc->digestfp == NULL) + return; + + sc->haveDigest = ftell(sc->digestfp) > 0; + if (!sc->haveDigest) { + fprintf(sc->digestfp, "Content-type: text/plain\n\n"); + } + sc->haveDigest = 1; + } + + msg = CM_Duplicate(omsg); if (msg != NULL) { + sc->haveDigest = 1; fprintf(sc->digestfp, " -----------------------------------" "------------------------------------" "-------\n"); fprintf(sc->digestfp, "From: "); - if (msg->cm_fields[eAuthor] != NULL) { + if (!CM_IsEmpty(msg, eAuthor)) { fprintf(sc->digestfp, "%s ", msg->cm_fields[eAuthor]); } - if (msg->cm_fields[erFc822Addr] != NULL) { + if (!CM_IsEmpty(msg, erFc822Addr)) { fprintf(sc->digestfp, "<%s> ", msg->cm_fields[erFc822Addr]); } - else if (msg->cm_fields[eNodeName] != NULL) { - fprintf(sc->digestfp, - "@%s ", - msg->cm_fields[eNodeName]); - } fprintf(sc->digestfp, "\n"); - if (msg->cm_fields[eMsgSubject] != NULL) { + if (!CM_IsEmpty(msg, eMsgSubject)) { fprintf(sc->digestfp, "Subject: %s\n", msg->cm_fields[eMsgSubject]); @@ -304,7 +295,7 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de FreeStrBuf(&CC->redirect_buffer); sc->num_msgs_spooled += 1; - CtdlFreeMessage(msg); + CM_Free(msg); } } @@ -324,23 +315,22 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele * in order to insert the [list name] in it, etc. */ - msg = CtdlDuplicateMessage(omsg); + msg = CM_Duplicate(omsg); - CtdlMsgSetCM_Fields(msg, eListID, SKEY(sc->Users[roommailalias])); + CM_SetField(msg, eReplyTo, SKEY(sc->Users[roommailalias])); /* if there is no other recipient, Set the recipient * of the list message to the email address of the * room itself. */ - if ((msg->cm_fields[eRecipient] == NULL) || - IsEmptyStr(msg->cm_fields[eRecipient])) + if (CM_IsEmpty(msg, eRecipient)) { - CtdlMsgSetCM_Fields(msg, eRecipient, SKEY(sc->Users[roommailalias])); + CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias])); } /* Set the 'List-ID' header */ - CtdlMsgSetCM_Fields(msg, eListID, SKEY(sc->ListID)); + CM_SetField(msg, eListID, SKEY(sc->ListID)); /* Prepend "[List name]" to the subject */ @@ -348,7 +338,7 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele /* Handle delivery */ network_deliver_list(msg, sc, CC->room.QRname); - CtdlFreeMessage(msg); + CM_Free(msg); } /* @@ -356,7 +346,7 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele */ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName) { - struct recptypes *valid; + recptypes *valid; char bounce_to[256]; /* Don't do this if there were no recipients! */ @@ -367,7 +357,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char /* Where do we want bounces and other noise to be heard? * Surely not the list members! */ - snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn); + snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn")); /* Now submit the message */ valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0); @@ -375,10 +365,10 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char valid->bounce_to = strdup(bounce_to); valid->envelope_from = strdup(bounce_to); valid->sending_room = strdup(RoomName); - CtdlSubmitMsg(msg, valid, NULL, 0); + CtdlSubmitMsg(msg, valid, NULL); free_recipients(valid); } - /* Do not call CtdlFreeMessage(msg) here; the caller will free it. */ + /* Do not call CM_Free(msg) here; the caller will free it. */ } @@ -386,8 +376,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon { struct CtdlMessage *msg = NULL; int ok_to_participate = 0; - StrBuf *Buf = NULL; - struct recptypes *valid; + recptypes *valid; /* * Process client-side list participations for this room @@ -395,7 +384,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon if (sc->Users[participate] == NULL) return; - msg = CtdlDuplicateMessage(omsg); + msg = CM_Duplicate(omsg); /* Only send messages which originated on our own * Citadel network, otherwise we'll end up sending the @@ -403,22 +392,11 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon * is rude... */ ok_to_participate = 0; - if (msg->cm_fields[eNodeName] != NULL) { - if (!strcasecmp(msg->cm_fields[eNodeName], - config.c_nodename)) { - ok_to_participate = 1; - } - - Buf = NewStrBufPlain(msg->cm_fields[eNodeName], -1); - if (CtdlIsValidNode(NULL, - NULL, - Buf, - sc->working_ignetcfg, - sc->the_netmap) == 0) - { - ok_to_participate = 1; - } - } + + // FIXME -- After we removed CitaNet/IGnet support , we now need a new heuristic to determine + // whether a message originated locally. This means the "participate" mode no longer works. + // We'll definitely need to refactor this when we do other federated stuff later. + if (ok_to_participate) { /* Replace the Internet email address of the @@ -426,208 +404,40 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon * room itself, so the remote listserv doesn't * reject us. */ - CtdlMsgSetCM_Fields(msg, erFc822Addr, SKEY(sc->Users[roommailalias])); + CM_SetField(msg, erFc822Addr, SKEY(sc->Users[roommailalias])); valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0); - CtdlMsgSetCM_Fields(msg, eRecipient, SKEY(sc->Users[roommailalias])); - CtdlSubmitMsg(msg, valid, "", 0); + CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias])); + CtdlSubmitMsg(msg, valid, ""); free_recipients(valid); } - FreeStrBuf(&Buf); - CtdlFreeMessage(msg); -} - -void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long *delete_after_send) -{ - StrBuf *Recipient; - StrBuf *RemoteRoom; - const char *Pos = NULL; - struct CtdlMessage *msg = NULL; - struct CitContext *CCC = CC; - struct ser_ret sermsg; - char buf[SIZ]; - char filename[PATH_MAX]; - FILE *fp; - size_t newpath_len; - char *newpath = NULL; - StrBuf *Buf = NULL; - int i; - int bang = 0; - int send = 1; - - if (sc->Users[ignet_push_share] == NULL) - return; - - /* - * Process IGnet push shares - */ - msg = CtdlDuplicateMessage(omsg); - - /* Prepend our node name to the Path field whenever - * sending a message to another IGnet node - */ - if (msg->cm_fields[eMessagePath] == NULL) - { - msg->cm_fields[eMessagePath] = strdup("username"); - } - newpath_len = strlen(msg->cm_fields[eMessagePath]) + - strlen(config.c_nodename) + 2; - newpath = malloc(newpath_len); - snprintf(newpath, newpath_len, "%s!%s", - config.c_nodename, msg->cm_fields[eMessagePath]); - free(msg->cm_fields[eMessagePath]); - msg->cm_fields[eMessagePath] = newpath; - - /* - * Determine if this message is set to be deleted - * after sending out on the network - */ - if (msg->cm_fields[eSpecialField] != NULL) { - if (!strcasecmp(msg->cm_fields[eSpecialField], "CANCEL")) { - *delete_after_send = 1; - } - } - - /* Now send it to every node */ - Recipient = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share])); - RemoteRoom = NewStrBufPlain(NULL, StrLength(sc->Users[ignet_push_share])); - while ((Pos != StrBufNOTNULL) && - StrBufExtract_NextToken(Recipient, sc->Users[ignet_push_share], &Pos, ',')) - { - StrBufExtract_NextToken(RemoteRoom, sc->Users[ignet_push_share], &Pos, ','); - send = 1; - NewStrBufDupAppendFlush(&Buf, Recipient, NULL, 1); - - /* Check for valid node name */ - if (CtdlIsValidNode(NULL, - NULL, - Buf, - sc->working_ignetcfg, - sc->the_netmap) != 0) - { - QN_syslog(LOG_ERR, - "Invalid node <%s>\n", - ChrPtr(Recipient)); - - send = 0; - } - - /* Check for split horizon */ - QN_syslog(LOG_DEBUG, "Path is %s\n", msg->cm_fields[eMessagePath]); - bang = num_tokens(msg->cm_fields[eMessagePath], '!'); - if (bang > 1) { - for (i=0; i<(bang-1); ++i) { - extract_token(buf, - msg->cm_fields[eMessagePath], - i, '!', - sizeof buf); - - QN_syslog(LOG_DEBUG, "Compare <%s> to <%s>\n", - buf, ChrPtr(Recipient)) ; - if (!strcasecmp(buf, ChrPtr(Recipient))) { - send = 0; - break; - } - } - - QN_syslog(LOG_INFO, - " %sSending to %s\n", - (send)?"":"Not ", - ChrPtr(Recipient)); - } - - /* Send the message */ - if (send == 1) - { - /* - * Force the message to appear in the correct - * room on the far end by setting the C field - * correctly - */ - if (msg->cm_fields[eRemoteRoom] != NULL) { - free(msg->cm_fields[eRemoteRoom]); - } - if (StrLength(RemoteRoom) > 0) { - msg->cm_fields[eRemoteRoom] = - strdup(ChrPtr(RemoteRoom)); - } - else { - msg->cm_fields[eRemoteRoom] = - strdup(CC->room.QRname); - } - - /* serialize it for transmission */ - serialize_message(&sermsg, msg); - if (sermsg.len > 0) { - - /* write it to a spool file */ - snprintf(filename, - sizeof(filename), - "%s/%s@%lx%x", - ctdl_netout_dir, - ChrPtr(Recipient), - time(NULL), - rand() - ); - - QN_syslog(LOG_DEBUG, - "Appending to %s\n", - filename); - - fp = fopen(filename, "ab"); - if (fp != NULL) { - fwrite(sermsg.ser, - sermsg.len, 1, fp); - fclose(fp); - } - else { - QN_syslog(LOG_ERR, - "%s: %s\n", - filename, - strerror(errno)); - } - - /* free the serialized version */ - free(sermsg.ser); - } - } - } - FreeStrBuf(&Buf); - FreeStrBuf(&Recipient); - FreeStrBuf(&RemoteRoom); - CtdlFreeMessage(msg); + CM_Free(msg); } /* * Spools out one message from the list. */ -void network_spool_msg(long msgnum, - void *userdata) +void network_spool_msg(long msgnum, void *userdata) { - struct CitContext *CCC = CC; struct CtdlMessage *msg = NULL; long delete_after_send = 0; /* Set to 1 to delete after spooling */ SpoolControl *sc; sc = (SpoolControl *)userdata; - msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { - QN_syslog(LOG_ERR, - "failed to load Message <%ld> from disk\n", - msgnum); + syslog(LOG_ERR, "netmail: failed to load Message <%ld> from disk", msgnum); return; } network_process_list(sc, msg, &delete_after_send); network_process_digest(sc, msg, &delete_after_send); network_process_participate(sc, msg, &delete_after_send); - network_process_ignetpush(sc, msg, &delete_after_send); - CtdlFreeMessage(msg); + CM_Free(msg); /* update lastsent */ sc->lastsent = msgnum;