1 files changed, 78 insertions, 394 deletions

diff --git a/src/conn-tools/s6-ipcserver.c b/src/conn-tools/s6-ipcserver.c
index 1210139..890fc3d 100644
--- a/src/conn-tools/s6-ipcserver.c
+++ b/src/conn-tools/s6-ipcserver.c
@@ -1,316 +1,34 @@
 /* ISC license. */
 
-#include <skalibs/nonposix.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <grp.h>
 #include <limits.h>
-#include <signal.h>
 #include <skalibs/uint.h>
 #include <skalibs/gidstuff.h>
-#include <skalibs/setgroups.h>
-#include <skalibs/gccattributes.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/bytestr.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/diuint.h>
-#include <skalibs/env.h>
 #include <skalibs/djbunix.h>
-#include <skalibs/sig.h>
-#include <skalibs/selfpipe.h>
-#include <skalibs/iopause.h>
-#include <skalibs/webipc.h>
+#include <s6/config.h>
+#include <s6-networking/config.h>
 
 #define USAGE "s6-ipcserver [ -q | -Q | -v ] [ -d | -D ] [ -P | -p ] [ -1 ] [ -c maxconn ] [ -C localmaxconn ] [ -b backlog ] [ -G gid,gid,... ] [ -g gid ] [ -u uid ] [ -U ] path prog..."
