X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/165efde7f48706c6b4680aa537b3467e70d6a11d..add23883a6378567be6b7866bc2ff2c32400a346:/server/tripe.c

diff --git a/server/tripe.c b/server/tripe.c
index f46e232c..1e6d4062 100644
--- a/server/tripe.c
+++ b/server/tripe.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
- *
- * $Id$
  *
  * Main program
  *
@@ -62,23 +60,6 @@ static void interval(struct timeval *tv, void *v)
   sel_addtimer(&sel, &it, &tvv, interval, v);
 }
 
-/* --- @mystrieq@ --- *
- *
- * Arguments:	@const char *x, *y@ = two strings
- *
- * Returns:	True if @x@ and @y are equal, up to case.
- */
-
-int mystrieq(const char *x, const char *y)
-{
-  for (;;) {
-    if (!*x && !*y) return (1);
-    if (tolower((unsigned char)*x) != tolower((unsigned char)*y))
-      return (0);
-    x++; y++;
-  }
-}
-
 /* --- @main@ --- *
  *
  * Arguments:	@int argc@ = number of command line arguments
@@ -91,8 +72,8 @@ int mystrieq(const char *x, const char *y)
 
 static void usage(FILE *fp)
 {
-  pquis(fp, "Usage: $ [-D] [-d DIR] [-b ADDR] [-p PORT] [-n TUNNEL]\n\
-	[-U USER] [-G GROUP] [-a SOCKET] [-T TRACE-OPTS]\n\
+  pquis(fp, "Usage: $ [-DF] [-d DIR] [-b ADDR] [-p PORT] [-n TUNNEL]\n\
+	[-U USER] [-G GROUP] [-a SOCKET] [-m MODE] [-T TRACE-OPTS]\n\
 	[-k PRIV-KEYRING] [-K PUB-KEYRING] [-t KEY-TAG]\n");
 }
 
@@ -112,6 +93,7 @@ Options:\n\
     --tunnels		Display IP tunnel drivers and exit.\n\
 \n\
 -D, --daemon		Run in the background.\n\
+-F, --foreground	Quit when stdin reports end-of-file.\n\
 -d, --directory=DIR	Switch to directory DIR [default " CONFIGDIR "].\n\
 -b, --bind-address=ADDR	Bind UDP socket to this IP ADDR.\n\
 -p, --port=PORT		Select UDP port to listen to "
@@ -123,6 +105,7 @@ Options:\n\
 -K, --pub-keyring=FILE	Get public keys from FILE.\n\
 -t, --tag=KEYTAG	Use private key labelled TAG.\n\
 -a, --admin-socket=FILE	Use FILE as the adminstration socket.\n\
+-m, --admin-perms=MODE	Permissions to set on admin socket [default 600].\n\
 " T( "\
 -T, --trace=OPTIONS	Turn on tracing options.\n\
 " ) "\
@@ -132,8 +115,9 @@ Options:\n\
 int main(int argc, char *argv[])
 {
   const char *kr_priv = "keyring", *kr_pub = "keyring.pub";
-  const char *tag_priv = "tripe-dh";
+  const char *tag_priv = 0;
   const char *csock = SOCKETDIR "/tripesock";
+  int csockmode = 0600;
   const char *dir = CONFIGDIR;
   const char *p;
   unsigned port = TRIPE_PORT;
@@ -141,12 +125,14 @@ int main(int argc, char *argv[])
   unsigned f = 0;
   int i;
   int selerr = 0;
+  unsigned af;
   struct timeval tv;
   uid_t u = -1;
   gid_t g = -1;
 
 #define f_bogus 1u
 #define f_daemon 2u
+#define f_foreground 4u
 
   ego(argv[0]);
   T( trace_on(stderr, 0); )
@@ -165,6 +151,7 @@ int main(int argc, char *argv[])
       { "tunnels",	0,		0,	'0' },
 
       { "daemon",	0,		0,	'D' },
+      { "foreground",	0,		0,	'F' },
       { "uid",		OPTF_ARGREQ,	0,	'U' },
       { "setuid",	OPTF_ARGREQ,	0,	'U' },
       { "gid",		OPTF_ARGREQ,	0,	'G' },
@@ -177,6 +164,7 @@ int main(int argc, char *argv[])
       { "pub-keyring",	OPTF_ARGREQ,	0,	'K' },
       { "tag",		OPTF_ARGREQ,	0,	't' },
       { "admin-socket", OPTF_ARGREQ,	0,	'a' },
+      { "admin-perms",	OPTF_ARGREQ,	0,	'm' },
 #ifndef NTRACE
       { "trace",	OPTF_ARGREQ,	0,	'T' },
 #endif
@@ -184,7 +172,7 @@ int main(int argc, char *argv[])
       { 0,		0,		0,	0 }
     };
 
-    i = mdwopt(argc, argv, "hvuDU:G:b:p:d:k:K:t:a:" T("T:"),
+    i = mdwopt(argc, argv, "hvuDFU:G:b:n:p:d:k:K:t:a:m:" T("T:"),
 	       opts, 0, 0, 0);
     if (i < 0)
       break;
@@ -202,32 +190,15 @@ int main(int argc, char *argv[])
       case 'D':
 	f |= f_daemon;
 	break;
-      case 'U': {
-	struct passwd *pw;
-	char *p;
-	unsigned long i = strtoul(optarg, &p, 0);
-	if (!*p)
-	  pw = getpwuid(i);
-	else
-	  pw = getpwnam(optarg);
-	if (!pw)
-	  die(EXIT_FAILURE, "user `%s' not found", optarg);
-	u = pw->pw_uid;
-	if (g == -1)
-	  g = pw->pw_gid;
-      } break;
-      case 'G': {
-	struct group *gr;
-	char *p;
-	unsigned long i = strtoul(optarg, &p, 0);
-	if (!*p)
-	  gr = getgrgid(i);
-	else
-	  gr = getgrnam(optarg);
-	if (!gr)
-	  die(EXIT_FAILURE, "group `%s' not found", optarg);
-	g = gr->gr_gid;
-      } break;
+      case 'U':
+	u = u_getuser(optarg, &g);
+	break;
+      case 'G':
+	g = u_getgroup(optarg);
+	break;
+      case 'F':
+	f |= f_foreground;
+	break;
 
       case 'b': {
 	struct hostent *h = gethostbyname(optarg);
@@ -270,6 +241,11 @@ int main(int argc, char *argv[])
       case 'a':
 	csock = optarg;
 	break;
+      case 'm': {
+	char *p;
+	csockmode = strtol(optarg, &p, 8);
+	if (*p) die(EXIT_FAILURE, "bad permissions: `%s'", optarg);
+      } break;
       case 't':
 	tag_priv = optarg;
 	break;
@@ -295,6 +271,8 @@ int main(int argc, char *argv[])
     usage(stderr);
     exit(EXIT_FAILURE);
   }
+  if (!(~f & (f_daemon | f_foreground)))
+    die(EXIT_FAILURE, "foreground operation for a daemon is silly");
 
   if (chdir(dir)) {
     die(EXIT_FAILURE, "can't set current directory to `%s': %s",
@@ -310,26 +288,18 @@ int main(int argc, char *argv[])
     tunnels[i]->init();
   p_init(baddr, port);
   if (!(f & f_daemon)) {
+    af = AF_WARN;
 #ifndef NTRACE
-    a_create(STDIN_FILENO, STDOUT_FILENO, AF_TRACE | AF_WARN);
-#else
-    a_create(STDIN_FILENO, STDOUT_FILENO, AF_WARN);
+    af |= AF_TRACE;
 #endif
+    if (f & f_foreground)
+      af |= AF_FOREGROUND;
+    a_create(STDIN_FILENO, STDOUT_FILENO, af);
   }
-  if (g != (gid_t)-1) {
-    if (setgid(g) || (getuid() == 0 && setgroups(1, &g))) {
-      die(EXIT_FAILURE, "couldn't setgid to %u: %s",
-	  (unsigned)g, strerror(errno));
-    }
-  }
-  if (u != (uid_t)-1) {
-    if (setuid(u)) {
-      die(EXIT_FAILURE, "couldn't setuid to %u: %s",
-	  (unsigned)u, strerror(errno));
-    }
-  }
+  ps_split(f & f_daemon);
+  a_init(csock, u, g, csockmode);
+  u_setugid(u, g);
   km_init(kr_priv, kr_pub, tag_priv);
-  a_init(csock);
   if (f & f_daemon) {
     if (daemonize())
       die(EXIT_FAILURE, "couldn't become a daemon: %s", strerror(errno));