Finalize logger, back to mathopd

logger/logger.mk

@@ -0,0 +1,21 @@
+LOGGER_PKGDIR = build/logger
+LOGGER_PACKAGE = logger.pkg
+
+logger-install: logger-build
+	mkdir -p $(LOGGER_PKGDIR)
+
+	mkdir -p $(LOGGER_PKGDIR)/bin/
+	$(MAKE) -C logger/src install DESTDIR=$(CURDIR)/$(LOGGER_PKGDIR)
+
+	$(call COPYTREE, logger/tokens, $(LOGGER_PKGDIR)/tokens)	
+
+	$(call COPYTREE, logger/service, $(LOGGER_PKGDIR)/service)
+
+logger-clean:
+	rm -rf $(LOGGER_PKGDIR) $(LOGGER_PACKAGE)
+	$(MAKE) -C logger/src clean
+
+logger-build:
+	$(MAKE) -C logger/src build
+
+PACKAGES += logger

logger/src/Makefile

@@ -1,5 +1,14 @@
-all: logger
+CFLAGS = -Wall -Werror
+LDFLAGS = -static
+TARGETS = logger
+
+all: build
+build: $(TARGETS)
+
 logger: logger.o token.o
 
+install: $(TARGETS)
+	install -m 0755 $(TARGETS) $(DESTDIR)/bin
+
 clean:
-	rm -f *.o logger
+	rm -f *.o $(TARGETS)

logger/src/logger.c

@@ -6,10 +6,10 @@
 #include <string.h>
 #include "token.h"
 
-#define NO_DEBUG
 #define PID_MAX 32768
 #define QSIZE 200
-#define MSGS_PER_SEC 10
+#define MSGS_PER_SEC_MIN 10
+#define MSGS_PER_SEC_MAX 40
 
 const uint8_t key[] = {0x99, 0xeb, 0xc0, 0xce,
                        0xe0, 0xc9, 0xed, 0x5b,
@@ -17,7 +17,7 @@ const uint8_t key[] = {0x99, 0xeb, 0xc0, 0xce,
                        0xdd, 0x0b, 0x03, 0x10};
 
 /* Storage space for tokens */
-char token[4][TOKEN_MAX];
+char token[3][TOKEN_MAX];
 
 void
 read_tokens()
@@ -31,7 +31,7 @@ read_tokens()
     sprintf(name, "logger%d", i);
 
     len = read_token(name, key, sizeof(key), token[i], sizeof(token[i]));
-    if (len >= sizeof(token[i])) abort();
+    if ((-1 == len) || (len >= sizeof(token[i]))) abort();
     token[i][len] = '\0';
   }
 }
