exit(EXIT_SUCCESS);
}
- pid = setsid();
+ if (setsid() == -1) {
+ logthing(LOGTHING_CRITICAL,
+ "Couldn't set process group leader: %d (%s)",
+ errno,
+ strerror(errno));
+ exit(EXIT_FAILURE);
+ }
- freopen("/dev/null", "r", stdin);
- freopen("/dev/null", "w", stdout);
- freopen("/dev/null", "w", stderr);
+ if (!freopen("/dev/null", "r", stdin)) {
+ logthing(LOGTHING_CRITICAL,
+ "Couldn't reopen stdin to NULL: %d (%s)",
+ errno,
+ strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ if (!freopen("/dev/null", "w", stdout)) {
+ logthing(LOGTHING_CRITICAL,
+ "Couldn't reopen stdout to NULL: %d (%s)",
+ errno,
+ strerror(errno));
+ exit(EXIT_FAILURE);
+ }
+ if (!freopen("/dev/null", "w", stderr)) {
+ logthing(LOGTHING_CRITICAL,
+ "Couldn't reopen stderr to NULL: %d (%s)",
+ errno,
+ strerror(errno));
+ exit(EXIT_FAILURE);
+ }
return;
}
if (ret != -1) {
ret = listen(fd, 5);
+ if (ret == -1) {
+ close(fd);
+ fd = -1;
+ }
}
-
+
return fd;
}
-int sock_do(int fd)
+int sock_do(struct onak_dbctx *dbctx, int fd)
{
uint32_t cmd = KEYD_CMD_UNKNOWN;
ssize_t bytes = 0;
struct openpgp_packet_list *list_end = NULL;
struct buffer_ctx storebuf;
struct skshash hash;
+ struct openpgp_fingerprint fingerprint;
/*
* Get the command from the client.
write(fd, &cmd, sizeof(cmd));
write(fd, &keyd_version, sizeof(keyd_version));
break;
- case KEYD_CMD_GET:
+ case KEYD_CMD_GET_ID:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
bytes = read(fd, &keyid, sizeof(keyid));
"Fetching 0x%" PRIX64
", result: %d",
keyid,
- config.dbbackend->
- fetch_key(keyid, &key, false));
+ dbctx->fetch_key_id(dbctx,
+ keyid,
+ &key, false));
+ if (key != NULL) {
+ storebuf.size = 8192;
+ storebuf.buffer = malloc(8192);
+
+ flatten_publickey(key,
+ &packets,
+ &list_end);
+ write_openpgp_stream(buffer_putchar,
+ &storebuf,
+ packets);
+ logthing(LOGTHING_TRACE,
+ "Sending %d bytes.",
+ storebuf.offset);
+ write(fd, &storebuf.offset,
+ sizeof(storebuf.offset));
+ write(fd, storebuf.buffer,
+ storebuf.offset);
+
+ free(storebuf.buffer);
+ storebuf.buffer = NULL;
+ storebuf.size = storebuf.offset = 0;
+ free_packet_list(packets);
+ packets = list_end = NULL;
+ free_publickey(key);
+ key = NULL;
+ } else {
+ write(fd, &storebuf.offset,
+ sizeof(storebuf.offset));
+ }
+ }
+ break;
+ case KEYD_CMD_GET_FP:
+ cmd = KEYD_REPLY_OK;
+ write(fd, &cmd, sizeof(cmd));
+ read(fd, &bytes, 1);
+ if (bytes > MAX_FINGERPRINT_LEN) {
+ ret = 1;
+ } else {
+ fingerprint.length = bytes;
+ read(fd, fingerprint.fp, bytes);
+ }
+ storebuf.offset = 0;
+ if (ret == 0) {
+ logthing(LOGTHING_INFO,
+ "Fetching by fingerprint"
+ ", result: %d",
+ dbctx->fetch_key_fp(dbctx,
+ &fingerprint,
+ &key, false));
if (key != NULL) {
storebuf.size = 8192;
storebuf.buffer = malloc(8192);
}
}
break;
- case KEYD_CMD_GETTEXT:
+
+ case KEYD_CMD_GET_TEXT:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
bytes = read(fd, &count, sizeof(count));
logthing(LOGTHING_INFO,
"Fetching %s, result: %d",
search,
- config.dbbackend->
- fetch_key_text(search, &key));
+ dbctx->fetch_key_text(dbctx,
+ search, &key));
if (key != NULL) {
storebuf.size = 8192;
storebuf.buffer = malloc(8192);
&packets,
0);
parse_keys(packets, &key);
- config.dbbackend->store_key(key, false, false);
+ dbctx->store_key(dbctx, key, false, false);
free_packet_list(packets);
packets = NULL;
free_publickey(key);
"Deleting 0x%" PRIX64
", result: %d",
keyid,
- config.dbbackend->delete_key(
+ dbctx->delete_key(dbctx,
keyid, false));
}
break;
ret = 1;
}
if (ret == 0) {
- keyid = config.dbbackend->getfullkeyid(keyid);
+ keyid = dbctx->getfullkeyid(dbctx, keyid);
cmd = sizeof(keyid);
write(fd, &cmd, sizeof(cmd));
write(fd, &keyid, sizeof(keyid));
case KEYD_CMD_KEYITER:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
- config.dbbackend->iterate_keys(iteratefunc,
+ dbctx->iterate_keys(dbctx, iteratefunc,
&fd);
bytes = 0;
write(fd, &bytes, sizeof(bytes));
write(fd, stats,
sizeof(*stats));
break;
- case KEYD_CMD_GETSKSHASH:
+ case KEYD_CMD_GET_SKSHASH:
cmd = KEYD_REPLY_OK;
write(fd, &cmd, sizeof(cmd));
bytes = read(fd, hash.hash, sizeof(hash.hash));
logthing(LOGTHING_INFO,
"Fetching by hash"
", result: %d",
- config.dbbackend->
- fetch_key_skshash(&hash,
- &key));
+ dbctx->fetch_key_skshash(dbctx,
+ &hash, &key));
if (key != NULL) {
storebuf.size = 8192;
storebuf.buffer = malloc(8192);
char *configfile = NULL;
bool foreground = false;
int optchar;
+ struct onak_dbctx *dbctx;
while ((optchar = getopt(argc, argv, "c:fh")) != -1 ) {
switch (optchar) {
case 'c':
+ if (configfile != NULL) {
+ free(configfile);
+ }
configfile = strdup(optarg);
break;
case 'f':
maxfd = fd;
memset(clients, -1, sizeof (clients));
- config.dbbackend->initdb(false);
+ dbctx = config.dbinit(false);
logthing(LOGTHING_NOTICE, "Accepting connections.");
while (!cleanup() && select(maxfd + 1, &rfds, NULL, NULL, NULL) != -1) {
FD_ISSET(clients[i], &rfds)) {
logthing(LOGTHING_DEBUG,
"Handling connection for client %d.", i);
- if (sock_do(clients[i])) {
+ if (sock_do(dbctx, clients[i])) {
sock_close(clients[i]);
clients[i] = -1;
logthing(LOGTHING_DEBUG,
}
}
}
- config.dbbackend->cleanupdb();
+ dbctx->cleanupdb(dbctx);
sock_close(fd);
unlink(sockname);
}