X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/5b3f77c7fbafb036d20a1577ed74f475e94ed821..03ac5c0515ce60eb416b574fbe8594469122b515:/keyd.c diff --git a/keyd.c b/keyd.c index d6abd32..5d5b7ba 100644 --- a/keyd.c +++ b/keyd.c @@ -2,17 +2,22 @@ * keyd.c - key retrieval daemon * * Jonathan McDowell - * + * * Copyright 2004 Project Purple */ +#include #include +#include +#include #include #include #include +#include #include #include #include +#include #include #include "charfuncs.h" @@ -25,6 +30,35 @@ #include "mem.h" #include "onak-conf.h" #include "parsekey.h" +#include "version.h" + +static struct keyd_stats *stats; + +void daemonize(void) +{ + pid_t pid; + + pid = fork(); + + if (pid < 0) { + logthing(LOGTHING_CRITICAL, + "Failed to fork into background: %d (%s)", + errno, + strerror(errno)); + exit(EXIT_FAILURE); + } else if (pid > 0) { + logthing(LOGTHING_INFO, "Backgrounded as pid %d.", pid); + exit(EXIT_SUCCESS); + } + + pid = setsid(); + + freopen("/dev/null", "r", stdin); + freopen("/dev/null", "w", stdout); + freopen("/dev/null", "w", stderr); + + return; +} void iteratefunc(void *ctx, struct openpgp_publickey *key) { @@ -32,7 +66,7 @@ void iteratefunc(void *ctx, struct openpgp_publickey *key) struct openpgp_packet_list *list_end = NULL; struct buffer_ctx storebuf; int ret = 0; - int fd = (int) ctx; + int *fd = (int *) ctx; if (key != NULL) { storebuf.offset = 0; @@ -40,7 +74,7 @@ void iteratefunc(void *ctx, struct openpgp_publickey *key) storebuf.buffer = malloc(8192); logthing(LOGTHING_TRACE, - "Iterating over 0x%016llX.", + "Iterating over 0x%016" PRIX64 ".", get_keyid(key)); flatten_publickey(key, @@ -52,10 +86,10 @@ void iteratefunc(void *ctx, struct openpgp_publickey *key) logthing(LOGTHING_TRACE, "Sending %d bytes.", storebuf.offset); - ret = write(fd, &storebuf.offset, + ret = write(*fd, &storebuf.offset, sizeof(storebuf.offset)); if (ret != 0) { - write(fd, storebuf.buffer, + write(*fd, storebuf.buffer, storebuf.offset); } @@ -96,7 +130,7 @@ int sock_init(const char *sockname) int sock_do(int fd) { - int cmd = KEYD_CMD_UNKNOWN; + uint32_t cmd = KEYD_CMD_UNKNOWN; ssize_t bytes = 0; ssize_t count = 0; int ret = 0; @@ -119,10 +153,17 @@ int sock_do(int fd) } if (ret == 0) { + if (cmd < KEYD_CMD_LAST) { + stats->command_stats[cmd]++; + } else { + stats->command_stats[KEYD_CMD_UNKNOWN]++; + } switch (cmd) { case KEYD_CMD_VERSION: cmd = KEYD_REPLY_OK; write(fd, &cmd, sizeof(cmd)); + cmd = sizeof(keyd_version); + write(fd, &cmd, sizeof(cmd)); write(fd, &keyd_version, sizeof(keyd_version)); break; case KEYD_CMD_GET: @@ -135,7 +176,8 @@ int sock_do(int fd) storebuf.offset = 0; if (ret == 0) { logthing(LOGTHING_INFO, - "Fetching 0x%llX, result: %d", + "Fetching 0x%" PRIX64 + ", result: %d", keyid, config.dbbackend-> fetch_key(keyid, &key, false)); @@ -265,7 +307,8 @@ int sock_do(int fd) } if (ret == 0) { logthing(LOGTHING_INFO, - "Deleting 0x%llX, result: %d", + "Deleting 0x%" PRIX64 + ", result: %d", keyid, config.dbbackend->delete_key( keyid, false)); @@ -280,6 +323,8 @@ int sock_do(int fd) } if (ret == 0) { keyid = config.dbbackend->getfullkeyid(keyid); + cmd = sizeof(keyid); + write(fd, &cmd, sizeof(cmd)); write(fd, &keyid, sizeof(keyid)); } break; @@ -287,16 +332,31 @@ int sock_do(int fd) cmd = KEYD_REPLY_OK; write(fd, &cmd, sizeof(cmd)); config.dbbackend->iterate_keys(iteratefunc, - (void *) fd); + &fd); bytes = 0; write(fd, &bytes, sizeof(bytes)); break; case KEYD_CMD_CLOSE: + cmd = KEYD_REPLY_OK; + write(fd, &cmd, sizeof(cmd)); ret = 1; break; case KEYD_CMD_QUIT: + cmd = KEYD_REPLY_OK; + write(fd, &cmd, sizeof(cmd)); + logthing(LOGTHING_NOTICE, + "Exiting due to quit request."); + ret = 1; trytocleanup(); break; + case KEYD_CMD_STATS: + cmd = KEYD_REPLY_OK; + write(fd, &cmd, sizeof(cmd)); + cmd = sizeof(*stats); + write(fd, &cmd, sizeof(cmd)); + write(fd, stats, + sizeof(*stats)); + break; default: logthing(LOGTHING_ERROR, "Got unknown command: %d", cmd); @@ -310,7 +370,8 @@ int sock_do(int fd) int sock_close(int fd) { - return shutdown(fd, SHUT_RDWR); + shutdown(fd, SHUT_RDWR); + return close(fd); } int sock_accept(int fd) @@ -327,6 +388,7 @@ int sock_accept(int fd) } if (ret != -1) { + stats->connects++; while (!sock_do(srv)) ; sock_close(srv); } @@ -334,17 +396,65 @@ int sock_accept(int fd) return 1; } +static void usage(void) +{ + puts("keyd " ONAK_VERSION " - backend key serving daemon for the " + "onak PGP keyserver.\n"); + puts("Usage:\n"); + puts("\tkeyd [options]\n"); + puts("\tOptions:\n:"); + puts("-c - use as the config file"); + puts("-f - run in the foreground"); + puts("-h - show this help text"); + exit(EXIT_FAILURE); +} + int main(int argc, char *argv[]) { int fd = -1; fd_set rfds; char sockname[1024]; + char *configfile = NULL; + bool foreground = false; + int optchar; + + while ((optchar = getopt(argc, argv, "c:fh")) != -1 ) { + switch (optchar) { + case 'c': + configfile = strdup(optarg); + break; + case 'f': + foreground = true; + break; + case 'h': + default: + usage(); + break; + } + } - readconfig(NULL); + readconfig(configfile); + free(configfile); + configfile = NULL; initlogthing("keyd", config.logfile); + config.use_keyd = false; + + if (!foreground) { + daemonize(); + } catchsignals(); - + signal(SIGPIPE, SIG_IGN); + + + stats = calloc(1, sizeof(*stats)); + if (!stats) { + logthing(LOGTHING_ERROR, + "Couldn't allocate memory for stats structure."); + exit(EXIT_FAILURE); + } + stats->started = time(NULL); + snprintf(sockname, 1023, "%s/%s", config.db_dir, KEYD_SOCKET); fd = sock_init(sockname); @@ -365,8 +475,10 @@ int main(int argc, char *argv[]) unlink(sockname); } + free(stats); + cleanuplogthing(); cleanupconfig(); - + return(EXIT_SUCCESS); }