-
-#define ABSOLUTE_MAXCONN 1000
-
-static unsigned int maxconn = 40 ;
-static unsigned int localmaxconn = 40 ;
-static char fmtmaxconn[UINT_FMT+1] = "/" ;
-static char fmtlocalmaxconn[UINT_FMT+1] = "/" ;
-static int flaglookup = 1 ;
-static unsigned int verbosity = 1 ;
-static int cont = 1 ;
-
-static diuint *piduid ;
-static unsigned int numconn = 0 ;
-static diuint *uidnum ;
-static unsigned int uidlen = 0 ;
-
-
- /* Utility functions */
-
-static inline void dieusage ()
-{
-  strerr_dieusage(100, USAGE) ;
-}
-
-static inline void X (void)
-{
-  strerr_dief1x(101, "internal inconsistency. Please submit a bug-report.") ;
-}
-
-
- /* Lookup primitives */
-
-static unsigned int lookup_diuint (diuint const *tab, unsigned int tablen, unsigned int key)
-{
-  register unsigned int i = 0 ;
-  for (; i < tablen ; i++) if (key == tab[i].left) break ;
-  return i ;
-}
-
-static inline unsigned int lookup_pid (unsigned int pid)
-{
-  return lookup_diuint(piduid, numconn, pid) ;
-}
-
-static inline unsigned int lookup_uid (unsigned int uid)
-{
-  return lookup_diuint(uidnum, uidlen, uid) ;
-}
-
-
- /* Logging */
-
-static inline void log_start (char const *path)
-{
-  strerr_warni2x("starting - listening on ", path) ;
-}
-
-static inline void log_exit (void)
-{
-  strerr_warni1x("exiting") ;
-}
-
-static void log_status (void)
-{
-  char fmt[UINT_FMT] ;
-  fmt[uint_fmt(fmt, numconn)] = 0 ;
-  strerr_warni3x("status: ", fmt, fmtmaxconn) ;
-}
-
-static void log_deny (unsigned int uid, unsigned int gid, unsigned int num)
-{
-  char fmtuid[UINT_FMT] = "?" ;
-  char fmtgid[UINT_FMT] = "?" ;
-  char fmtnum[UINT_FMT] = "?" ;
-  if (flaglookup)
-  {
-    fmtuid[uint_fmt(fmtuid, uid)] = 0 ;
-    fmtgid[uint_fmt(fmtgid, gid)] = 0 ;
-    fmtnum[uint_fmt(fmtnum, num)] = 0 ;
-  }
-  strerr_warni7sys("deny ", fmtuid, ":", fmtgid, " count ", fmtnum, fmtlocalmaxconn) ;
-}
-
-static void log_accept (unsigned int pid, unsigned int uid, unsigned int gid, unsigned int num)
-{
-  char fmtuidgid[UINT_FMT * 2 + 1] = "?:?" ;
-  char fmtpid[UINT_FMT] ;
-  char fmtnum[UINT_FMT] = "?" ;
-  if (flaglookup)
-  {
-    register unsigned int n = uint_fmt(fmtuidgid, uid) ;
-    fmtuidgid[n++] = ':' ;
-    n += uint_fmt(fmtuidgid + n, gid) ;
-    fmtuidgid[n] = 0 ;
-    fmtnum[uint_fmt(fmtnum, num)] = 0 ;
-  }
-  fmtpid[uint_fmt(fmtpid, pid)] = 0 ;
-  strerr_warni7x("allow ", fmtuidgid, " pid ", fmtpid, " count ", fmtnum, fmtlocalmaxconn) ;
-}
-
-static void log_close (unsigned int pid, unsigned int uid, int w)
-{
-  char fmtpid[UINT_FMT] ;
-  char fmtuid[UINT_FMT] = "?" ;
-  char fmtw[UINT_FMT] ;
-  fmtpid[uint_fmt(fmtpid, pid)] = 0 ;
-  if (flaglookup) fmtuid[uint_fmt(fmtuid, uid)] = 0 ;
-  fmtw[uint_fmt(fmtw, WIFSIGNALED(w) ? WTERMSIG(w) : WEXITSTATUS(w))] = 0 ;
-  strerr_warni6x("end pid ", fmtpid, " uid ", fmtuid, WIFSIGNALED(w) ? " signal " : " exitcode ", fmtw) ;
-}
-
-
- /* Signal handling */
-
-static void killthem (int sig)
-{
-  register unsigned int i = 0 ;
-  for (; i < numconn ; i++) kill(piduid[i].left, sig) ;
-}
-
-static void wait_children (void)
-{
-  for (;;)
-  {
-    unsigned int i ;
-    int w ;
-    register int pid = wait_nohang(&w) ;
-    if (pid < 0)
-      if (errno != ECHILD) strerr_diefu1sys(111, "wait_nohang") ;
-      else break ;
-    else if (!pid) break ;
-    i = lookup_pid(pid) ;
-    if (i < numconn)
-    {
-      unsigned int uid = piduid[i].right ;
-      register unsigned int j = lookup_uid(uid) ;
-      if (j >= uidlen) X() ;
-      if (!--uidnum[j].right) uidnum[j] = uidnum[--uidlen] ;
-      piduid[i] = piduid[--numconn] ;
-      if (verbosity >= 2)
-      {
-        log_close(pid, uid, w) ;
-        log_status() ;
-      }
-    }
-  }
-}
-
-static void handle_signals (void)
-{
-  for (;;) switch (selfpipe_read())
-  {
-    case -1 : strerr_diefu1sys(111, "read selfpipe") ;
-    case 0 : return ;
-    case SIGCHLD : wait_children() ; break ;
-    case SIGTERM :
-    {
-      if (verbosity >= 2)
-        strerr_warni3x("received ", "SIGTERM,", " quitting") ;
-      cont = 0 ;
-      break ;
-    }
-    case SIGHUP :
-    {
-      if (verbosity >= 2)
-        strerr_warni5x("received ", "SIGHUP,", " sending ", "SIGTERM+SIGCONT", " to all connections") ;
-      killthem(SIGTERM) ;
-      killthem(SIGCONT) ;
-      break ;
-    }
-    case SIGQUIT :
-    {
-      if (verbosity >= 2)
-        strerr_warni6x("received ", "SIGQUIT,", " sending ", "SIGTERM+SIGCONT", " to all connections", " and quitting") ;
-      cont = 0 ;
-      killthem(SIGTERM) ;
-      killthem(SIGCONT) ;
-      break ;
-    }
-    case SIGABRT :
-    {
-      if (verbosity >= 2)
-        strerr_warni6x("received ", "SIGABRT,", " sending ", "SIGKILL", " to all connections", " and quitting") ;
-      cont = 0 ;
-      killthem(SIGKILL) ;
-      break ;
-    }
-    default : X() ;
-  }
-}
-
-
- /* New connection handling */
-
-static void run_child (int, unsigned int, unsigned int, unsigned int, char const *, char const *const *, char const *const *) gccattr_noreturn ;
-static void run_child (int s, unsigned int uid, unsigned int gid, unsigned int num, char const *remotepath, char const *const *argv, char const *const *envp)
-{
-  unsigned int rplen = str_len(remotepath) + 1 ;
-  unsigned int n = 0 ;
-  char fmt[65 + UINT_FMT * 3 + rplen] ;
-  PROG = "s6-ipcserver (child)" ;
-  if ((fd_move(0, s) < 0) || (fd_copy(1, 0) < 0))
-    strerr_diefu1sys(111, "move fds") ;
-  byte_copy(fmt+n, 23, "PROTO=IPC\0IPCREMOTEEUID") ; n += 23 ;
-  if (flaglookup)
-  {
-    fmt[n++] = '=' ;
-    n += uint_fmt(fmt+n, uid) ;
-  }
-  fmt[n++] = 0 ;
-  byte_copy(fmt+n, 13, "IPCREMOTEEGID") ; n += 13 ;
-  if (flaglookup)
-  {
-    fmt[n++] = '=' ;
-    n += uint_fmt(fmt+n, gid) ;
-  }
-  fmt[n++] = 0 ;
-  byte_copy(fmt+n, 11, "IPCCONNNUM=") ; n += 11 ;
-  if (flaglookup) n += uint_fmt(fmt+n, num) ;
-  fmt[n++] = 0 ;
-  byte_copy(fmt+n, 14, "IPCREMOTEPATH=") ; n += 14 ;
-  byte_copy(fmt+n, rplen, remotepath) ; n += rplen ;
-  pathexec_r(argv, envp, env_len(envp), fmt, n) ;
-  strerr_dieexec(111, argv[0]) ;
-}
-
-static void new_connection (int s, char const *remotepath, char const *const *argv, char const *const *envp)
-{
-  unsigned int uid = 0, gid = 0 ;
-  unsigned int num, i ;
-  register int pid ;
-  if (flaglookup && (ipc_eid(s, &uid, &gid) < 0))
-  {
-    if (verbosity) strerr_warnwu1sys("ipc_eid") ;
-    return ;
-  }
-  i = lookup_uid(uid) ;
-  num = (i < uidlen) ? uidnum[i].right : 0 ;
-  if (num >= localmaxconn)
-  {
-    log_deny(uid, gid, num) ;
-    return ;
-  }
-  pid = fork() ;
-  if (pid < 0)
-  {
-    if (verbosity) strerr_warnwu1sys("fork") ;
-    return ;
-  }
-  else if (!pid)
-  {
-    selfpipe_finish() ;
-    run_child(s, uid, gid, num+1, remotepath, argv, envp) ;
-  }
-
-  if (i < uidlen) uidnum[i].right = num + 1 ;
-  else
-  {
-    uidnum[uidlen].left = uid ;
-    uidnum[uidlen++].right = 1 ;
-  }
-  piduid[numconn].left = (unsigned int)pid ;
-  piduid[numconn++].right = uid ;
-  if (verbosity >= 2)
-  {
-    log_accept((unsigned int)pid, uid, gid, uidnum[i].right) ;
-    log_status() ;
-  }
-}
-
-
- /* And the main */
+#define dieusage() strerr_dieusage(100, USAGE)
 
 int main (int argc, char const *const *argv, char const *const *envp)
 {
-  iopause_fd x[2] = { { -1, IOPAUSE_READ, 0 }, { -1, IOPAUSE_READ | IOPAUSE_EXCEPT, 0 } } ;
+  unsigned int verbosity = 1 ;
+  int flag1 = 0 ;
+  int flagU = 0 ;
+  int flaglookup = 1 ;
+  int flagreuse = 1 ;
+  unsigned int uid = 0, gid = 0 ;
+  gid_t gids[NGROUPS_MAX] ;
+  unsigned int gidn = (unsigned int)-1 ;
+  unsigned int maxconn = 0 ;
+  unsigned int localmaxconn = 0 ;
+  unsigned int backlog = (unsigned int)-1 ;
   PROG = "s6-ipcserver" ;
   {
     subgetopt_t l = SUBGETOPT_ZERO ;
-    unsigned int uid = 0, gid = 0 ;
-    gid_t gids[NGROUPS_MAX] ;
-    unsigned int gidn = 0 ;
-    unsigned int backlog = 20 ;
-    int flagreuse = 1, flag1 = 0 ;
     for (;;)
     {
       register int opt = subgetopt_r(argc, argv, "qQvDd1UPpc:C:b:u:g:G:", &l) ;
@@ -324,121 +42,87 @@ int main (int argc, char const *const *argv, char const *const *envp)
         case 'd' : flagreuse = 1 ; break ;
         case 'P' : flaglookup = 0 ; break ;
         case 'p' : flaglookup = 1 ; break ;
-        case 'c' : if (!uint0_scan(l.arg, &maxconn)) dieusage() ; break ;
-        case 'C' : if (!uint0_scan(l.arg, &localmaxconn)) dieusage() ; break ;
+        case 'c' : if (!uint0_scan(l.arg, &maxconn)) dieusage() ; if (!maxconn) maxconn = 1 ; break ;
+        case 'C' : if (!uint0_scan(l.arg, &localmaxconn)) dieusage() ; if (!localmaxconn) localmaxconn = 1 ; break ;
         case 'b' : if (!uint0_scan(l.arg, &backlog)) dieusage() ; break ;
         case 'u' : if (!uint0_scan(l.arg, &uid)) dieusage() ; break ;
         case 'g' : if (!uint0_scan(l.arg, &gid)) dieusage() ; break ;
-        case 'G' : if (!gid_scanlist(gids, NGROUPS_MAX, l.arg, &gidn)) dieusage() ; break ;
+        case 'G' : if (!gid_scanlist(gids, NGROUPS_MAX, l.arg, &gidn) && *l.arg) dieusage() ; break ;
         case '1' : flag1 = 1 ; break ;
-        case 'U' :
-        {
-          char const *x = env_get2(envp, "UID") ;
-          if (!x) strerr_dienotset(100, "UID") ;
-          if (!uint0_scan(x, &uid)) strerr_dieinvalid(100, "UID") ;
-          x = env_get2(envp, "GID") ;
-          if (!x) strerr_dienotset(100, "GID") ;
-          if (!uint0_scan(x, &gid)) strerr_dieinvalid(100, "GID") ;
-          x = env_get2(envp, "GIDLIST") ;
-          if (!x) strerr_dienotset(100, "GIDLIST") ;
-          if (!gid_scanlist(gids, NGROUPS_MAX, x, &gidn) && *x)
-            strerr_dieinvalid(100, "GIDLIST") ;
-          break ;
-        }
+        case 'U' : flagU = 1 ; uid = 0 ; gid = 0 ; gidn = (unsigned int)-1 ; break ;
         default : dieusage() ;
       }
     }
     argc -= l.ind ; argv += l.ind ;
     if (argc < 2) dieusage() ;
-    if (!*argv[0]) dieusage() ;
-    close(0) ;
-    if (flag1)
-    {
-      if (fcntl(1, F_GETFD) < 0)
-        strerr_dief1sys(100, "called with option -1 but stdout said") ;
-    }
-    else close(1) ;
-    if (!maxconn) maxconn = 1 ;
-    if (maxconn > ABSOLUTE_MAXCONN) maxconn = ABSOLUTE_MAXCONN ;
-    if (!flaglookup || (localmaxconn > maxconn)) localmaxconn = maxconn ;
-    x[1].fd = ipc_stream() ;
-    if ((x[1].fd < 0) || (coe(x[1].fd) < 0))
-      strerr_diefu1sys(111, "create socket") ;
-    {
-      mode_t m = umask(0) ;
-      if ((flagreuse ? ipc_bind_reuse(x[1].fd, argv[0]) : ipc_bind(x[1].fd, argv[0])) < 0)
-        strerr_diefu2sys(111, "bind to ", argv[0]) ;
-      umask(m) ;
-    }
-    if (ipc_listen(x[1].fd, backlog) < 0) strerr_diefu1sys(111, "listen") ;
-    if (gidn && (setgroups(gidn, gids) < 0)) strerr_diefu1sys(111, "setgroups") ;
-    if (gid && (setgid(gid) < 0)) strerr_diefu1sys(111, "drop gid") ;
-    if (uid && (setuid(uid) < 0)) strerr_diefu1sys(111, "drop uid") ;
+  }
 
