*
* This is the main swiss army knife binary.
*
- * Jonathan McDowell <noodles@earth.li>
- *
- * Copyright 2002 Project Purple
+ * Copyright 2002 Jonathan McDowell <noodles@earth.li>
+ *
+ * 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 the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include <fcntl.h>
#include <sys/stat.h>
#include <unistd.h>
+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
#include "cleanup.h"
-#include "config.h"
#include "keydb.h"
#include "keyid.h"
#include "keyindex.h"
#include "parsekey.h"
#include "photoid.h"
-void find_keys(char *search, uint64_t keyid, bool ishex,
- bool fingerprint, bool exact, bool verbose)
+void find_keys(struct onak_dbctx *dbctx,
+ char *search, uint64_t keyid,
+ struct openpgp_fingerprint *fingerprint,
+ bool ishex, bool isfp, bool dispfp, bool skshash,
+ bool exact, bool verbose)
{
struct openpgp_publickey *publickey = NULL;
int count = 0;
if (ishex) {
- count = config.dbbackend->fetch_key(keyid, &publickey, false);
+ count = dbctx->fetch_key_id(dbctx, keyid, &publickey,
+ false);
+ } else if (isfp && exact) {
+ count = dbctx->fetch_key(dbctx, fingerprint,
+ &publickey, false);
+ } else if (isfp && !exact) {
+ count = dbctx->fetch_key_fp(dbctx, fingerprint,
+ &publickey, false);
} else {
- count = config.dbbackend->fetch_key_text(search, &publickey);
+ count = dbctx->fetch_key_text(dbctx, search, &publickey);
}
if (publickey != NULL) {
- key_index(publickey, verbose, fingerprint, false);
+ key_index(dbctx, publickey, verbose, dispfp, skshash,
+ false);
free_publickey(publickey);
} else if (count == 0) {
puts("Key not found.");
}
}
+/**
+ * @brief Context for the keyserver dumping function
+ */
struct dump_ctx {
+ /** Keys we've dumped so far to this file */
int count;
+ /** Maximum keys to dump per file */
int maxcount;
+ /** File descriptor for the current dump file */
int fd;
+ /** Number of the current dump file */
int filenum;
+ /** Base filename to use for dump files */
char *filebase;
};
state = (struct dump_ctx *) ctx;
- if (state->fd == -1 || state->count > state->maxcount) {
+ if (state->fd == -1 || state->count++ > state->maxcount) {
if (state->fd != -1) {
close(state->fd);
state->fd = -1;
return;
}
+static uint8_t hex2bin(char c)
+{
+ if (c >= '0' && c <= '9') {
+ return (c - '0');
+ } else if (c >= 'a' && c <= 'f') {
+ return (c - 'a' + 10);
+ } else if (c >= 'A' && c <= 'F') {
+ return (c - 'A' + 10);
+ }
+
+ return 255;
+}
+
void usage(void) {
- puts("onak " PACKAGE_VERSION " - an OpenPGP keyserver.\n");
+ puts("onak " ONAK_VERSION " - an OpenPGP keyserver.\n");
puts("Usage:\n");
puts("\tonak [options] <command> <parameters>\n");
puts("\tCommands:\n");
puts("\tgetphoto - retrieves the first photoid on the given key and"
" dumps to\n\t stdout");
puts("\tindex - search for a key and list it");
+ puts("\treindex - retrieve and re-store a key in the backend db");
puts("\tvindex - search for a key and list it and its signatures");
}
char *search = NULL;
char *end = NULL;
uint64_t keyid = 0;
+ int i;
+ bool exact = false;
bool ishex = false;
- bool verbose = false;
+ bool isfp = false;
bool update = false;
bool binary = false;
- bool fingerprint = false;
+ bool dispfp = false;
+ bool skshash = false;
int optchar;
struct dump_ctx dumpstate;
+ struct skshash hash;
+ struct onak_dbctx *dbctx;
+ struct openpgp_fingerprint fingerprint;
- while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) {
+ while ((optchar = getopt(argc, argv, "bc:efsuv")) != -1 ) {
switch (optchar) {
case 'b':
binary = true;
case 'c':
configfile = strdup(optarg);
break;
+ case 'e':
+ exact = true;
+ break;
case 'f':
- fingerprint = true;
+ dispfp = true;
+ break;
+ case 's':
+ skshash = true;
break;
case 'u':
update = true;
break;
case 'v':
- verbose = true;
setlogthreshold(LOGTHING_INFO);
break;
}
if ((argc - optind) < 1) {
usage();
} else if (!strcmp("dump", argv[optind])) {
- config.dbbackend->initdb(true);
+ dbctx = config.dbinit(config.backend, true);
dumpstate.count = dumpstate.filenum = 0;
- dumpstate.maxcount = 1000000;
+ dumpstate.maxcount = 100000;
dumpstate.fd = -1;
dumpstate.filebase = "keydump.%d.pgp";
- config.dbbackend->iterate_keys(dump_func, &dumpstate);
+ dbctx->iterate_keys(dbctx, dump_func, &dumpstate);
if (dumpstate.fd != -1) {
close(dumpstate.fd);
dumpstate.fd = -1;
}
- config.dbbackend->cleanupdb();
+ dbctx->cleanupdb(dbctx);
} else if (!strcmp("add", argv[optind])) {
if (binary) {
result = read_openpgp_stream(stdin_getchar, NULL,
logthing(LOGTHING_INFO, "Finished reading %d keys.",
result);
- result = cleankeys(keys);
+ dbctx = config.dbinit(config.backend, false);
+ result = cleankeys(dbctx, &keys,
+ config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
- config.dbbackend->initdb(false);
logthing(LOGTHING_NOTICE, "Got %d new keys.",
- config.dbbackend->update_keys(&keys,
- false));
+ dbctx->update_keys(dbctx, &keys,
+ &config.blacklist,
+ (config.clean_policies &
+ ONAK_CLEAN_UPDATE_ONLY),
+ false));
if (keys != NULL && update) {
flatten_publickey(keys,
&packets,
free_packet_list(packets);
packets = NULL;
}
- config.dbbackend->cleanupdb();
+ dbctx->cleanupdb(dbctx);
} else {
rc = 1;
logthing(LOGTHING_NOTICE, "No keys read.");
logthing(LOGTHING_NOTICE, "No changes.");
}
} else if (!strcmp("clean", argv[optind])) {
+ dbctx = config.dbinit(config.backend, true);
if (binary) {
result = read_openpgp_stream(stdin_getchar, NULL,
&packets, 0);
result);
if (keys != NULL) {
- result = cleankeys(keys);
+ result = cleankeys(dbctx, &keys,
+ config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
free_publickey(keys);
keys = NULL;
}
+ dbctx->cleanupdb(dbctx);
+ } else if (!strcmp("dumpconfig", argv[optind])) {
+ if ((argc - optind) == 2) {
+ writeconfig(argv[optind + 1]);
+ } else {
+ /* Dump config to stdout */
+ writeconfig(NULL);
+ }
} else if ((argc - optind) == 2) {
search = argv[optind+1];
- if (search != NULL) {
- keyid = strtoul(search, &end, 16);
+ if (search != NULL && strlen(search) == 42 &&
+ search[0] == '0' && search[1] == 'x') {
+ /* v4 fingerprint */
+ fingerprint.length = 20;
+ for (i = 0; i < 20; i++) {
+ fingerprint.fp[i] =
+ (hex2bin(search[2 + i * 2]) << 4) +
+ hex2bin(search[3 + i * 2]);
+ }
+ isfp = true;
+ } else if (search != NULL && strlen(search) == 66 &&
+ search[0] == '0' && search[1] == 'x') {
+ /* v5 fingerprint */
+ fingerprint.length = 32;
+ for (i = 0; i < 32; i++) {
+ fingerprint.fp[i] =
+ (hex2bin(search[2 + i * 2]) << 4) +
+ hex2bin(search[3 + i * 2]);
+ }
+ isfp = true;
+ } else if (search != NULL) {
+ keyid = strtouq(search, &end, 16);
if (*search != 0 &&
end != NULL &&
*end == 0) {
ishex = true;
}
}
- config.dbbackend->initdb(false);
+ dbctx = config.dbinit(config.backend, false);
if (!strcmp("index", argv[optind])) {
- find_keys(search, keyid, ishex, fingerprint,
- false, false);
+ find_keys(dbctx, search, keyid, &fingerprint, ishex,
+ isfp, dispfp, skshash,
+ exact, false);
} else if (!strcmp("vindex", argv[optind])) {
- find_keys(search, keyid, ishex, fingerprint,
- false, true);
+ find_keys(dbctx, search, keyid, &fingerprint, ishex,
+ isfp, dispfp, skshash,
+ exact, true);
} else if (!strcmp("getphoto", argv[optind])) {
if (!ishex) {
puts("Can't get a key on uid text."
" You must supply a keyid.");
- } else if (config.dbbackend->fetch_key(keyid, &keys,
+ } else if (dbctx->fetch_key_id(dbctx, keyid, &keys,
false)) {
unsigned char *photo = NULL;
size_t length = 0;
- if (getphoto(keys, 0, &photo, &length)) {
+ if (getphoto(keys, 0, &photo,
+ &length) == ONAK_E_OK) {
fwrite(photo,
1,
length,
puts("Key not found");
}
} else if (!strcmp("delete", argv[optind])) {
- config.dbbackend->delete_key(
- config.dbbackend->getfullkeyid(keyid),
- false);
+ if (!isfp) {
+ if (dbctx->fetch_key_id(dbctx, keyid, &keys,
+ false)) {
+ get_fingerprint(keys->publickey,
+ &fingerprint);
+ dbctx->delete_key(dbctx, &fingerprint,
+ false);
+ free_publickey(keys);
+ keys = NULL;
+ }
+ } else
+ dbctx->delete_key(dbctx, &fingerprint, false);
} else if (!strcmp("get", argv[optind])) {
- if (!ishex) {
+ if (!(ishex || isfp)) {
puts("Can't get a key on uid text."
- " You must supply a keyid.");
- } else if (config.dbbackend->fetch_key(keyid, &keys,
- false)) {
+ " You must supply a keyid / "
+ "fingerprint.");
+ } else if ((isfp &&
+ dbctx->fetch_key_fp(dbctx,
+ &fingerprint,
+ &keys, false)) ||
+ (ishex &&
+ dbctx->fetch_key_id(dbctx, keyid,
+ &keys, false))) {
+ logthing(LOGTHING_INFO, "Got key.");
+ flatten_publickey(keys,
+ &packets,
+ &list_end);
+ free_publickey(keys);
+ if (binary) {
+ write_openpgp_stream(stdout_putchar,
+ NULL,
+ packets);
+ } else {
+ armor_openpgp_stream(stdout_putchar,
+ NULL,
+ packets);
+ }
+ free_packet_list(packets);
+ packets = NULL;
+ } else {
+ puts("Key not found");
+ }
+ } else if (!strcmp("hget", argv[optind])) {
+ if (!parse_skshash(search, &hash)) {
+ puts("Couldn't parse sks hash.");
+ } else if (dbctx->fetch_key_skshash(dbctx, &hash,
+ &keys)) {
logthing(LOGTHING_INFO, "Got key.");
flatten_publickey(keys,
&packets,
} else {
puts("Key not found");
}
+ } else if (!strcmp("reindex", argv[optind])) {
+ dbctx->starttrans(dbctx);
+ if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
+ get_fingerprint(keys->publickey, &fingerprint);
+ dbctx->delete_key(dbctx, &fingerprint, true);
+ cleankeys(dbctx, &keys, config.clean_policies);
+ dbctx->store_key(dbctx, keys, true, false);
+ } else {
+ puts("Key not found");
+ }
+ dbctx->endtrans(dbctx);
}
- config.dbbackend->cleanupdb();
+ dbctx->cleanupdb(dbctx);
} else {
usage();
}
cleanuplogthing();
cleanupconfig();
+ free(configfile);
return rc;
}