@@ -160,7 +160,6 @@ char const *
 bogus_token()
 {
   static char   token[TOKEN_MAX];
-  char          bb[bubblebabble_len(5)];
   unsigned char crap[itokenlen];
   unsigned char digest[bubblebabble_len(itokenlen)];
   int           i;
@@ -345,7 +344,7 @@ main(int argc, char *argv[])
 {
   int    i;
   int    pid  = 52;
-  time_t then = time(NULL);
+  time_t then = time(NULL) - 100; /* Assure we get new tokens right away */
 
   /* Seed RNG */
   srandom(then);
@@ -387,7 +386,7 @@ main(int argc, char *argv[])
     }
 
     /* Make some messages */
-    max = randint(MSGS_PER_SEC);
+    max = MSGS_PER_SEC_MIN + randint(MSGS_PER_SEC_MAX - MSGS_PER_SEC_MIN);
 
     for (i = 0; i < max; i += 1) {
       time_t          start = now + 1;
@@ -471,7 +470,7 @@ main(int argc, char *argv[])
             messages[0]->when = start;
             snprintf(messages[0]->text, sizeof(messages[0]->text),
                      "ircd: Accepted connection %d from %d.%d.%d.%d:%d on socket %d.",
-                     pid, connection,
+                     connection,
                      randint(256), randint(256),
                      randint(256), randint(256),
                      port,
@@ -515,59 +514,84 @@ main(int argc, char *argv[])
           break;
         case 6 ... 20:
           /* SMTP */
-          if (-1 != get_many_messages(messages, 8)) {
+          {
-            char const *u    = user();
+            char const *mytoken;
-            int         o1   = randint(256);
+            size_t      tokenlen;
-            int         o2   = randint(256);
+            char const *host;
-            int         o3   = randint(256);
+            size_t      hostlen;
-            int         o4   = randint(256);
+            char const *from;
-            long int    mid  = random();
+            size_t      fromlen;
-            long int    mid2 = random();
+            char const *to;
+            int         is_token;
 
-            messages[0]->when = start;
+            if (randint(10) == 0) {
-            snprintf(messages[0]->text, sizeof(messages[0]->text),
+              is_token = 1;
-                     "smtp/smtpd[%d]: connect from unknown[%d.%d.%d.%d]",
+              mytoken = token[2];
-                     pid, o1, o2, o3, o4);
+            } else {
+              is_token = 0;
+              mytoken = bogus_token();
+            }
 
-            messages[1]->when = messages[0]->when + randint(1);
+            tokenlen = strlen(mytoken);
-            snprintf(messages[1]->text, sizeof(messages[1]->text),
+            host = mytoken;
-                     "smtp/smtpd[%d]: %08lX: client=unknown[%d.%d.%d.%d]",
+            hostlen = tokenlen/3;
-                     pid, mid, o1, o2, o3, o4);
+            from = mytoken + hostlen;
+            fromlen = tokenlen/3;
+            to = mytoken + hostlen + fromlen;
 
-            messages[2]->when = messages[1]->when + 2 + randint(3);
+            if (-1 != get_many_messages(messages, 8)) {
-            snprintf(messages[2]->text, sizeof(messages[2]->text),
+              int      o1   = randint(256);
-                     "smtp/smtpd[%d]: disconnect from [%d.%d.%d.%d]",
+              int      o2   = randint(256);
-                     pid, o1, o2, o3, o4);
+              int      o3   = randint(256);
+              int      o4   = randint(256);
+              long int mid  = random();
+              long int mid2 = random();
 
-            pid = (pid + 1 + randint(5)) % PID_MAX;
+              messages[0]->when = start;
-            messages[3]->when = messages[1]->when + 1 + randint(2);
+              snprintf(messages[0]->text, sizeof(messages[0]->text),
-            snprintf(messages[3]->text, sizeof(messages[3]->text),
+                       "smtp/smtpd[%d]: connect from %.*s[%d.%d.%d.%d]",
-                     "smtp/cleanup[%d]: %08lX: message-id=<%08lx@junkmail.spam>",
+                       pid, hostlen, host, o1, o2, o3, o4);
-                     pid, mid, mid2);
 
-            pid = (pid + 1 + randint(5)) % PID_MAX;
+              messages[1]->when = messages[0]->when + randint(1);
-            messages[4]->when = messages[3]->when + randint(1);
+              snprintf(messages[1]->text, sizeof(messages[1]->text),
-            snprintf(messages[4]->text, sizeof(messages[4]->text),
+                       "smtp/smtpd[%d]: %08lX: client=%.*s[%d.%d.%d.%d]",
-                     "smtp/qmgr[%d]: %08lX: from=<%s@junkmail.spam>, size=%d, nrcpt=1 (queue active)",
+                       pid, mid, hostlen, host, o1, o2, o3, o4);
-                     pid, mid, user(), randint(6000));
 
-            messages[5]->when = messages[4]->when + 2 + randint(2);
+              messages[2]->when = messages[1]->when + 2 + randint(3);
-            snprintf(messages[5]->text, sizeof(messages[5]->text),
+              snprintf(messages[2]->text, sizeof(messages[2]->text),
-                     "smtp/qmgr[%d]: %08lX: removed",
+                       "smtp/smtpd[%d]: disconnect from [%d.%d.%d.%d]",
-                     pid, mid);
+                       pid, o1, o2, o3, o4);
 
-            messages[6]->when = messages[4]->when + randint(1);
+              pid = (pid + 1 + randint(5)) % PID_MAX;
-            snprintf(messages[6]->text, sizeof(messages[6]->text),
+              messages[3]->when = messages[1]->when + 1 + randint(2);
-                     "smtp/deliver(%s): msgid=<%08lx@junkmail.spam>: saved to INBOX",
+              snprintf(messages[3]->text, sizeof(messages[3]->text),
-                     u, mid2);
+                       "smtp/cleanup[%d]: %08lX: message-id=<%08lx@junkmail.spam>",
+                       pid, mid, mid2);
 
-            pid = (pid + 1 + randint(5)) % PID_MAX;
+              pid = (pid + 1 + randint(5)) % PID_MAX;
-            messages[7]->when = messages[4]->when + randint(1);
+              messages[4]->when = messages[3]->when + randint(1);
-            snprintf(messages[7]->text, sizeof(messages[7]->text),
+              snprintf(messages[4]->text, sizeof(messages[4]->text),
-                     "smtp/local[%d]: %08lX: to <%s@dirtbags.net>, relay=local, dsn=2.0.0, status=sent (delivered to command /usr/bin/deliver)",
+                       "smtp/qmgr[%d]: %08lX: from=<%.*s@junkmail.spam>, size=%d, nrcpt=1 (queue active)",
-                     pid, mid, u);
+                       pid, mid, fromlen, from, randint(6000));
 
-            enqueue_messages(messages, 8);
+              messages[5]->when = messages[4]->when + 2 + randint(2);
+              snprintf(messages[5]->text, sizeof(messages[5]->text),
+                       "smtp/qmgr[%d]: %08lX: removed",
+                       pid, mid);
+
+              messages[6]->when = messages[4]->when + randint(1);
+              snprintf(messages[6]->text, sizeof(messages[6]->text),
+                       "smtp/deliver(%s): msgid=<%08lx@junkmail.spam>: saved to INBOX",
+                       to, mid2);
+
+              pid = (pid + 1 + randint(5)) % PID_MAX;
+              messages[7]->when = messages[4]->when + randint(1);
+              snprintf(messages[7]->text, sizeof(messages[7]->text),
+                       "smtp/local[%d]: %08lX: to <%s@dirtbags.net>, relay=local, dsn=2.0.0, status=sent (delivered to command /usr/bin/deliver)",
+                       pid, mid, to);
+
+              enqueue_messages(messages, 8);
+            }
           }
           break;
         case 21 ... 30:

logger/tokens/logger3/category

@@ -1 +0,0 @@
-logger

logger/tokens/logger3/category.key

@@ -1 +0,0 @@
-Sﾞ*郢ｼ緩ﾐ7<EFBE90>k<13>

logger/tokens/logger3/enc.key

@@ -1 +0,0 @@
-™כְ־אֹם[½ָµ‎<C2B5>

mcp/service/httpd/log/run

@@ -0,0 +1,3 @@
+#! /bin/sh
+
+exec logger -t httpd

mcp/service/httpd/mathopd.conf

@@ -6,6 +6,16 @@ ErrorLog /dev/stderr
 User nobody
 StayRoot On
 
+LogFormat {
+  RemoteAddress
+  Method
+  URI
+  Status
+  ContentLength
+  Referer
+  UserAgent
+}
+
 Tuning {
   Timeout 5
   ScriptTimeout 5

mcp/service/httpd/run

@@ -1,21 +1,18 @@
 #! /bin/sh
 
-mkdir -p /var/www
+exec 2>&1
-cd /var/www
+
+install -d /var/www
 
 # Link in puzzles and web pages
 for d in /opt/*; do
     if [ -d $d/puzzles ]; then
-        ln -s $d/puzzles $(basename $d)
+        ln -sf $d/puzzles /var/www/$(basename $d)
     fi
     if [ -d $d/www ]; then
-        ln -s $d/www/* .
+        ln -sf $d/www/* /var/www/
     fi
 done
 
-exec thttpd -D \
+exec mathopd -n -f ./mathopd.conf
-    -nos \
-    -u ctf \
-    -c "**.cgi" \
-    -T "utf-8"
 

mcp/service/puzzled/run

@@ -1,8 +1,9 @@
-#! /bin/sh
+#! /bin/sh -e
 
 exec 2>&1
 
 install -o ctf -m 0644 /dev/null /var/lib/ctf/puzzles.db
+install -d /var/www
 
 # Make an initial listing
 ./puzzled