-    x[0].fd = selfpipe_init() ;
-    if (x[0].fd == -1) strerr_diefu1sys(111, "create selfpipe") ;
-    if (sig_ignore(SIGPIPE) < 0) strerr_diefu1sys(111, "ignore SIGPIPE") ;
+  {
+    unsigned int m = 0 ;
+    unsigned int pos = 0 ;
+    char fmt[UINT_FMT * 5 + GID_FMT * NGROUPS_MAX] ;
+    char const *newargv[24 + argc] ;
+    newargv[m++] = S6_NETWORKING_BINPREFIX "s6-ipcserver-socketbinder" ;
+    if (!flagreuse) newargv[m++] = "-D" ;
+    if (backlog != (unsigned int)-1)
     {
-      sigset_t set ;
-      sigemptyset(&set) ;
-      sigaddset(&set, SIGCHLD) ;
-      sigaddset(&set, SIGTERM) ;
-      sigaddset(&set, SIGHUP) ;
-      sigaddset(&set, SIGQUIT) ;
-      sigaddset(&set, SIGABRT) ;
-      if (selfpipe_trapset(&set) < 0) strerr_diefu1sys(111, "trap signals") ;
+      newargv[m++] = "-b" ;
+      newargv[m++] = fmt + pos ;
+      pos += uint_fmt(fmt + pos, backlog) ;
+      fmt[pos++] = 0 ;
     }
-
-    if (flag1)
+    newargv[m++] = "--" ;
+    newargv[m++] = *argv++ ;
+    if (flagU || uid || gid || gidn != (unsigned int)-1)
     {
-      unsigned int n = str_len(argv[0]) ;
-      char s[n+1] ;
-      byte_copy(s, n, argv[0]) ;
-      s[n++] = '\n' ;
-      allwrite(1, s, n) ;
-      fd_close(1) ;
+      newargv[m++] = S6_EXTBINPREFIX "s6-applyuidgid" ;
+      if (flagU) newargv[m++] = "-Uz" ;
+      if (uid)
+      {
+        newargv[m++] = "-u" ;
+        newargv[m++] = fmt + pos ;
+        pos += uint_fmt(fmt + pos, uid) ;
+        fmt[pos++] = 0 ;
+      }
+      if (gid)
+      {
+        newargv[m++] = "-g" ;
+        newargv[m++] = fmt + pos ;
+        pos += uint_fmt(fmt + pos, gid) ;
+        fmt[pos++] = 0 ;
+      }
+      if (gidn != (unsigned int)-1)
+      {
+        newargv[m++] = "-G" ;
+        newargv[m++] = fmt + pos ;
+        pos += gid_fmtlist(fmt + pos, gids, gidn) ;
+        fmt[pos++] = 0 ;
+      }
+      newargv[m++] = "--" ;
     }
-    fmtlocalmaxconn[1+uint_fmt(fmtlocalmaxconn+1, localmaxconn)] = 0 ;
-    if (verbosity >= 2)
+    newargv[m++] = S6_NETWORKING_BINPREFIX "s6-ipcserverd" ;
+    if (!verbosity) newargv[m++] = "-q" ;
+    else if (verbosity == 2) newargv[m++] = "-v" ;
+    if (flag1) newargv[m++] = "-1" ;
+    if (!flaglookup) newargv[m++] = "-P" ;
+    if (maxconn)
     {
-      fmtmaxconn[1+uint_fmt(fmtmaxconn+1, maxconn)] = 0 ;
-      log_start(argv[0]) ;
-      log_status() ;
+      newargv[m++] = "-c" ;
+      newargv[m++] = fmt + pos ;
+      pos += uint_fmt(fmt + pos, maxconn) ;
+      fmt[pos++] = 0 ;
     }
-  }
-
-  {
-    diuint inyostack[maxconn + (flaglookup ? maxconn : 1)] ;
-    piduid = inyostack ; uidnum = inyostack + maxconn ;
-
-    while (cont)
+    if (localmaxconn)
     {
-      if (iopause_g(x, 1 + (numconn < maxconn), 0) < 0)
-        strerr_diefu1sys(111, "iopause") ;
-
-      if (x[0].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with selfpipe") ;
-      if (x[0].revents & IOPAUSE_READ) handle_signals() ;
-      if (numconn < maxconn)
-      {
-        if (x[1].revents & IOPAUSE_EXCEPT) strerr_dief1x(111, "trouble with socket") ;
-        if (x[1].revents & IOPAUSE_READ)
-        {
-          int dummy ;
-          char remotepath[IPCPATH_MAX+1] ;
-          register int s = ipc_accept(x[1].fd, remotepath, IPCPATH_MAX+1, &dummy) ;
-          if (s < 0)
-          {
-            if (verbosity) strerr_warnwu1sys("accept") ;
-          }
-          else
-          {
-            new_connection(s, remotepath, argv+1, envp) ;
-            fd_close(s) ;
-          }
-        }
-      }
+      newargv[m++] = "-C" ;
+      newargv[m++] = fmt + pos ;
+      pos += uint_fmt(fmt + pos, localmaxconn) ;
+      fmt[pos++] = 0 ;
     }
+    newargv[m++] = "--" ;
+    while (*argv) newargv[m++] = *argv++ ;
+    newargv[m++] = 0 ;
+    pathexec_run(newargv[0], newargv, envp) ;
+    strerr_dieexec(111, newargv[0]) ;
   }
-  if (verbosity >= 2) log_exit() ;
-  return 0 ;
 }