X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/449991a38a59d04c723791a3ca2897da5f2d9709..62b5e3ecc77424add00ad4e5dc86e7248751cdf6:/server/admin.c

diff --git a/server/admin.c b/server/admin.c
index 045727f7..7fa3f0f8 100644
--- a/server/admin.c
+++ b/server/admin.c
@@ -40,6 +40,7 @@ const trace_opt tr_opts[] = {
   { 'x',	T_KEYEXCH,	"key exchange" },
   { 'm',	T_KEYMGMT,	"key management" },
   { 'l',	T_CHAL,		"challenge management" },
+  { 'v',	T_PRIVSEP,	"privilege separation" },
   { 'p',	T_PACKET,	"packet contents" },
   { 'c',	T_CRYPTO,	"crypto details" },
   { 'A',	T_ALL,		"all of the above" },
@@ -238,16 +239,34 @@ static void a_flush(int fd, unsigned mode, void *v)
  *
  * Returns:	---
  *
- * Use:		Main message token formatting driver.
+ * Use:		Main message token formatting driver.  The arguments are
+ *		interleaved formatting tokens and their parameters, finally
+ *		terminated by an entry @A_END@.
+ *
+ *		Tokens recognized:
+ *
+ *		  * "*..." ... -- pretokenized @dstr_putf@-like string
+ *
+ *		  * "?ADDR" SOCKADDR -- a socket address, to be converted
+ *
+ *		  * "?B64" BUFFER SIZE -- binary data to be base64-encoded
+ *
+ *		  * "?TOKENS" VECTOR -- null-terminated vector of tokens
+ *
+ *		  * "?PEER" PEER -- peer's name
+ *
+ *		  * "?ERRNO" ERRNO -- system error code
+ *
+ *		  * "[!]..." ... -- @dstr_putf@-like string as single token
  */
 
-static void a_vformat(dstr *d, const char *fmt, va_list ap)
+void a_vformat(dstr *d, const char *fmt, va_list ap)
 {
   dstr dd = DSTR_INIT;
 
   while (fmt) {
     if (*fmt == '*') {
-      dstr_putc(d, ' ');
+      if (d->len) dstr_putc(d, ' ');
       dstr_vputf(d, fmt + 1, &ap);
     } else if (*fmt == '?') {
       if (strcmp(fmt, "?ADDR") == 0) {
@@ -503,6 +522,7 @@ void a_quit(void)
   close(sock.fd);
   unlink(sockname);
   FOREACH_PEER(p, { p_destroy(p); });
+  ps_quit();
   exit(0);
 }
 
@@ -1185,6 +1205,7 @@ static void a_doadd(admin_resop *r, int rc)
       a_bgok(&add->r.bg);
   }
 
+  if (add->peer.tag) xfree(add->peer.tag);
   xfree(add->peer.name);
 }
 
@@ -1208,9 +1229,10 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
 
   add = xmalloc(sizeof(*add));
   add->peer.name = 0;
+  add->peer.tag = 0;
   add->peer.t_ka = 0;
   add->peer.tops = tun_default;
-  add->peer.kxf = 0;
+  add->peer.f = 0;
 
   /* --- Parse options --- */
 
@@ -1230,7 +1252,13 @@ static void acmd_add(admin *a, unsigned ac, char *av[])
       }
     })
     OPTTIME("-keepalive", t, { add->peer.t_ka = t; })
-    OPT("-cork", { add->peer.kxf |= KXF_CORK; })
+    OPT("-cork", { add->peer.f |= KXF_CORK; })
+    OPTARG("-key", arg, {
+      if (add->peer.tag)
+	xfree(add->peer.tag);
+      add->peer.tag = xstrdup(arg);
+    })
+    OPT("-mobile", { add->peer.f |= PSF_MOBILE; })
   });
 
   /* --- Make sure someone's not got there already --- */
@@ -1255,6 +1283,7 @@ bad_syntax:
   a_fail(a, "bad-syntax", "add", "[OPTIONS] PEER ADDR ...", A_END);
 fail:
   if (add->peer.name) xfree(add->peer.name);
+  if (add->peer.tag) xfree(add->peer.tag);
   xfree(add);
   return;
 }
@@ -1765,6 +1794,7 @@ static void acmd_peerinfo(admin *a, unsigned ac, char *av[])
   if ((p = a_findpeer(a, av[0])) != 0) {
     ps = p_spec(p);
     a_info(a, "tunnel=%s", ps->tops->name, A_END);
+    a_info(a, "key=%s", p_tag(p), A_END);
     a_info(a, "keepalive=%lu", ps->t_ka, A_END);
     a_ok(a);
   }
@@ -2182,19 +2212,23 @@ void a_daemon(void) { flags |= F_DAEMON; }
 /* --- @a_init@ --- *
  *
  * Arguments:	@const char *name@ = socket name to create
+ *		@uid_t u@ = user to own the socket
+ *		@gid_t g@ = group to own the socket
+ *		@mode_t m@ = permissions to set on the socket
  *
  * Returns:	---
  *
  * Use:		Creates the admin listening socket.
  */
 
-void a_init(const char *name)
+void a_init(const char *name, uid_t u, gid_t g, mode_t m)
 {
   int fd;
   int n = 5;
   struct sockaddr_un sun;
   struct sigaction sa;
   size_t sz;
+  mode_t omask;
 
   /* --- Create services table --- */
 
@@ -2212,7 +2246,7 @@ void a_init(const char *name)
 
   /* --- Attempt to bind to the socket --- */
 
-  umask(0077);
+  omask = umask(0077);
 again:
   if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0)
     die(EXIT_FAILURE, "couldn't create socket: %s", strerror(errno));
@@ -2243,7 +2277,15 @@ again:
     close(fd);
     goto again;
   }
-  chmod(sun.sun_path, 0600);
+  if (chown(sun.sun_path, u, g)) {
+    die(EXIT_FAILURE, "failed to set socket owner: %s",
+	strerror(errno));
+  }
+  if (chmod(sun.sun_path, m)) {
+    die(EXIT_FAILURE, "failed to set socket permissions: %s",
+	strerror(errno));
+  }
+  umask(omask);
   fdflags(fd, O_NONBLOCK, O_NONBLOCK, FD_CLOEXEC, FD_CLOEXEC);
   if (listen(fd, 5))
     die(EXIT_FAILURE, "couldn't listen on socket: %s", strerror(errno));