X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/4d80373d26cd9ce5da4cbf5b0ddbf36650f25b11..92db088e5b292c1180a090ed369b9851e933e610:/lib/client.c diff --git a/lib/client.c b/lib/client.c index 0fdb8be..08d70e7 100644 --- a/lib/client.c +++ b/lib/client.c @@ -1,6 +1,6 @@ /* * This file is part of DisOrder. - * Copyright (C) 2004-2010 Richard Kettlewell + * Copyright (C) 2004-13 Richard Kettlewell * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,13 +25,25 @@ #include "common.h" #include -#include -#include -#include -#include +#if HAVE_SYS_SOCKET_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_SYS_UN_H +# include +#endif +#if HAVE_UNISTD_H +# include +#endif #include -#include -#include +#if HAVE_NETDB_H +# include +#endif +#if HAVE_PCRE_H +# include +#endif #include "log.h" #include "mem.h" @@ -50,7 +62,6 @@ #include "authhash.h" #include "client-common.h" #include "rights.h" -#include "trackdb.h" #include "kvp.h" /** @brief Client handle contents */ @@ -67,6 +78,8 @@ struct disorder_client { int verbose; /** @brief Last error string */ const char *last; + /** @brief Address family */ + int family; }; /** @brief Create a new client @@ -81,9 +94,15 @@ disorder_client *disorder_new(int verbose) { disorder_client *c = xmalloc(sizeof (struct disorder_client)); c->verbose = verbose; + c->family = -1; return c; } +/** @brief Return the address family used by this client */ +int disorder_client_af(disorder_client *c) { + return c->family; +} + /** @brief Read a response line * @param c Client * @param rp Where to store response, or NULL (UTF-8) @@ -151,12 +170,6 @@ static int check_response(disorder_client *c, char **rp) { } } -/** @brief Marker for a command body */ -static const char disorder_body[1]; - -/** @brief Marker for a list of args */ -static const char disorder_list[1]; - /** @brief Issue a command and parse a simple response * @param c Client * @param rp Where to store result, or NULL @@ -172,16 +185,23 @@ static const char disorder_list[1]; * NB that the response will NOT be converted to the local encoding * nor will quotes be stripped. See dequote(). * - * Put @ref disorder_body in the argument list followed by a char ** + * Put @ref disorder__body in the argument list followed by a char ** * and int giving the body to follow the command. If the int is @c -1 * then the list is assumed to be NULL-terminated. This may be used * only once. * - * Put @ref disorder_list in the argument list followed by a char ** + * Put @ref disorder__list in the argument list followed by a char ** * and int giving a list of arguments to include. If the int is @c -1 * then the list is assumed to be NULL-terminated. This may be used * any number of times. * + * Put @ref disorder__integer in the argument list followed by a long to + * send its value in decimal. This may be used any number of times. + * + * Put @ref disorder__time in the argument list followed by a time_t + * to send its value in decimal. This may be used any number of + * times. + * * Usually you would call this via one of the following interfaces: * - disorder_simple() */ @@ -204,11 +224,11 @@ static int disorder_simple_v(disorder_client *c, dynstr_init(&d); dynstr_append_string(&d, cmd); while((arg = va_arg(ap, const char *))) { - if(arg == disorder_body) { + if(arg == disorder__body) { body = va_arg(ap, char **); nbody = va_arg(ap, int); has_body = 1; - } else if(arg == disorder_list) { + } else if(arg == disorder__list) { char **list = va_arg(ap, char **); int nlist = va_arg(ap, int); if(nlist < 0) { @@ -219,6 +239,18 @@ static int disorder_simple_v(disorder_client *c, dynstr_append(&d, ' '); dynstr_append_string(&d, quoteutf8(arg)); } + } else if(arg == disorder__integer) { + long n = va_arg(ap, long); + char buffer[16]; + snprintf(buffer, sizeof buffer, "%ld", n); + dynstr_append(&d, ' '); + dynstr_append_string(&d, buffer); + } else if(arg == disorder__time) { + time_t n = va_arg(ap, time_t); + char buffer[16]; + snprintf(buffer, sizeof buffer, "%lld", (long long)n); + dynstr_append(&d, ' '); + dynstr_append_string(&d, buffer); } else { dynstr_append(&d, ' '); dynstr_append_string(&d, quoteutf8(arg)); @@ -285,6 +317,59 @@ static int disorder_simple(disorder_client *c, return ret; } +/** @brief Issue a command and split the response + * @param c Client + * @param vecp Where to store results + * @param nvecp Where to store count of results + * @param expected Expected count (or -1 to not check) + * @param cmd Command + * @return 0 on success, non-0 on error + * + * The remaining arguments are command arguments, terminated by (char + * *)0. They should be in UTF-8. + * + * 5xx responses count as errors. + * + * @p rp will NOT be filled in for xx9 responses (where it is just + * commentary for a command where it would normally be meaningful). + * + * NB that the response will NOT be converted to the local encoding + * nor will quotes be stripped. See dequote(). + */ +static int disorder_simple_split(disorder_client *c, + char ***vecp, + int *nvecp, + int expected, + const char *cmd, ...) { + va_list ap; + int ret; + char *r; + char **vec; + int nvec; + + va_start(ap, cmd); + ret = disorder_simple_v(c, &r, cmd, ap); + va_end(ap); + if(!ret) { + vec = split(r, &nvec, SPLIT_QUOTES, 0, 0); + xfree(r); + if(expected < 0 || nvec == expected) { + *vecp = vec; + *nvecp = nvec; + } else { + disorder_error(0, "malformed reply to %s", cmd); + c->last = "malformed reply"; + ret = -1; + free_strings(nvec, vec); + } + } + if(ret) { + *vecp = NULL; + *nvecp = 0; + } + return ret; +} + /** @brief Dequote a result string * @param rc 0 on success, non-0 on error * @param rp Where result string is stored (UTF-8) @@ -342,6 +427,7 @@ int disorder_connect_generic(struct config *conf, disorder_error(errno, "error calling socket"); return -1; } + c->family = sa->sa_family; if(connect(fd, sa, salen) < 0) { byte_xasprintf((char **)&c->last, "connect: %s", strerror(errno)); disorder_error(errno, "error calling connect"); @@ -455,13 +541,13 @@ int disorder_connect(disorder_client *c) { return -1; } password = config->password; - /* Maybe we can read the database */ - if(!password && trackdb_readable()) { - trackdb_init(TRACKDB_NO_RECOVER|TRACKDB_NO_UPGRADE); - trackdb_open(TRACKDB_READ_ONLY); - password = trackdb_get_password(username); - trackdb_close(); - } + /* If we're connecting as 'root' guess that we're the system root + * user (or the jukebox user), both of which can use the privileged + * socket. They can also furtle with the db directly: that is why + * privileged socket does not represent a privilege escalation. */ + if(!password + && !strcmp(username, "root")) + password = "anything will do for root"; if(!password) { /* Oh well */ c->last = "no password";