X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=2a0376e4dbcdfa4a54a6427457912564c77408c1;hb=6bcfac5f53de9dff2f646da360b7da1a6e3aa7c1;hp=5c07a5b45e29a9182ad62ed9fe54330443912195;hpb=34b03028378025ad22c8d29f70e81109cee690c2;p=onak.git diff --git a/onak.c b/onak.c index 5c07a5b..2a0376e 100644 --- a/onak.c +++ b/onak.c @@ -6,6 +6,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: onak.c,v 1.21 2004/05/27 21:58:18 noodles Exp $ */ #include @@ -14,36 +16,17 @@ #include #include "armor.h" +#include "charfuncs.h" #include "keydb.h" #include "keyid.h" #include "keyindex.h" #include "keystructs.h" +#include "log.h" #include "mem.h" #include "merge.h" #include "onak-conf.h" #include "parsekey.h" - -int stdin_getchar(void *ctx, size_t count, unsigned char *c) -{ - int ic; - - do { - ic = getchar(); - *c = ic; - c++; - } while ((ic != EOF) && (--count > 0)); - return (ic == EOF); -} - -int stdout_putchar(void *ctx, size_t count, unsigned char *c) -{ - int i; - - for (i = 0; i < count; i++) { - putchar(c[i]); - } - return 0; -} +#include "photoid.h" void find_keys(char *search, uint64_t keyid, bool ishex, bool fingerprint, bool exact, bool verbose) @@ -74,8 +57,11 @@ void usage(void) { puts("Usage:\n"); puts("\tonak [options] \n"); puts("\tCommands:\n"); - puts("\tadd - read armored OpenPGP keys from stdin and add to the keyserver"); + puts("\tadd - read armored OpenPGP keys from stdin and add to the" + " keyserver"); puts("\tdelete - delete a given key from the keyserver"); + puts("\tdump - dump all the keys from the keyserver to a file or" + " files\n\t starting keydump*"); puts("\tget - retrieves the key requested from the keyserver"); puts("\tindex - search for a key and list it"); puts("\tvindex - search for a key and list it and its signatures"); @@ -86,7 +72,9 @@ int main(int argc, char *argv[]) struct openpgp_packet_list *packets = NULL; struct openpgp_packet_list *list_end = NULL; struct openpgp_publickey *keys = NULL; + char *configfile = NULL; int rc = EXIT_SUCCESS; + int result = 0; char *search = NULL; char *end = NULL; uint64_t keyid = 0; @@ -94,44 +82,58 @@ int main(int argc, char *argv[]) bool verbose = false; bool update = false; bool binary = false; + bool fingerprint = false; int optchar; - - while ((optchar = getopt(argc, argv, "buv")) != -1 ) { + while ((optchar = getopt(argc, argv, "bc:fuv")) != -1 ) { switch (optchar) { case 'b': binary = true; break; + case 'c': + configfile = strdup(optarg); + break; + case 'f': + fingerprint = true; + break; case 'u': update = true; break; case 'v': verbose = true; + setlogthreshold(LOGTHING_INFO); break; } } - readconfig(); + readconfig(configfile); + initlogthing("onak", config.logfile); if ((argc - optind) < 1) { usage(); + } else if (!strcmp("dump", argv[optind])) { + initdb(true); + dumpdb("keydump"); + cleanupdb(); } else if (!strcmp("add", argv[optind])) { if (binary) { - read_openpgp_stream(stdin_getchar, NULL, &packets); + result = read_openpgp_stream(stdin_getchar, NULL, + &packets, 0); + logthing(LOGTHING_INFO, + "read_openpgp_stream: %d", result); } else { dearmor_openpgp_stream(stdin_getchar, NULL, &packets); } if (packets != NULL) { - parse_keys(packets, &keys); + result = parse_keys(packets, &keys); free_packet_list(packets); packets = NULL; - if (verbose) { - fprintf(stderr, "Finished reading keys.\n"); - } - - initdb(); - fprintf(stderr, "Got %d new keys.\n", - update_keys(&keys, verbose)); + logthing(LOGTHING_INFO, "Finished reading %d keys.", + result); + + initdb(false); + logthing(LOGTHING_NOTICE, "Got %d new keys.", + update_keys(&keys)); if (keys != NULL && update) { flatten_publickey(keys, &packets, @@ -145,7 +147,7 @@ int main(int argc, char *argv[]) cleanupdb(); } else { rc = 1; - fprintf(stderr, "No keys read.\n"); + logthing(LOGTHING_NOTICE, "No keys read."); } if (keys != NULL) { @@ -153,7 +155,7 @@ int main(int argc, char *argv[]) keys = NULL; } else { rc = 1; - fprintf(stderr, "No changes.\n"); + logthing(LOGTHING_NOTICE, "No changes."); } } else if ((argc - optind) == 2) { search = argv[optind+1]; @@ -165,21 +167,44 @@ int main(int argc, char *argv[]) ishex = true; } } - initdb(); + initdb(false); if (!strcmp("index", argv[optind])) { - find_keys(search, keyid, ishex, false, false, false); + find_keys(search, keyid, ishex, fingerprint, + false, false); } else if (!strcmp("vindex", argv[optind])) { - find_keys(search, keyid, ishex, false, false, true); + find_keys(search, keyid, ishex, fingerprint, + false, 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 (fetch_key(keyid, &keys, false)) { + unsigned char *photo = NULL; + size_t length = 0; + + if (getphoto(keys, 0, &photo, &length)) { + fwrite(photo, + 1, + length, + stdout); + } + free_publickey(keys); + keys = NULL; + } else { + puts("Key not found"); + } } else if (!strcmp("delete", argv[optind])) { delete_key(getfullkeyid(keyid), false); } else if (!strcmp("get", argv[optind])) { - if (fetch_key(keyid, &keys, false)) { - if (verbose) { - fprintf(stderr, "Got key.\n"); - } + if (!ishex) { + puts("Can't get a key on uid text." + " You must supply a keyid."); + } else if (fetch_key(keyid, &keys, false)) { + logthing(LOGTHING_INFO, "Got key."); flatten_publickey(keys, &packets, &list_end); + free_publickey(keys); armor_openpgp_stream(stdout_putchar, NULL, packets); @@ -194,6 +219,7 @@ int main(int argc, char *argv[]) usage(); } + cleanuplogthing(); cleanupconfig(); return rc;