X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/a82111971280c0812976088072cd67a9752224a3..b50ba1bda8722c66c40005f43707ebc63515732b:/server/admin.c diff --git a/server/admin.c b/server/admin.c index 8a3e62ca..0432b8a0 100644 --- a/server/admin.c +++ b/server/admin.c @@ -68,7 +68,7 @@ static const trace_opt w_opts[] = { static admin *admins; static admin *a_dead; static sel_file sock; -static const char *sockname; +static const char *sockname = 0; static sym_table a_svcs; static unsigned flags = 0; static admin *a_stdin = 0; @@ -260,7 +260,9 @@ static void a_flush(int fd, unsigned mode, void *v) * * * "?PEER" PEER -- peer's name * - * * "?ERRNO" ERRNO -- system error code + * * "?ERR" CODE -- system error code + * + * * "?ERRNO" -- system error code from @errno@ * * * "[!]..." ... -- @dstr_putf@-like string as single token */ @@ -303,7 +305,11 @@ void a_vformat(dstr *d, const char *fmt, va_list *ap) while (*av) u_quotify(d, *av++); } else if (strcmp(fmt, "?PEER") == 0) u_quotify(d, p_name(va_arg(*ap, peer *))); - else if (strcmp(fmt, "?ERRNO") == 0) { + else if (strcmp(fmt, "?ERR") == 0) { + int e = va_arg(*ap, int); + dstr_putf(d, " E%d", e); + u_quotify(d, strerror(e)); + } else if (strcmp(fmt, "?ERRNO") == 0) { dstr_putf(d, " E%d", errno); u_quotify(d, strerror(errno)); } else @@ -547,24 +553,6 @@ void a_notify(const char *fmt, ...) va_end(ap); } -/* --- @a_quit@ --- * - * - * Arguments: --- - * - * Returns: --- - * - * Use: Shuts things down nicely. - */ - -void a_quit(void) -{ - close(sock.fd); - unlink(sockname); - FOREACH_PEER(p, { p_destroy(p); }); - ps_quit(); - exit(0); -} - /* --- @a_sigdie@ --- * * * Arguments: @int sig@ = signal number @@ -589,7 +577,7 @@ static void a_sigdie(int sig, void *v) break; } a_warn("SERVER", "quit", "signal", "%s", p, A_END); - a_quit(); + lp_end(); } /* --- @a_sighup@ --- * @@ -1233,7 +1221,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, { fam = "ANY"; af = AF_UNSPEC; i++; } else for (j = 0; j < NADDRFAM; j++) { if (mystrieq(av[i], aftab[j].name)) { - if (udpsock[j].fd < 0) { + if (udpsock[j].sf.fd < 0) { a_fail(a, "disabled-address-family", "%s", aftab[j].name, A_END); goto fail; } @@ -1286,7 +1274,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, aihint.ai_flags = AI_NUMERICHOST; if (!getaddrinfo(av[i], 0, &aihint, &ailist)) { for (ai = ailist; ai; ai = ai->ai_next) { - if ((j = afix(ai->ai_family)) >= 0 && udpsock[j].fd >= 0) + if ((j = afix(ai->ai_family)) >= 0 && udpsock[j].sf.fd >= 0) break; } if (!ai) { @@ -1315,7 +1303,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, #ifdef HAVE_LIBADNS qf = adns_qf_search; for (j = 0; j < NADDRFAM; j++) { - if ((af == AF_UNSPEC || af == aftab[i].af) && udpsock[j].fd >= 0) + if ((af == AF_UNSPEC || af == aftab[i].af) && udpsock[j].sf.fd >= 0) qf |= aftab[j].qf; } if ((err = adns_submit(ads, r->addr, adns_r_addr, qf, r, &r->q)) != 0) { @@ -1331,7 +1319,7 @@ static void a_resolve(admin *a, admin_resop *r, const char *tag, a_bgfail(&r->bg, "resolve-error", "%s", r->addr, A_END); goto fail_release; } - if (udpsock[AFIX_INET].fd < 0) { + if (udpsock[AFIX_INET].sf.fd < 0) { a_bgfail(&r->bg, "disabled-address-family", "INET", A_END); goto fail_release; } @@ -1421,6 +1409,7 @@ static void a_doadd(admin_resop *r, int rc) if (add->peer.tag) xfree(add->peer.tag); if (add->peer.privtag) xfree(add->peer.privtag); + if (add->peer.knock) xfree(add->peer.knock); xfree(add->peer.name); } @@ -1446,6 +1435,7 @@ static void acmd_add(admin *a, unsigned ac, char *av[]) add->peer.name = 0; add->peer.tag = 0; add->peer.privtag = 0; + add->peer.knock = 0; add->peer.t_ka = 0; add->peer.tops = tun_default; add->peer.f = 0; @@ -1469,15 +1459,21 @@ static void acmd_add(admin *a, unsigned ac, char *av[]) }) OPTTIME("-keepalive", t, { add->peer.t_ka = t; }) OPT("-cork", { add->peer.f |= KXF_CORK; }) + OPT("-ephemeral", { add->peer.f |= PSF_EPHEM; }) OPTARG("-key", arg, { if (add->peer.tag) xfree(add->peer.tag); add->peer.tag = xstrdup(arg); }) - OPT("-mobile", { add->peer.f |= PSF_MOBILE; }) + OPT("-mobile", { add->peer.f |= PSF_MOBILE | PSF_EPHEM; }) OPTARG("-priv", arg, { if (add->peer.privtag) xfree(add->peer.privtag); add->peer.privtag = xstrdup(arg); }) + OPTARG("-knock", arg, { + if (add->peer.knock) xfree(add->peer.knock); + add->peer.knock = xstrdup(arg); + add->peer.f |= PSF_EPHEM; + }) }); /* --- Make sure someone's not got there already --- */ @@ -1504,6 +1500,7 @@ 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); + if (add->peer.knock) xfree(add->peer.knock); xfree(add); return; } @@ -1861,16 +1858,16 @@ static void acmd_port(admin *a, unsigned ac, char *av[]) a_fail(a, "unknown-address-family", "%s", av[0], A_END); return; found: - if (udpsock[i].fd < 0) { + if (udpsock[i].sf.fd < 0) { a_fail(a, "disabled-address-family", "%s", aftab[i].name, A_END); return; } } else { for (i = 0; i < NADDRFAM; i++) - if (udpsock[i].fd >= 0) goto found; + if (udpsock[i].sf.fd >= 0) goto found; abort(); } - a_info(a, "%u", p_port(i), A_END); + a_info(a, "%u", udpsock[i].port, A_END); a_ok(a); } @@ -1982,7 +1979,7 @@ static void acmd_getchal(admin *a, unsigned ac, char *av[]) buf b; buf_init(&b, buf_i, PKBUFSZ); - c_new(&b); + c_new(0, 0, &b); a_info(a, "?B64", BBASE(&b), (size_t)BLEN(&b), A_END); a_ok(a); } @@ -1999,7 +1996,7 @@ static void acmd_checkchal(admin *a, unsigned ac, char *av[]) a_fail(a, "bad-base64", "%s", codec_strerror(err), A_END); else { buf_init(&b, d.buf, d.len); - if (c_check(&b) || BBAD(&b) || BLEFT(&b)) + if (c_check(0, 0, &b) || BBAD(&b) || BLEFT(&b)) a_fail(a, "invalid-challenge", A_END); else a_ok(a); @@ -2049,6 +2046,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); + if (ps->knock) a_info(a, "knock=%s", ps->knock, 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)"; @@ -2057,6 +2055,7 @@ static void acmd_peerinfo(admin *a, unsigned ac, char *av[]) a_info(a, "keepalive=%lu", ps->t_ka, A_END); a_info(a, "corked=%s", BOOL(p->kx.f&KXF_CORK), "mobile=%s", BOOL(ps->f&PSF_MOBILE), + "ephemeral=%s", BOOL(ps->f&PSF_EPHEM), A_END); a_ok(a); } @@ -2112,7 +2111,7 @@ static void acmd_kill(admin *a, unsigned ac, char *av[]) peer *p; if ((p = a_findpeer(a, av[0])) != 0) { - p_destroy(p); + p_destroy(p, 1); a_ok(a); } } @@ -2134,7 +2133,7 @@ static void acmd_quit(admin *a, unsigned ac, char *av[]) { a_warn("SERVER", "quit", "admin-request", A_END); a_ok(a); - a_quit(); + lp_end(); } static void acmd_version(admin *a, unsigned ac, char *av[]) @@ -2262,7 +2261,7 @@ static void a_destroypending(void) 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(); + lp_end(); } /* --- Abort any background jobs in progress --- */ @@ -2393,7 +2392,10 @@ static void a_line(char *p, size_t len, void *vp) * * Returns: --- * - * Use: Creates a new admin connection. + * Use: Creates a new admin connection. It's safe to call this + * before @a_init@ -- and, indeed, this makes sense if you also + * call @a_switcherr@ to report initialization errors through + * the administration machinery. */ void a_create(int fd_in, int fd_out, unsigned f) @@ -2471,7 +2473,7 @@ void a_preselect(void) { if (a_dead) a_destroypending(); } void a_daemon(void) { flags |= F_DAEMON; } -/* --- @a_init@ --- * +/* --- @a_listen@ --- * * * Arguments: @const char *name@ = socket name to create * @uid_t u@ = user to own the socket @@ -2483,27 +2485,21 @@ void a_daemon(void) { flags |= F_DAEMON; } * Use: Creates the admin listening socket. */ -void a_init(const char *name, uid_t u, gid_t g, mode_t m) +void a_listen(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; -#ifdef HAVE_LIBADNS - int err; -#endif - - /* --- Create services table --- */ - - sym_create(&a_svcs); /* --- Set up the socket address --- */ sz = strlen(name) + 1; - if (sz > sizeof(sun.sun_path)) - die(EXIT_FAILURE, "socket name `%s' too long", name); + if (sz > sizeof(sun.sun_path)) { + a_warn("ADMIN", "admin-socket", "%s", name, "name-too-long", A_END); + exit(EXIT_FAILURE); + } BURN(sun); sun.sun_family = AF_UNIX; memcpy(sun.sun_path, name, sz); @@ -2513,69 +2509,128 @@ void a_init(const char *name, uid_t u, gid_t g, mode_t m) omask = umask(0077); again: - if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) - die(EXIT_FAILURE, "couldn't create socket: %s", strerror(errno)); + if ((fd = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "create-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); + } if (bind(fd, (struct sockaddr *)&sun, sz) < 0) { struct stat st; int e = errno; if (errno != EADDRINUSE) { - die(EXIT_FAILURE, "couldn't bind to address `%s': %s", - sun.sun_path, strerror(e)); + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "bind-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); + } + if (!n) { + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "too-many-retries", A_END); + exit(EXIT_FAILURE); } - if (!n) - die(EXIT_FAILURE, "too many retries; giving up"); n--; if (!connect(fd, (struct sockaddr *)&sun, sz)) { - die(EXIT_FAILURE, "server already listening on admin socket `%s'", - sun.sun_path); + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "already-in-use", A_END); + exit(EXIT_FAILURE); + } + if (errno != ECONNREFUSED) { + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "bind-failed", "?ERR", e, A_END); + exit(EXIT_FAILURE); } - if (errno != ECONNREFUSED) - die(EXIT_FAILURE, "couldn't bind to address: %s", strerror(e)); if (stat(sun.sun_path, &st)) { - die(EXIT_FAILURE, "couldn't stat `%s': %s", - sun.sun_path, strerror(errno)); + if (errno == ENOENT) { close(fd); goto again; } + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "stat-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); + } + if (!S_ISSOCK(st.st_mode)) { + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "not-a-socket", A_END); + exit(EXIT_FAILURE); } - if (!S_ISSOCK(st.st_mode)) - die(EXIT_FAILURE, "object `%s' isn't a socket", sun.sun_path); T( trace(T_ADMIN, "admin: stale socket found; removing it"); ) unlink(sun.sun_path); close(fd); goto again; } if (chown(sun.sun_path, u, g)) { - die(EXIT_FAILURE, "failed to set socket owner: %s", - strerror(errno)); + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "chown-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); } if (chmod(sun.sun_path, m)) { - die(EXIT_FAILURE, "failed to set socket permissions: %s", - strerror(errno)); + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "chmod-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); } 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)); + if (listen(fd, 5)) { + a_warn("ADMIN", "admin-socket", "%s", sun.sun_path, + "listen-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); + } /* --- Listen to the socket --- */ sel_initfile(&sel, &sock, fd, SEL_READ, a_accept, 0); sel_addfile(&sock); sockname = name; -#ifdef HAVE_LIBADNS - if ((err = adns_init(&ads, - (adns_if_permit_ipv4 | adns_if_permit_ipv6 | - adns_if_noserverwarn | adns_if_nosigpipe | - adns_if_noautosys), - 0)) != 0) - die(EXIT_FAILURE, "failed to initialize ADNS: %s", strerror(errno)); - sel_addhook(&sel, &hook, before_select, after_select, 0); -#else - bres_init(&sel); -#endif +} + +/* --- @a_unlisten@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Stops listening to the administration socket and removes it. + */ + +void a_unlisten(void) +{ + if (!sockname) return; + sel_rmfile(&sock); + unlink(sockname); + close(sock.fd); +} + +/* --- @a_switcherr@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Arrange to report warnings, trace messages, etc. to + * administration clients rather than the standard-error stream. + * + * Obviously this makes no sense unless there is at least one + * client established. Calling @a_listen@ won't help with this, + * because the earliest a new client can connect is during the + * first select-loop iteration, which is too late: some initial + * client must have been added manually using @a_create@. + */ + +void a_switcherr(void) +{ T( trace_custom(a_trace, 0); trace(T_ADMIN, "admin: enabled custom tracing"); ) flags |= F_INIT; +} + +/* --- @a_signals@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Establishes handlers for the obvious signals. + */ - /* --- Set up signal handlers --- */ +void a_signals(void) +{ + struct sigaction sa; sig_add(&s_term, SIGTERM, a_sigdie, 0); sig_add(&s_hup, SIGHUP, a_sighup, 0); @@ -2584,4 +2639,40 @@ again: sig_add(&s_int, SIGINT, a_sigdie, 0); } +/* --- @a_init@ --- * + * + * Arguments: --- + * + * Returns: --- + * + * Use: Creates the admin listening socket. + */ + +void a_init(void) +{ +#ifdef HAVE_LIBADNS + int err; +#endif + + /* --- Create services table --- */ + + sym_create(&a_svcs); + + /* --- Prepare the background name resolver --- */ + +#ifdef HAVE_LIBADNS + if ((err = adns_init(&ads, + (adns_if_permit_ipv4 | adns_if_permit_ipv6 | + adns_if_noserverwarn | adns_if_nosigpipe | + adns_if_noautosys), + 0)) != 0) { + a_warn("ADMIN", "adns-init-failed", "?ERRNO", A_END); + exit(EXIT_FAILURE); + } + sel_addhook(&sel, &hook, before_select, after_select, 0); +#else + bres_init(&sel); +#endif +} + /*----- That's all, folks -------------------------------------------------*/