Revert "began removing IGnet from the server"
authorArt Cancro <ajc@citadel.org>
Tue, 23 Jan 2018 02:30:32 +0000 (21:30 -0500)
committerArt Cancro <ajc@citadel.org>
Tue, 23 Jan 2018 02:30:32 +0000 (21:30 -0500)
This reverts commit 3cfc14afe3930a5d53b72f7f66d12cfa94126c32.

citadel/citadel.h
citadel/modules/network/serv_netfilter.c [new file with mode: 0644]
citadel/modules/network/serv_network.c
citadel/modules/network/serv_network.h
citadel/modules/networkclient/serv_networkclient.c [new file with mode: 0644]

index bcdc0a4221b7a027678e1dca2ab1232e375fea84..fea62aaa2909207792589115f9f5f2c1a0bf3114 100644 (file)
@@ -35,7 +35,7 @@ extern "C" {
  */
 #define CITADEL        PACKAGE_STRING
 
-#define REV_LEVEL      918             // This version
+#define REV_LEVEL      917             // This version
 #define REV_MIN                591             // Oldest compatible database
 #define EXPORT_REV_MIN 760             // Oldest compatible export files
 #define LIBCITADEL_MIN 917             // Minimum required version of libcitadel
diff --git a/citadel/modules/network/serv_netfilter.c b/citadel/modules/network/serv_netfilter.c
new file mode 100644 (file)
index 0000000..121ef31
--- /dev/null
@@ -0,0 +1,194 @@
+/*
+ * A server-side module for Citadel designed to filter idiots off the network.
+ * 
+ * Copyright (c) 2002-2017 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>
+#include <signal.h>
+#include <pwd.h>
+#include <errno.h>
+#include <sys/types.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 <sys/wait.h>
+#include <string.h>
+#include <limits.h>
+#include <libcitadel.h>
+#include "citadel.h"
+#include "server.h"
+#include "citserver.h"
+#include "support.h"
+#include "config.h"
+#include "control.h"
+#include "user_ops.h"
+#include "database.h"
+#include "msgbase.h"
+
+
+#include "ctdl_module.h"
+
+typedef struct FilterList FilterList;
+
+struct FilterList {
+       FilterList *next;
+       char fl_user[SIZ];
+       char fl_room[SIZ];
+       char fl_node[SIZ];
+};
+
+struct FilterList *filterlist = NULL;
+
+/*
+ * Keep track of what messages to reject
+ */
+FilterList *load_filter_list(void) {
+       char *serialized_list = NULL;
+       int i;
+       char buf[SIZ];
+       FilterList *newlist = NULL;
+       FilterList *nptr;
+
+       serialized_list = CtdlGetSysConfig(FILTERLIST);
+       if (serialized_list == NULL) return(NULL); /* if null, no entries */
+
+       /* 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', sizeof buf);
+               nptr = (FilterList *) malloc(sizeof(FilterList));
+               extract_token(nptr->fl_user, buf, 0, '|', sizeof nptr->fl_user);
+               striplt(nptr->fl_user);
+               extract_token(nptr->fl_room, buf, 1, '|', sizeof nptr->fl_room);
+               striplt(nptr->fl_room);
+               extract_token(nptr->fl_node, buf, 2, '|', sizeof nptr->fl_node);
+               striplt(nptr->fl_node);
+
+               /* Cowardly refuse to add an any/any/any entry that would
+                * end up filtering every single message.
+                */
+               if (IsEmptyStr(nptr->fl_user) && 
+                   IsEmptyStr(nptr->fl_room) &&
+                   IsEmptyStr(nptr->fl_node)) {
+                       free(nptr);
+               }
+               else {
+                       nptr->next = newlist;
+                       newlist = nptr;
+               }
+       }
+
+       free(serialized_list);
+       return newlist;
+}
+
+
+void free_filter_list(FilterList *fl) {
+       if (fl == NULL) return;
+       free_filter_list(fl->next);
+       free(fl);
+}
+
+void free_netfilter_list(void)
+{
+       free_filter_list(filterlist);
+       filterlist = NULL;
+}
+
+void load_network_filter_list(void)
+{
+       filterlist = load_filter_list();
+}
+
+
+/*
+ * This handler detects whether an incoming network message is from some
+ * moron user who the site operator has elected to filter out.  If a match
+ * is found, the message is rejected.
+ */
+int filter_the_idiots(struct CtdlMessage *msg, char *target_room) {
+       FilterList *fptr;
+       int zap_user = 0;
+       int zap_room = 0;
+       int zap_node = 0;
+
+       if ( (msg == NULL) || (filterlist == NULL) ) {
+               return(0);
+       }
+
+       for (fptr = filterlist; fptr != NULL; fptr = fptr->next) {
+
+               zap_user = 0;
+               zap_room = 0;
+               zap_node = 0;
+
+               if (!CM_IsEmpty(msg, eAuthor)) {
+                       if ( (!strcasecmp(msg->cm_fields[eAuthor], fptr->fl_user))
+                          || (fptr->fl_user[0] == 0) ) {
+                               zap_user = 1;
+                       }
+               }
+
+               if (!CM_IsEmpty(msg, eRemoteRoom)) {
+                       if ( (!strcasecmp(msg->cm_fields[eRemoteRoom], fptr->fl_room))
+                          || (fptr->fl_room[0] == 0) ) {
+                               zap_room = 1;
+                       }
+               }
+
+               if (!CM_IsEmpty(msg, eOriginalRoom)) {
+                       if ( (!strcasecmp(msg->cm_fields[eOriginalRoom], fptr->fl_room))
+                          || (fptr->fl_room[0] == 0) ) {
+                               zap_room = 1;
+                       }
+               }
+
+               if (!CM_IsEmpty(msg, eNodeName)) {
+                       if ( (!strcasecmp(msg->cm_fields[eNodeName], fptr->fl_node))
+                          || (fptr->fl_node[0] == 0) ) {
+                               zap_node = 1;
+                       }
+               }
+       
+               if (zap_user + zap_room + zap_node == 3) return(1);
+
+       }
+
+       return(0);
+}
+
+
+CTDL_MODULE_INIT(netfilter)
+{
+       if (!threading)
+       {
+/*
+  currently unsupported.
+               CtdlRegisterNetprocHook(filter_the_idiots);
+*/
+       }
+       
+       /* return our module name for the log */
+       return "netfilter";
+}
index 41b299a296401a37aeece24dc96073c53dfb063b..6c89cee3938f4c092a9ff8c3c2748c5930e61711 100644 (file)
@@ -391,6 +391,9 @@ void network_do_queue(void)
                network_do_spoolin(working_ignetcfg, the_netmap, &netmap_changed);
        }
 
