X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=32528dfb544cf6a2933f6f20bca847d579261249;hb=c0e6d51d8b2ef6d2a51323ce430ce0ea622ecbdd;hp=0edb1f11efa0e240bcf7c7c3d79ead11d21b3934;hpb=17facca88daba3788c5fcf6ffc8d57f3ed7a5905;p=citadel.git

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 0edb1f11e..32528dfb5 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -2,15 +2,15 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (c) 2000-2012 by the citadel.org team
+ * Copyright (c) 2000-2016 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
@@ -93,6 +93,88 @@
 #endif
 
 
+/*
+ * Bounce a message back to the sender
+ */
+void network_bounce(struct CtdlMessage **pMsg, char *reason)
+{
+	struct CitContext *CCC = CC;
+	char buf[SIZ];
+	char bouncesource[SIZ];
+	char recipient[SIZ];
+	recptypes *valid = NULL;
+	char force_room[ROOMNAMELEN];
+	static int serialnum = 0;
+	long len;
+	struct CtdlMessage *msg = *pMsg;
+	*pMsg = NULL;
+	QNM_syslog(LOG_DEBUG, "entering network_bounce()");
+
+	if (msg == NULL) return;
+
+	snprintf(bouncesource, sizeof bouncesource, "%s@%s", BOUNCESOURCE, CtdlGetConfigStr("c_nodename"));
+
+	/* 
+	 * Give it a fresh message ID
+	 */
+	len = snprintf(buf, sizeof(buf),
+		       "%ld.%04lx.%04x@%s",
+		       (long)time(NULL),
+		       (long)getpid(),
+		       ++serialnum,
+		       CtdlGetConfigStr("c_fqdn"));
+
+	CM_SetField(msg, emessageId, buf, len);
+
+	/*
+	 * FIXME ... right now we're just sending a bounce; we really want to
+	 * include the text of the bounced message.
+	 */
+	if (!IsEmptyStr(reason)) {
+		CM_SetField(msg, eMesageText, reason, strlen(reason));
+	}
+	msg->cm_format_type = 0;
+
+	/*
+	 * Turn the message around
+	 */
+	CM_FlushField(msg, eRecipient);
+	CM_FlushField(msg, eDestination);
+
+	len = snprintf(recipient, sizeof(recipient), "%s@%s",
+		       msg->cm_fields[eAuthor],
+		       msg->cm_fields[eNodeName]);
+
+	CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE));
+	CM_SetField(msg, eNodeName, CtdlGetConfigStr("c_nodename"), strlen(CtdlGetConfigStr("c_nodename")));
+	CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
+
+	Netmap_AddMe(msg, HKEY("unknown_user"));
+
+	/* Now submit the message */
+	valid = validate_recipients(recipient, NULL, 0);
+	if (valid != NULL) if (valid->num_error != 0) {
+		free_recipients(valid);
+		valid = NULL;
+	}
+	if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
+		strcpy(force_room, CtdlGetConfigStr("c_aideroom"));
+	}
+	else {
+		strcpy(force_room, "");
+	}
+	if ( (valid == NULL) && IsEmptyStr(force_room) ) {
+		strcpy(force_room, CtdlGetConfigStr("c_aideroom"));
+	}
+	CtdlSubmitMsg(msg, valid, force_room, 0);
+
+	/* Clean up */
+	if (valid != NULL) free_recipients(valid);
+	CM_Free(msg);
+	QNM_syslog(LOG_DEBUG, "leaving network_bounce()");
+}
+
+
 void ParseLastSent(const CfgLineType *ThisOne, StrBuf *Line, const char *LinePos, OneRoomNetCfg *OneRNCFG)
 {
 	RoomNetCfgLine *nptr;
@@ -168,10 +250,10 @@ void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen)
 	if (CM_IsEmpty(msg, eMessagePath)) {
 		CM_SetField(msg, eMessagePath, defl, defllen);
 	}
-	node_len = configlen.c_nodename;
+	node_len = strlen(CtdlGetConfigStr("c_nodename"));
 	if (node_len >= SIZ) 
 		node_len = SIZ - 1;
-	memcpy(buf, config.c_nodename, node_len);
+	memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len);
 	buf[node_len] = '!';
 	buf[node_len + 1] = '\0';
 	CM_PrependToField(msg, eMessagePath, buf, node_len + 1);
