X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/7f73baaff6c35768a1357c4b102b1aed51fd78d8..2d4998c45fa47fbc8084dcc4471a2e71e3eeb635:/server/admin.c diff --git a/server/admin.c b/server/admin.c index 5509de07..487010e1 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" }, @@ -265,7 +266,7 @@ void a_vformat(dstr *d, const char *fmt, va_list ap) 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) { @@ -312,6 +313,26 @@ void a_vformat(dstr *d, const char *fmt, va_list ap) dstr_destroy(&dd); } +/* --- @a_format@ --- * + * + * Arguments: @dstr *d@ = where to leave the formatted message + * @const char *fmt@ = pointer to format string + * + * Returns: --- + * + * Use: Writes a tokenized message into a string, for later + * presentation. + */ + +void a_format(dstr *d, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + a_vformat(d, fmt, ap); + va_end(ap); +} + /* --- @a_write@, @a_vwrite@ --- * * * Arguments: @admin *a@ = admin connection to write to @@ -521,6 +542,7 @@ void a_quit(void) close(sock.fd); unlink(sockname); FOREACH_PEER(p, { p_destroy(p); }); + ps_quit(); exit(0); } @@ -1203,6 +1225,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); } @@ -1226,9 +1249,11 @@ static void acmd_add(admin *a, unsigned ac, char *av[]) add = xmalloc(sizeof(*add)); add->peer.name = 0; + add->peer.tag = 0; + add->peer.privtag = 0; add->peer.t_ka = 0; add->peer.tops = tun_default; - add->peer.kxf = 0; + add->peer.f = 0; /* --- Parse options --- */ @@ -1248,7 +1273,18 @@ 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; }) + OPTARG("-priv", arg, { + if (add->peer.privtag) + xfree(add->peer.privtag); + add->peer.privtag = xstrdup(arg); + }) }); /* --- Make sure someone's not got there already --- */ @@ -1273,6 +1309,8 @@ 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); + if (add->peer.privtag) xfree(add->peer.privtag); xfree(add); return; } @@ -1664,6 +1702,48 @@ static void acmd_bgcancel(admin *a, unsigned ac, char *av[]) } } +static void acmd_algs(admin *a, unsigned ac, char *av[]) +{ + peer *p; + const kdata *kd; + const group *g; + const algswitch *algs; + + if (!ac) + kd = master; + else { + if ((p = a_findpeer(a, av[0])) == 0) return; + kd = p->kx.kpriv; + } + g = kd->g; + algs = &kd->algs; + + a_info(a, + "kx-group=%s", g->ops->name, + "kx-group-order-bits=%lu", (unsigned long)mp_bits(g->r), + "kx-group-elt-bits=%lu", (unsigned long)g->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); +} + static void acmd_list(admin *a, unsigned ac, char *av[]) { FOREACH_PEER(p, { a_info(a, "%s", p_name(p), A_END); }); @@ -1751,10 +1831,16 @@ static void acmd_peerinfo(admin *a, unsigned ac, char *av[]) { peer *p; const peerspec *ps; + const char *ptag; 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), + "current-key=%s", p->kx.kpub->tag, A_END); + if ((ptag = p_privtag(p)) == 0) ptag = "(default)"; + a_info(a, "private-key=%s", ptag, + "current-private-key=%s", p->kx.kpriv->tag, A_END); a_info(a, "keepalive=%lu", ps->t_ka, A_END); a_ok(a); } @@ -1864,6 +1950,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", "[PEER]", 0, 1, acmd_algs }, { "bgcancel", "TAG", 1, 1, acmd_bgcancel }, { "checkchal", "CHAL", 1, 1, acmd_checkchal }, { "daemon", 0, 0, 0, acmd_daemon }, @@ -2173,19 +2260,21 @@ void a_daemon(void) { flags |= F_DAEMON; } * 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, uid_t u, gid_t g) +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 --- */ @@ -2203,7 +2292,7 @@ void a_init(const char *name, uid_t u, gid_t g) /* --- 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)); @@ -2234,12 +2323,15 @@ again: close(fd); goto again; } - chmod(sun.sun_path, 0600); if (chown(sun.sun_path, u, g)) { - T( trace(T_ADMIN, - "admin: failed to give away socket: %s", - strerror(errno)); ) + 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));