* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (C) 2000-2001 by Art Cancro and others.
+ * Copyright (C) 2000-2002 by Art Cancro and others.
* This code is released under the terms of the GNU General Public License.
*
*/
*/
struct NetMap *the_netmap = NULL;
-
/*
- * Manage 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.
+ * Keep track of what messages to reject
*/
-int network_usetable(int operation, struct CtdlMessage *msg) {
-
- static struct UseTable *ut = NULL;
- struct UseTable *uptr = NULL;
- char *serialized_table = NULL;
- char *ptr;
- char msgid[SIZ];
- char buf[SIZ];
+struct FilterList *load_filter_list(void) {
+ char *serialized_list = NULL;
int i;
- size_t stlen = 0;
+ char buf[SIZ];
+ struct FilterList *newlist = NULL;
+ struct FilterList *nptr;
- switch(operation) {
-
- case UT_LOAD:
- serialized_table = CtdlGetSysConfig(USETABLE);
- if (serialized_table == NULL) return(0);
-
- ptr = serialized_table;
- i = 0;
- buf[0] = 0;
- while (ptr[0] != 0) {
- buf[i] = *ptr;
-
- if (buf[i]=='\n') {
- buf[i] = 0;
- if (strlen(buf) > 0) {
-
- uptr = (struct UseTable *)
- mallok(sizeof(struct UseTable));
- if (uptr != NULL) {
- uptr->next = ut;
- extract(msgid, buf, 0);
- uptr->message_id = strdoop(msgid);
- uptr->timestamp = extract_long(buf, 1);
- ut = uptr;
- }
- }
+ serialized_list = CtdlGetSysConfig(FILTERLIST);
+ if (serialized_list == NULL) return(NULL); /* if null, no entries */
- i = 0;
- buf[0] = 0;
- }
- else {
- ++i;
- }
- ++ptr;
- }
+ /* Use the string tokenizer to grab one line at a time */
+ for (i=0; i<num_tokens(serialized_list, '\n'); ++i) {
+ extract_token(buf, serialized_list, i, '\n');
+ nptr = (struct FilterList *) mallok(sizeof(struct FilterList));
+ extract(nptr->fl_user, buf, 0);
+ striplt(nptr->fl_user);
+ extract(nptr->fl_room, buf, 1);
+ striplt(nptr->fl_room);
+ extract(nptr->fl_node, buf, 2);
+ striplt(nptr->fl_node);
+
+ /* Cowardly refuse to add an any/any/any entry that would
+ * end up filtering every single message.
+ */
+ if (strlen(nptr->fl_user) + strlen(nptr->fl_room)
+ + strlen(nptr->fl_node) == 0) {
+ phree(nptr);
+ }
+ else {
+ nptr->next = newlist;
+ newlist = nptr;
+ }
+ }
- phree(serialized_table);
- serialized_table = NULL;
- return(0);
+ phree(serialized_list);
+ return newlist;
+}
- case UT_INSERT:
- /* Bail out if we can't generate a message ID */
- if (msg == NULL) {
- return(0);
- }
- if (msg->cm_fields['I'] == NULL) {
- return(0);
- }
- if (strlen(msg->cm_fields['I']) == 0) {
- return(0);
- }
- /* Generate the message ID */
- strcpy(msgid, msg->cm_fields['I']);
- if (haschar(msgid, '@') == 0) {
- strcat(msgid, "@");
- if (msg->cm_fields['N'] != NULL) {
- strcat(msgid, msg->cm_fields['N']);
- }
- else {
- return(0);
- }
- }
+void free_filter_list(struct FilterList *fl) {
+ if (fl == NULL) return;
+ free_filter_list(fl->next);
+ phree(fl);
+}
- /* Compare to the existing list */
- for (uptr = ut; uptr != NULL; uptr = uptr->next) {
- if (!strcasecmp(msgid, uptr->message_id)) {
- return(1);
- }
- }
- /* If we got to this point, it's unique: add it. */
- uptr = (struct UseTable *)
- mallok(sizeof(struct UseTable));
- if (uptr == NULL) return(0);
- uptr->next = ut;
- uptr->message_id = strdoop(msgid);
- uptr->timestamp = time(NULL);
- ut = uptr;
- return(0);
- case UT_SAVE:
- /* Figure out how big the serialized buffer should be */
- stlen = 0;
- for (uptr = ut; uptr != NULL; uptr = uptr->next) {
- stlen = stlen + strlen(uptr->message_id) + 20;
- }
- serialized_table = mallok(stlen);
- memset(serialized_table, 0, stlen);
-
- while (ut != NULL) {
- if ( (serialized_table != NULL)
- && ( (ut->timestamp - time(NULL)) <
- USETABLE_RETAIN) ) {
- sprintf(&serialized_table[strlen(
- serialized_table)], "%s|%ld\n",
- ut->message_id,
- (long)ut->timestamp);
- }
+/*
+ * 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) {
- /* Now free the memory */
- uptr = ut;
- ut = ut->next;
- phree(uptr->message_id);
- phree(uptr);
- }
+ char msgid[SIZ];
+ struct cdbdata *cdbut;
+ struct UseTable ut;
+
+ /* Bail out if we can't generate a message ID */
+ if (msg == NULL) {
+ return(0);
+ }
+ if (msg->cm_fields['I'] == NULL) {
+ return(0);
+ }
+ if (strlen(msg->cm_fields['I']) == 0) {
+ return(0);
+ }
- /* Write to disk */
- CtdlPutSysConfig(USETABLE, serialized_table);
- phree(serialized_table);
+ /* Generate the message ID */
+ strcpy(msgid, msg->cm_fields['I']);
+ if (haschar(msgid, '@') == 0) {
+ strcat(msgid, "@");
+ if (msg->cm_fields['N'] != NULL) {
+ strcat(msgid, msg->cm_fields['N']);
+ }
+ else {
return(0);
+ }
+ }
+ cdbut = cdb_fetch(CDB_USETABLE, msgid, strlen(msgid));
+ if (cdbut != NULL) {
+ cdb_free(cdbut);
+ return(1);
}
- /* should never get here unless illegal operation specified */
- return(2);
+ /* If we got to this point, it's unique: add it. */
+ strcpy(ut.ut_msgid, msgid);
+ ut.ut_timestamp = time(NULL);
+ cdb_store(CDB_USETABLE, msgid, strlen(msgid),
+ &ut, sizeof(struct UseTable) );
+ return(0);
}
FILE *fp;
if (CtdlAccessCheck(ac_room_aide)) return;
- assoc_file_name(filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
cprintf("%d Network settings for room #%ld <%s>\n",
LISTING_FOLLOWS,
CC->quickroom.QRnumber, CC->quickroom.QRname);
if (CtdlAccessCheck(ac_room_aide)) return;
safestrncpy(tempfilename, tmpnam(NULL), sizeof tempfilename);
- assoc_file_name(filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
fp = fopen(tempfilename, "w");
if (fp == NULL) {
}
memset(&sc, 0, sizeof(struct SpoolControl));
- assoc_file_name(filename, &CC->quickroom, "netconfigs");
+ assoc_file_name(filename, sizeof filename, &CC->quickroom, "netconfigs");
fp = fopen(filename, "r");
if (fp == NULL) {
* Bounce a message back to the sender
*/
void network_bounce(struct CtdlMessage *msg, char *reason) {
- static int serialnum = 0;
- FILE *fp;
- char filename[SIZ];
- struct ser_ret sermsg;
char *oldpath = NULL;
char buf[SIZ];
+ char bouncesource[SIZ];
+ char recipient[SIZ];
+ struct recptypes *valid = NULL;
+ char force_room[ROOMNAMELEN];
+ static int serialnum = 0;
lprintf(9, "entering network_bounce()\n");
if (msg == NULL) return;
+ sprintf(bouncesource, "%s@%s", BOUNCESOURCE, config.c_nodename);
+
/*
* Give it a fresh message ID
*/
if (msg->cm_fields['I'] != NULL) {
phree(msg->cm_fields['I']);
}
- sprintf(buf, "%ld.%04x.%04x@%s",
- (long)time(NULL), getpid(), ++serialnum, config.c_fqdn);
+ sprintf(buf, "%ld.%04lx.%04x@%s",
+ (long)time(NULL), (long)getpid(), ++serialnum, config.c_fqdn);
msg->cm_fields['I'] = strdoop(buf);
/*
phree(msg->cm_fields['D']);
}
- msg->cm_fields['R'] = msg->cm_fields['A'];
- msg->cm_fields['D'] = msg->cm_fields['N'];
- msg->cm_fields['A'] = strdoop(BOUNCESOURCE);
- msg->cm_fields['N'] = strdoop(config.c_nodename);
-
- if (!strcasecmp(msg->cm_fields['D'], config.c_nodename)) {
- phree(msg->cm_fields['D']);
+ snprintf(recipient, sizeof recipient, "%s@%s",
+ msg->cm_fields['A'], msg->cm_fields['N']);
+
+ if (msg->cm_fields['A'] == NULL) {
+ phree(msg->cm_fields['A']);
}
- /*
- * If this is a bounce of a bounce, send it to the Aide> room
- * instead of looping around forever
- */
- if (msg->cm_fields['D'] == NULL) if (msg->cm_fields['R'] != NULL)
- if (!strcasecmp(msg->cm_fields['R'], BOUNCESOURCE)) {
- phree(msg->cm_fields['R']);
- if (msg->cm_fields['C'] != NULL) {
- phree(msg->cm_fields['C']);
- }
- msg->cm_fields['C'] = strdoop(AIDEROOM);
+ if (msg->cm_fields['N'] == NULL) {
+ phree(msg->cm_fields['N']);
}
+ msg->cm_fields['A'] = strdoop(BOUNCESOURCE);
+ msg->cm_fields['N'] = strdoop(config.c_nodename);
+
+
/* prepend our node to the path */
if (msg->cm_fields['P'] != NULL) {
oldpath = msg->cm_fields['P'];
sprintf(msg->cm_fields['P'], "%s!%s", config.c_nodename, oldpath);
phree(oldpath);
- /* serialize the message */
- serialize_message(&sermsg, msg);
-
- /* now send it */
- sprintf(filename, "./network/spoolin/bounce.%04x.%04x",
- getpid(), serialnum);
-
- fp = fopen(filename, "ab");
- if (fp != NULL) {
- fwrite(sermsg.ser,
- sermsg.len, 1, fp);
- fclose(fp);
+ /* Now submit the message */
+ valid = validate_recipients(recipient);
+ if (valid != NULL) if (valid->num_error > 0) {
+ phree(valid);
+ valid = NULL;
+ }
+ if ( (valid == NULL) || (!strcasecmp(recipient, bouncesource)) ) {
+ strcpy(force_room, AIDEROOM);
+ }
+ else {
+ strcpy(force_room, "");
+ }
+ if ( (valid == NULL) && (strlen(force_room) == 0) ) {
+ strcpy(force_room, AIDEROOM);
}
- phree(sermsg.ser);
+ CtdlSubmitMsg(msg, valid, force_room);
+
+ /* Clean up */
+ if (valid != NULL) phree(valid);
CtdlFreeMessage(msg);
lprintf(9, "leaving network_bounce()\n");
}
struct CtdlMessage *msg;
long pos;
int field;
- int a;
- int e = MES_LOCAL;
- struct usersupp tempUS;
- char recp[SIZ];
+ struct recptypes *recp = NULL;
char target_room[ROOMNAMELEN];
struct ser_ret sermsg;
char *oldpath = NULL;
/*
* Check to see if we already have a copy of this message
*/
- if (network_usetable(UT_INSERT, msg) != 0) {
- sprintf(buf, "Loopzapper rejected message <%s>\n",
- msg->cm_fields['I']);
+ if (network_usetable(msg) != 0) {
+ sprintf(buf,
+ "Loopzapper rejected message <%s> "
+ "from <%s> in <%s> @ <%s>\n",
+ ((msg->cm_fields['I']!=NULL)?(msg->cm_fields['I']):""),
+ ((msg->cm_fields['A']!=NULL)?(msg->cm_fields['A']):""),
+ ((msg->cm_fields['O']!=NULL)?(msg->cm_fields['O']):""),
+ ((msg->cm_fields['N']!=NULL)?(msg->cm_fields['N']):"")
+ );
aide_message(buf);
CtdlFreeMessage(msg);
msg = NULL;
/* Does it have a recipient? If so, validate it... */
if (msg->cm_fields['R'] != NULL) {
-
- safestrncpy(recp, msg->cm_fields['R'], sizeof(recp));
-
- e = alias(recp); /* alias and mail type */
- if ((recp[0] == 0) || (e == MES_ERROR)) {
-
+ recp = validate_recipients(msg->cm_fields['R']);
+ if (recp != NULL) if (recp->num_error > 0) {
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;
+ phree(recp);
return;
-
}
- else if (e == MES_LOCAL) {
- a = getuser(&tempUS, recp);
- if (a != 0) {
-
- network_bounce(msg,
-"A message you sent could not be delivered because the user does not exist\n"
-"on this system. Please check the address and try again.\n");
- msg = NULL;
- return;
-
- }
- else {
- MailboxName(target_room, &tempUS, MAILROOM);
- }
- }
- }
+ strcpy(target_room, ""); /* no target room if mail */
+ }
else if (msg->cm_fields['C'] != NULL) {
safestrncpy(target_room,
sizeof target_room);
}
+ /* Strip out fields that are only relevant during transit */
+ if (msg->cm_fields['D'] != NULL) {
+ phree(msg->cm_fields['D']);
+ msg->cm_fields['D'] = NULL;
+ }
+ if (msg->cm_fields['C'] != NULL) {
+ phree(msg->cm_fields['C']);
+ msg->cm_fields['C'] = NULL;
+ }
+
/* save the message into a room */
- msg->cm_flags = CM_SKIP_HOOKS;
- CtdlSubmitMsg(msg, NULL, target_room);
+ if (PerformNetprocHooks(msg, target_room) == 0) {
+ msg->cm_flags = CM_SKIP_HOOKS;
+ CtdlSubmitMsg(msg, recp, target_room);
+ }
CtdlFreeMessage(msg);
+ phree(recp);
}
network_poll_other_citadel_nodes();
/*
- * Load the network map and use table into memory.
+ * Load the network map and filter list into memory.
*/
read_network_map();
- network_usetable(UT_LOAD, NULL);
+ filterlist = load_filter_list();
/*
* Go ahead and run the queue
lprintf(7, "network: processing inbound queue\n");
network_do_spoolin();
- /* Save the usetable and network map back to disk */
- network_usetable(UT_SAVE, NULL);
+ /* Save the network map back to disk */
write_network_map();
+ /* Free the filter list in memory */
+ free_filter_list(filterlist);
+ filterlist = NULL;
+
lprintf(7, "network: queue run completed\n");
doing_queue = 0;
}
-
/*
* cmd_netp() - authenticate to the server as another Citadel node polling
* for network traffic
+
+
/*
* Module entry point
*/
projects / citadel.git / blobdiff