@@ -199,20 +281,21 @@ void InspectQueuedRoom(SpoolControl **pSC,
 	 * queued for networking and then deleted before it can happen.
 	 */
 	if (CtdlGetRoom(&sc->room, room_to_spool->name) != 0) {
-		syslog(LOG_CRIT, "ERROR: cannot load <%s>\n", room_to_spool->name);
+		syslog(LOG_CRIT, "ERROR: cannot load <%s>", room_to_spool->name);
 		free(sc);
 		return;
 	}
 	if (sc->room.QRhighest <= sc->lastsent)
 	{
-		QN_syslog(LOG_DEBUG, "nothing to do for <%s>\n", room_to_spool->name);
+		QN_syslog(LOG_DEBUG, "nothing to do for <%s>", room_to_spool->name);
 		free(sc);
 		return;
 	}
 
 	begin_critical_section(S_NETCONFIGS);
-	if (sc->RNCfg == NULL)
+	if (sc->RNCfg == NULL) {
 		sc->RNCfg = CtdlGetNetCfgForRoom(sc->room.QRnumber);
+	}
 
 	if (!HaveSpoolConfig(sc->RNCfg))
 	{
@@ -229,11 +312,13 @@ void InspectQueuedRoom(SpoolControl **pSC,
 		aggregate_recipients(&sc->Users[SpoolCfgs[i]],
 				     SpoolCfgs[i],
 				     sc->RNCfg,
-				     SpoolCfgsCopyN[i]);
+				     SpoolCfgsCopyN[i]
+		);
 	}
 	
-	if (StrLength(sc->RNCfg->Sender) > 0)
+	if (StrLength(sc->RNCfg->Sender) > 0) {
 		sc->Users[roommailalias] = NewStrBufDup(sc->RNCfg->Sender);
+	}
 	end_critical_section(S_NETCONFIGS);
 
 	sc->next = *pSC;
@@ -307,7 +392,7 @@ void CalcListID(SpoolControl *sc)
 		StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
 		StrBufAppendBuf(sc->ListID, RoomName, 0);
 		StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
-		StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
+		StrBufAppendBufPlain(sc->ListID, CtdlGetConfigStr("c_fqdn"), -1, 0);
 		/*
 		 * this used to be:
 		 * roomname <Room-Number.list-id.fqdn>
@@ -325,7 +410,7 @@ void CalcListID(SpoolControl *sc)
 		StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0);
 		StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0);
 		StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0);
-		StrBufAppendBufPlain(sc->Users[roommailalias], config.c_fqdn, -1, 0);
+		StrBufAppendBufPlain(sc->Users[roommailalias], CtdlGetConfigStr("c_fqdn"), -1, 0);
 
 		StrBufLowerCase(sc->Users[roommailalias]);
 	}
@@ -352,7 +437,7 @@ void network_spoolout_room(SpoolControl *sc)
 	 */
 	memcpy (&CCC->room, &sc->room, sizeof(ctdlroom));
 
-	syslog(LOG_INFO, "Networking started for <%s>\n", CCC->room.QRname);
+	syslog(LOG_INFO, "Networking started for <%s>", CCC->room.QRname);
 
 	CalcListID(sc);
 
@@ -375,7 +460,7 @@ void network_spoolout_room(SpoolControl *sc)
 	else
 	{
 		snprintf(buf, sizeof buf, "room_%s@%s",
-			 CCC->room.QRname, config.c_fqdn);
+			 CCC->room.QRname, CtdlGetConfigStr("c_fqdn"));
 	}
 
 	for (i=0; buf[i]; ++i) {
@@ -422,7 +507,11 @@ void network_spoolout_room(SpoolControl *sc)
 		sc->digestfp = NULL;
 	}
 
-	/* Now rewrite the config file */
+	/* Now rewrite the netconfig */
+
+	// THIS IS THE ONLY PLACE WHERE WE HAVE TO REWRITE THE NETCONFIG.
+
+
 	if (sc->lastsent != lastsent)
 	{
 		begin_critical_section(S_NETCONFIGS);
@@ -434,6 +523,53 @@ void network_spoolout_room(SpoolControl *sc)
 	}
 }
 