+       /* Free the filter list in memory */
+       free_netfilter_list();
+
        /* Save the network map back to disk */
        if (netmap_changed) {
                StrBuf *MapStr = CtdlSerializeNetworkMap(the_netmap);
index c32d9ef73d7fc29325310fefab92deb50ab78772..d5f455ab8277fbc04c94cc7fd7f0fa310e5eb94c 100644 (file)
@@ -16,4 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+void free_netfilter_list(void);
+void load_network_filter_list(void);
 void network_queue_room(struct ctdlroom *, void *);
diff --git a/citadel/modules/networkclient/serv_networkclient.c b/citadel/modules/networkclient/serv_networkclient.c
new file mode 100644 (file)
index 0000000..d213fbd
--- /dev/null
@@ -0,0 +1,371 @@
+/*
+ * This module polls other Citadel servers for inter-site networking.
+ *
+ * Copyright (c) 2000-2017 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.
+ *
+ * Implementation note:
+ * I'm not really happy with this.  It looks more like a Gen 1 poller
+ * than a Gen 3 poller, because libcurl (understandably) does not have
+ * support for Citadel protocol.  In the not too distant future I would
+ * like to remove Citadel-to-Citadel protocol entirely, and replace it
+ * with NNTP.
+ */
+
+
+#include "sysdep.h"
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <signal.h>
+#include <pwd.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <dirent.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
+#ifdef HAVE_SYSCALL_H
+# include <syscall.h>
+#else 
+# if HAVE_SYS_SYSCALL_H
+#  include <sys/syscall.h>
+# endif
+#endif
+
+#include <sys/wait.h>
+#include <string.h>
+#include <limits.h>
+#include <libcitadel.h>
+#include "citadel.h"
+#include "server.h"
+#include "citserver.h"
+#include "support.h"
+#include "config.h"
+#include "user_ops.h"
+#include "database.h"
+#include "msgbase.h"
+#include "internet_addressing.h"
+#include "clientsocket.h"
+#include "citadel_dirs.h"
+#include "threads.h"
+#include "context.h"
+#include "ctdl_module.h"
+
+struct CitContext networker_client_CC;
+
+
+/*
+ * Poll one Citadel node (the Citadel node name, host/ip, port number, and shared secret are supplied by the caller)
+ */
+void network_poll_node(StrBuf *node, StrBuf *host, StrBuf *port, StrBuf *secret)
+{
+       char buf[SIZ];
+       CC->SBuf.Buf = NewStrBuf();
+       CC->sMigrateBuf = NewStrBuf();
+       CC->SBuf.ReadWritePointer = NULL;
+       int bytes_read = 0;
+       int bytes_total = 0;
+       int this_block = 0;
+       StrBuf *SpoolFileName = NULL;
+       FILE *netoutfp = NULL;
+
+       syslog(LOG_DEBUG, "netpoll: polling %s at %s:%s", ChrPtr(node), ChrPtr(host), ChrPtr(port));
+
+       int sock = sock_connect((char *)ChrPtr(host), (char *)ChrPtr(port));
+       if (sock < 0) {
+               syslog(LOG_ERR, "%s: %s", ChrPtr(host), strerror(errno));
+               return;
+       }
+
+       /* Read the server greeting */
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                goto bail;
+        }
+
+       /* Check that the remote is who we think it is and warn the site admin if not */
+       if (strncmp(&buf[4], ChrPtr(node), StrLength(node))) {
+               CtdlAideMessage(buf, "Connected to wrong node!");
+               syslog(LOG_ERR, "netpoll: was expecting node <%s> but got %s", ChrPtr(node), buf);
+               goto bail;
+       }
+
+       /* We're talking to the correct node.  Now identify ourselves. */
+       snprintf(buf, sizeof buf, "NETP %s|%s", CtdlGetConfigStr("c_nodename"), ChrPtr(secret));
+       sock_puts(&sock, buf);
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                goto bail;
+        }
+       if (buf[0] != '2') {
+               CtdlAideMessage(buf, "Could not authenticate to network peer");
+               syslog(LOG_ERR, "netpoll: could not authenticate to <%s> : %s", ChrPtr(node), buf);
+               goto bail;
+       }
+
+       /* Tell it we want to download anything headed our way. */
+       sock_puts(&sock, "NDOP");
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                goto bail;
+        }
+       if (buf[0] != '2') {
+               CtdlAideMessage(buf, "NDOP error");
+               syslog(LOG_ERR, "netpoll: NDOP error talking to <%s> : %s", ChrPtr(node), buf);
+               goto bail;
+       }
+
+       bytes_total = atoi(&buf[4]);
+       bytes_read = 0;
+
+       SpoolFileName = NewStrBuf();
+       StrBufPrintf(SpoolFileName,                     // Incoming packets get dropped into the "spoolin/" directory
+               "%s/%s.%lx%x",
+               ctdl_netin_dir,
+               ChrPtr(node),
+               time(NULL),
+               rand()
+       );
+       StrBufStripSlashes(SpoolFileName, 1);
+
+       FILE *netinfp = fopen(ChrPtr(SpoolFileName), "w");
+       FreeStrBuf(&SpoolFileName);
+       if (!netinfp) {
+               goto bail;
+       }
+
+       while (bytes_read < bytes_total) {
+               snprintf(buf, sizeof buf, "READ %d|%d", bytes_read, bytes_total-bytes_read);
+               sock_puts(&sock, buf);
+               if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                       fclose(netinfp);
+                       goto bail;
+               }
+               if (buf[0] == '6') {
+                       this_block = atoi(&buf[4]);
+
+                       // Use buffered reads to download the data from remote server
+                       StrBuf *ThisBlockBuf = NewStrBuf();
+                       int blen = socket_read_blob(&sock, ThisBlockBuf, this_block, 20);
+                       if (blen > 0) {
+                               fwrite(ChrPtr(ThisBlockBuf), blen, 1, netinfp);
+                               bytes_read += blen;
+                       }
+                       FreeStrBuf(&ThisBlockBuf);
+                       if (blen < this_block) {
+                               syslog(LOG_DEBUG, "netpoll: got short block, ftn");
+                               fclose(netinfp);
+                               goto bail;
+                       }
+               }
+       }
+
+       syslog(LOG_DEBUG, "netpoll: downloaded %d of %d bytes from %s", bytes_read, bytes_total, ChrPtr(node));
+
+       if (fclose(netinfp) == 0) {
+               sock_puts(&sock, "CLOS");                               // CLOSing the download causes it to be deleted on the other node
+               if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                       goto bail;
+               }
+       }
+
+       // Now get ready to send our network data to the other node.
+       SpoolFileName = NewStrBuf();
+       StrBufPrintf(SpoolFileName,                                     // Outgoing packets come from the "spoolout/" directory
+               "%s/%s",
+               ctdl_netout_dir,
+               ChrPtr(node)
+       );
+       netoutfp = fopen(ChrPtr(SpoolFileName), "r");
+       if (!netoutfp) {
+               goto bail;
+       }
+
+       /* Tell it we want to upload. */
+       sock_puts(&sock, "NUOP");
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                goto bail;
+        }
+       if (buf[0] != '2') {
+               CtdlAideMessage(buf, "NUOP error");
+               syslog(LOG_ERR, "netpoll: NUOP error talking to <%s> : %s", ChrPtr(node), buf);
+               goto bail;
+       }
+
+       fseek(netoutfp, 0, SEEK_END);
+       long total_to_send = ftell(netoutfp);
+       rewind(netoutfp);
+
+       syslog(LOG_DEBUG, "netpoll: I want to send %ld bytes to %s", total_to_send, ChrPtr(node));
+       long bytes_sent = 0;
+       while (bytes_sent < total_to_send) {
+               if (server_shutting_down) {
+                       goto bail;
+               }
+
+               this_block = total_to_send - bytes_sent;
+               if (this_block > sizeof(buf)) {
+                       this_block = sizeof(buf);
+               }
+
+               snprintf(buf, sizeof buf, "WRIT %d", this_block);
+               sock_puts(&sock, buf);
+               if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                       goto bail;
+               }
+               if (buf[0] != '7') {
+                       goto bail;
+               }
+               this_block = atol(&buf[4]);
+               fread(buf, this_block, 1, netoutfp);
+               if (sock_write(&sock, buf, this_block) != this_block) {
+                       goto bail;
+               }
+               bytes_sent += this_block;
+               syslog(LOG_DEBUG, "netpoll: sent %ld of %ld bytes to %s", bytes_sent, total_to_send, ChrPtr(node));
+       }
+
+       /* Tell them we're done. */
+       sock_puts(&sock, "UCLS 1");                                     // UCLS 1 causes it to close *and delete* on the other node
+        if (sock_getln(&sock, buf, sizeof buf) < 0) {
+                goto bail;
+        }
+       if (buf[0] == '2') {
+               unlink(ChrPtr(SpoolFileName));
+       }
+
+bail:  close(sock);
+       if (SpoolFileName != NULL) FreeStrBuf(&SpoolFileName);
+       if (netoutfp != NULL) fclose(netoutfp);
+       FreeStrBuf(&CC->SBuf.Buf);
+       FreeStrBuf(&CC->sMigrateBuf);
+}
+
+
+/*
+ * Poll other Citadel nodes and transfer inbound/outbound network data.
+ * Set "full" to nonzero to force a poll of every node, or to zero to poll
+ * only nodes to which we have data to send.
+ */
+void network_poll_other_citadel_nodes(int full_poll, HashList *ignetcfg)
+{
+       const char *key;
+       long len;
+       HashPos *Pos;
+       void *vCfg;
+       StrBuf *SpoolFileName;
+       
+       int poll = 0;
+       
+       if (GetCount(ignetcfg) ==0) {
+               syslog(LOG_DEBUG, "netpoll: no neighbor nodes are configured - not polling");
+               return;
+       }
+       become_session(&networker_client_CC);
+
+       SpoolFileName = NewStrBufPlain(ctdl_netout_dir, -1);
+
+       Pos = GetNewHashPos(ignetcfg, 0);
+
+       while (GetNextHashPos(ignetcfg, Pos, &len, &key, &vCfg))
+       {
+               /* Use the string tokenizer to grab one line at a time */
+               if (server_shutting_down) {
+                       return;
+               }
+               CtdlNodeConf *pNode = (CtdlNodeConf*) vCfg;
+               poll = 0;
+               
+               StrBuf *node = NewStrBufDup(pNode->NodeName);
+               StrBuf *host = NewStrBufDup(pNode->Host);
+               StrBuf *port = NewStrBufDup(pNode->Port);
+               StrBuf *secret = NewStrBufDup(pNode->Secret);
+               
+               if ( (StrLength(node) != 0) && 
+                    (StrLength(secret) != 0) &&
+                    (StrLength(host) != 0)
+               ) {
+                       poll = full_poll;
+                       if (poll == 0)
+                       {
+                               StrBufAppendBufPlain(SpoolFileName, HKEY("/"), 0);
+                               StrBufAppendBuf(SpoolFileName, node, 0);
+                               StrBufStripSlashes(SpoolFileName, 1);
+                               
+                               if (access(ChrPtr(SpoolFileName), R_OK) == 0) {
+                                       poll = 1;
+                               }
+                       }
+               }
+               if (poll && (StrLength(host) > 0) && strcmp("0.0.0.0", ChrPtr(host))) {
+                       if (!CtdlNetworkTalkingTo(SKEY(node), NTT_CHECK)) {
+                               network_poll_node(node, host, port, secret);
+                       }
+               }
+               FreeStrBuf(&node);
+               FreeStrBuf(&host);
+               FreeStrBuf(&secret);
+               FreeStrBuf(&port);
+       }
+       FreeStrBuf(&SpoolFileName);
+       DeleteHashPos(&Pos);
+}
+
+
+void network_do_clientqueue(void)
+{
+       HashList *working_ignetcfg;
+       int full_processing = 1;
+       static time_t last_run = 0L;
+
+       /*
+        * Run the full set of processing tasks no more frequently
+        * than once every n seconds
+        */
+       if ( (time(NULL) - last_run) < CtdlGetConfigLong("c_net_freq") )
+       {
+               full_processing = 0;
+               syslog(LOG_DEBUG, "netpoll: full processing in %ld seconds.",
+                       CtdlGetConfigLong("c_net_freq") - (time(NULL)- last_run)
+               );
+       }
+
+       working_ignetcfg = CtdlLoadIgNetCfg();
+       /*
+        * Poll other Citadel nodes.  Maybe.  If "full_processing" is set
+        * then we poll everyone.  Otherwise we only poll nodes we have stuff
+        * to send to.
+        */
+       network_poll_other_citadel_nodes(full_processing, working_ignetcfg);
+       DeleteHash(&working_ignetcfg);
+}
+
+
+/*
+ * Module entry point
+ */
+CTDL_MODULE_INIT(network_client)
+{
+       if (!threading)
+       {
+               CtdlFillSystemContext(&networker_client_CC, "CitNetworker");
+               CtdlRegisterSessionHook(network_do_clientqueue, EVT_TIMER, PRIO_SEND + 10);
+
+       }
+       return "networkclient";
+}