X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/165efde7f48706c6b4680aa537b3467e70d6a11d..46401b81fe5fab9b0d3d3a5f5764bafa3f9c0b86:/server/admin.c diff --git a/server/admin.c b/server/admin.c index 55ed82b3..8eb5ec3c 100644 --- a/server/admin.c +++ b/server/admin.c @@ -1,6 +1,4 @@ /* -*-c-*- - * - * $Id$ * * Admin interface for configuration * @@ -42,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" }, @@ -72,6 +71,7 @@ static sig s_term, s_int, s_hup; #define F_DAEMON 1u #define F_INIT 2u +#define F_FOREGROUND 4u #define T_RESOLVE SEC(30) #define T_PING SEC(5) @@ -239,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) { @@ -501,12 +519,10 @@ void a_notify(const char *fmt, ...) void a_quit(void) { - peer *p; - close(sock.fd); unlink(sockname); - while ((p = p_first()) != 0) - p_destroy(p); + FOREACH_PEER(p, { p_destroy(p); }); + ps_quit(); exit(0); } @@ -1066,7 +1082,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, r->sa.sin.sin_family = AF_INET; r->sasz = sizeof(r->sa.sin); r->addr = xstrdup(av[i]); - if (!av[i + i]) + if (!av[i + 1]) pt = TRIPE_PORT; else { pt = strtoul(av[i + 1], &p, 0); @@ -1179,7 +1195,9 @@ static void a_doadd(admin_resop *r, int rc) if (rc == ARES_OK) { add->peer.sasz = add->r.sasz; add->peer.sa = add->r.sa; - if (p_find(add->peer.name)) + if (p_findbyaddr(&add->r.sa)) + a_bgfail(&add->r.bg, "peer-addr-exists", "?ADDR", &add->r.sa, A_END); + else if (p_find(add->peer.name)) a_bgfail(&add->r.bg, "peer-exists", "%s", add->peer.name, A_END); else if (!p_create(&add->peer)) a_bgfail(&add->r.bg, "peer-create-fail", "%s", add->peer.name, A_END); @@ -1187,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); } @@ -1210,8 +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; /* --- Parse options --- */ @@ -1231,6 +1252,12 @@ 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; }) + OPTARG("-key", arg, { + if (add->peer.tag) + xfree(add->peer.tag); + add->peer.tag = xstrdup(arg); + }) }); /* --- Make sure someone's not got there already --- */ @@ -1255,6 +1282,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; } @@ -1646,12 +1674,37 @@ static void acmd_bgcancel(admin *a, unsigned ac, char *av[]) } } -static void acmd_list(admin *a, unsigned ac, char *av[]) +static void acmd_algs(admin *a, unsigned ac, char *av[]) { - peer *p; + a_info(a, + "kx-group=%s", gg->ops->name, + "kx-group-order-bits=%lu", (unsigned long)mp_bits(gg->r), + "kx-group-elt-bits=%lu", (unsigned long)gg->nbits, + A_END); + a_info(a, + "hash=%s", algs.h->name, + "mgf=%s", algs.mgf->name, + "hash-sz=%lu", (unsigned long)algs.h->hashsz, + A_END); + a_info(a, + "cipher=%s", algs.c->name, + "cipher-keysz=%lu", (unsigned long)algs.cksz, + "cipher-blksz=%lu", (unsigned long)algs.c->blksz, + A_END); + a_info(a, + "cipher-data-limit=%lu", (unsigned long)algs.expsz, + A_END); + a_info(a, + "mac=%s", algs.m->name, + "mac-keysz=%lu", (unsigned long)algs.mksz, + "mac-tagsz=%lu", (unsigned long)algs.tagsz, + A_END); + a_ok(a); +} - for (p = p_first(); p; p = p_next(p)) - a_info(a, "%s", p_name(p), A_END); +static void acmd_list(admin *a, unsigned ac, char *av[]) +{ + FOREACH_PEER(p, { a_info(a, "%s", p_name(p), A_END); }); a_ok(a); } @@ -1740,6 +1793,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); } @@ -1849,6 +1903,7 @@ static void acmd_help(admin */*a*/, unsigned /*ac*/, char */*av*/[]); static const acmd acmdtab[] = { { "add", "[OPTIONS] PEER ADDR ...", 2, 0xffff, acmd_add }, { "addr", "PEER", 1, 1, acmd_addr }, + { "algs", 0, 0, 0, acmd_algs }, { "bgcancel", "TAG", 1, 1, acmd_bgcancel }, { "checkchal", "CHAL", 1, 1, acmd_checkchal }, { "daemon", 0, 0, 0, acmd_daemon }, @@ -1916,53 +1971,66 @@ static void acmd_help(admin *a, unsigned ac, char *av[]) static void a_destroypending(void) { - admin *a, *aa; + admin *a, *aa, *head; admin_bgop *bg, *bbg; admin_service *svc, *ssvc; - /* --- Destroy connections marked as pending --- */ + /* --- Destroy connections marked as pending --- * + * + * Slightly messy. Killing clients may cause others to finally die. Make + * sure that they can be put on the list without clobbering anything or + * getting lost. + */ - for (a = a_dead; a; a = aa) { - aa = a->next; - assert(a->f & AF_DEAD); + while (a_dead) { + head = a_dead; + a_dead = 0; + for (a = head; a; a = aa) { + aa = a->next; + assert(a->f & AF_DEAD); - /* --- Report what we're doing --- */ + /* --- Report what we're doing --- */ - T( trace(T_ADMIN, "admin: completing destruction of connection %u", - a->seq); ) + T( trace(T_ADMIN, "admin: completing destruction of connection %u", + a->seq); ) - /* --- Abort any background jobs in progress --- */ + /* --- If this is the foreground client then shut down --- */ - for (bg = a->bg; bg; bg = bbg) { - bbg = bg->next; - bg->cancel(bg); - if (bg->tag) xfree(bg->tag); - xfree(bg); - } + if (a->f & AF_FOREGROUND) { + T( trace(T_ADMIN, "admin: foreground client quit: shutting down"); ) + a_warn("SERVER", "quit", "foreground-eof", A_END); + a_quit(); + } - /* --- Release services I hold, and abort pending jobs --- */ + /* --- Abort any background jobs in progress --- */ - for (svc = a->svcs; svc; svc = ssvc) { - ssvc = svc->next; - a_svcrelease(svc); - } - a_jobtablefinal(&a->j); + for (bg = a->bg; bg; bg = bbg) { + bbg = bg->next; + bg->cancel(bg); + if (bg->tag) xfree(bg->tag); + xfree(bg); + } - /* --- Close file descriptors and selectory --- */ + /* --- Release services I hold, and abort pending jobs --- */ - selbuf_destroy(&a->b); - if (a->b.reader.fd != a->w.fd) close(a->b.reader.fd); - close(a->w.fd); - if (a_stdin == a) a_stdin = 0; + for (svc = a->svcs; svc; svc = ssvc) { + ssvc = svc->next; + a_svcrelease(svc); + } + a_jobtablefinal(&a->j); - /* --- Done --- */ + /* --- Close file descriptors and selectory --- */ - DESTROY(a); - } + selbuf_destroy(&a->b); + if (a->b.reader.fd != a->w.fd) close(a->b.reader.fd); + close(a->w.fd); + if (a_stdin == a) a_stdin = 0; - /* --- All pending destruction completed --- */ + /* --- Done --- */ - a_dead = 0; + DESTROY(a); + } + } } /* --- @a_destroy@ --- * @@ -2020,7 +2088,7 @@ static void a_line(char *p, size_t len, void *vp) { admin *a = vp; const acmd *c; - char *av[16]; + char *av[16 + 1]; size_t ac; TIMER; @@ -2035,9 +2103,10 @@ static void a_line(char *p, size_t len, void *vp) } return; } - ac = str_qsplit(p, av, 16, 0, STRF_QUOTE); + ac = str_qsplit(p, av, N(av) - 1, 0, STRF_QUOTE); if (!ac) return; + av[ac] = 0; for (c = acmdtab; c->name; c++) { if (mystrieq(av[0], c->name)) { ac--; @@ -2142,19 +2211,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 --- */ @@ -2172,7 +2245,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)); @@ -2203,7 +2276,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));