+
+/*
+ * Check the use table.  This is a list of messages which have recently
+ * arrived on the system.  It is maintained and queried to prevent the same
+ * message from being entered into the database multiple times if it happens
+ * to arrive multiple times by accident.
+ */
+int network_usetable(struct CtdlMessage *msg)
+{
+	StrBuf *msgid;
+	struct CitContext *CCC = CC;
+	time_t now;
+
+	/* Bail out if we can't generate a message ID */
+	if ((msg == NULL) || CM_IsEmpty(msg, emessageId))
+	{
+		return(0);
+	}
+
+	/* Generate the message ID */
+	msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
+	if (haschar(ChrPtr(msgid), '@') == 0) {
+		StrBufAppendBufPlain(msgid, HKEY("@"), 0);
+		if (!CM_IsEmpty(msg, eNodeName)) {
+			StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
+		}
+		else {
+			FreeStrBuf(&msgid);
+			return(0);
+		}
+	}
+	now = time(NULL);
+	if (CheckIfAlreadySeen("Networker Import",
+			       msgid,
+			       now, 0,
+			       eUpdate,
+			       CCC->cs_pid, 0) != 0)
+	{
+		FreeStrBuf(&msgid);
+		return(1);
+	}
+	FreeStrBuf(&msgid);
+
+	return(0);
+}
+
+
 /*
  * Process a buffer containing a single message from a single file
  * from the inbound queue 
@@ -455,14 +591,13 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 	unsigned char firstbyte;
 	unsigned char lastbyte;
 
-	QN_syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes\n", size);
+	QN_syslog(LOG_DEBUG, "network_process_buffer() processing %ld bytes", size);
 
 	/* Validate just a little bit.  First byte should be FF and * last byte should be 00. */
 	firstbyte = buffer[0];
 	lastbyte = buffer[size-1];
 	if ( (firstbyte != 255) || (lastbyte != 0) ) {
-		QN_syslog(LOG_ERR, "Corrupt message ignored.  Length=%ld, firstbyte = %d, lastbyte = %d\n",
-			  size, firstbyte, lastbyte);
+		QN_syslog(LOG_ERR, "Corrupt message ignored.  Length=%ld, firstbyte = %d, lastbyte = %d", size, firstbyte, lastbyte);
 		return;
 	}
 
@@ -485,7 +620,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 
 	/* Check for message routing */
 	if (!CM_IsEmpty(msg, eDestination)) {
-		if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) {
+		if (strcasecmp(msg->cm_fields[eDestination], CtdlGetConfigStr("c_nodename"))) {
 
 			/* route the message */
 			Buf = NewStrBufPlain(CM_KEY(msg,eDestination));
@@ -512,14 +647,14 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 					 time(NULL),
 					 rand()
 				);
-				QN_syslog(LOG_DEBUG, "Appending to %s\n", filename);
+				QN_syslog(LOG_DEBUG, "Appending to %s", 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));
+					QN_syslog(LOG_ERR, "%s: %s", filename, strerror(errno));
 				}
 				free(sermsg.ser);
 				CM_Free(msg);
@@ -530,10 +665,9 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 			else {	/* invalid destination node name */
 				FreeStrBuf(&Buf);
 
-				network_bounce(msg,
+				network_bounce(&msg,
 "A message you sent could not be delivered due to an invalid destination node"
 " name.  Please check the address and try sending the message again.\n");
-				msg = NULL;
 				return;
 
 			}
@@ -570,12 +704,11 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 	else if (!CM_IsEmpty(msg, eRecipient)) {
 		recp = validate_recipients(msg->cm_fields[eRecipient], NULL, 0);
 		if (recp != NULL) if (recp->num_error != 0) {
-			network_bounce(msg,
+			network_bounce(&msg,
 				"A message you sent could not be delivered due to an invalid address.\n"
 				"Please check the address and try sending the message again.\n");
-			msg = NULL;
 			free_recipients(recp);
-			QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.\n");
+			QNM_syslog(LOG_DEBUG, "Bouncing message due to invalid recipient address.");
 			return;
 		}
 		strcpy(target_room, "");	/* no target room if mail */
@@ -653,12 +786,12 @@ void network_process_file(char *filename,
 
 	fp = fopen(filename, "rb");
 	if (fp == NULL) {
-		QN_syslog(LOG_CRIT, "Error opening %s: %s\n", filename, strerror(errno));
+		QN_syslog(LOG_CRIT, "Error opening %s: %s", filename, strerror(errno));
 		return;
 	}
 
 	fseek(fp, 0L, SEEK_END);
-	QN_syslog(LOG_INFO, "network: processing %ld bytes from %s\n", ftell(fp), filename);
+	QN_syslog(LOG_INFO, "network: processing %ld bytes from %s", ftell(fp), filename);
 	rewind(fp);
 
 	/* Look for messages in the data stream and break them out */
@@ -693,10 +826,7 @@ void network_process_file(char *filename,
 	}
 
 	if (nMessages > 0)
-		QN_syslog(LOG_INFO,
-			  "network: processed %d messages in %s\n",
-			  nMessages,
-			  filename);
+		QN_syslog(LOG_INFO, "network: processed %d messages in %s", nMessages, filename);
 
 	fclose(fp);
 	unlink(filename);
@@ -724,11 +854,11 @@ void network_do_spoolin(HashList *working_ignetcfg, HashList *the_netmap, int *n
 	 */
 	if (stat(ctdl_netin_dir, &statbuf)) return;
 	if (statbuf.st_mtime == last_spoolin_mtime) {
-		QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue\n");
+		QNM_syslog(LOG_DEBUG, "network: nothing in inbound queue");
 		return;
 	}
 	last_spoolin_mtime = statbuf.st_mtime;
-	QNM_syslog(LOG_DEBUG, "network: processing inbound queue\n");
+	QNM_syslog(LOG_DEBUG, "network: processing inbound queue");
 
 	/*
 	 * Ok, there's something interesting in there, so scan it.
@@ -896,13 +1026,10 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			 ctdl_netout_dir,
 			 ChrPtr(NextHop));
 
-		QN_syslog(LOG_DEBUG, "Consolidate %s to %s\n", filename, ChrPtr(NextHop));
+		QN_syslog(LOG_DEBUG, "Consolidate %s to %s", filename, ChrPtr(NextHop));
 		if (CtdlNetworkTalkingTo(SKEY(NextHop), NTT_CHECK)) {
 			nFailed++;
-			QN_syslog(LOG_DEBUG,
-				  "Currently online with %s - skipping for now\n",
-				  ChrPtr(NextHop)
-				);
+			QN_syslog(LOG_DEBUG, "Currently online with %s - skipping for now", ChrPtr(NextHop));
 		}
 		else {
 			size_t dsize;
@@ -915,9 +1042,9 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			if (infd == -1) {
 				nFailed++;
 				QN_syslog(LOG_ERR,
-					  "failed to open %s for reading due to %s; skipping.\n",
+					  "failed to open %s for reading due to %s; skipping.",
 					  filename, strerror(errno)
-					);
+				);
 				CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
 				continue;				
 			}
@@ -934,9 +1061,9 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			if (outfd == -1) {
 				nFailed++;
 				QN_syslog(LOG_ERR,
-					  "failed to open %s for reading due to %s; skipping.\n",
+					  "failed to open %s for reading due to %s; skipping.",
 					  spooloutfilename, strerror(errno)
-					);
+				);
 				close(infd);
 				CtdlNetworkTalkingTo(SKEY(NextHop), NTT_REMOVE);
 				continue;
@@ -959,18 +1086,11 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 			do {} while ((FileMoveChunked(&FDIO, &err) > 0) && (err == NULL));
 			if (err == NULL) {
 				unlink(filename);
-				QN_syslog(LOG_DEBUG,
-					  "Spoolfile %s now "SIZE_T_FMT" k\n",
-					  spooloutfilename,
-					  (dsize + fsize)/1024
-					);				
+				QN_syslog(LOG_DEBUG, "Spoolfile %s now "SIZE_T_FMT" KB", spooloutfilename, (dsize + fsize)/1024);
 			}
 			else {
 				nFailed++;
-				QN_syslog(LOG_ERR,
-					  "failed to append to %s [%s]; rolling back..\n",
-					  spooloutfilename, strerror(errno)
-					);
+				QN_syslog(LOG_ERR, "failed to append to %s [%s]; rolling back..", spooloutfilename, strerror(errno));
 				/* whoops partial append?? truncate spooloutfilename again! */
 				ftruncate(outfd, dsize);
 			}
@@ -984,10 +1104,7 @@ void network_consolidate_spoolout(HashList *working_ignetcfg, HashList *the_netm
 
 	if (nFailed > 0) {
 		FreeStrBuf(&NextHop);
-		QN_syslog(LOG_INFO,
-			  "skipping Spoolcleanup because of %d files unprocessed.\n",
-			  nFailed
-			);
+		QN_syslog(LOG_INFO, "skipping Spoolcleanup because of %d files unprocessed.", nFailed);
 
 		return;
 	}