cscvs to tla changeset 62

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 7b0f2f3beec4d4cb28e0cb5d0cdac6493be18f81..311b44f9b16d9e67a741d04d7666280886e851e1 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -10,13 +10,18 @@
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>
+#include <unistd.h>

 
 #include "armor.h"
 #include "keydb.h"
 #include "keyid.h"
 
 #include "armor.h"
 #include "keydb.h"
 #include "keyid.h"

+#include "keyindex.h"

 #include "keystructs.h"
 #include "keystructs.h"

+#include "log.h"

 #include "mem.h"
 #include "merge.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)
 #include "parsekey.h"
 
 int stdin_getchar(void *ctx, size_t count, unsigned char *c)


@@ -31,11 +36,52 @@ int stdin_getchar(void *ctx, size_t count, unsigned char *c)
        return (ic == EOF);
 }
 
        return (ic == EOF);
 }
 

-int stdout_putchar(void *ctx, unsigned char c)
+int stdout_putchar(void *ctx, size_t count, unsigned char *c)

 {
 {

-       return (putchar(c));
+       int i;
+
+       for (i = 0; i < count; i++) {
+               putchar(c[i]);
+       }
+       return 0;

 }
 
 }
 

+void find_keys(char *search, uint64_t keyid, bool ishex,
+               bool fingerprint, bool exact, bool verbose)
+{
+       struct openpgp_publickey *publickey = NULL;
+       int count = 0;
+
+       if (ishex) {
+               count = fetch_key(keyid, &publickey, false);
+       } else {
+               count = fetch_key_text(search, &publickey);
+       }
+       if (publickey != NULL) {
+               key_index(publickey, verbose, fingerprint, false);
+               free_publickey(publickey);
+       } else if (count == 0) {
+               puts("Key not found.");
+       } else {
+               printf("Found %d keys, but maximum number to return is %d.\n",
+                               count,
+                               config.maxkeys);
+               puts("Try again with a more specific search.");
+       }
+}
+
+void usage(void) {
+       puts("onak " VERSION " - an OpenPGP keyserver.\n");
+       puts("Usage:\n");
+       puts("\tonak [options] <command> <parameters>\n");
+       puts("\tCommands:\n");
+       puts("\tadd    - read armored OpenPGP keys from stdin and add to the"
+               " keyserver");
+       puts("\tdelete - delete a given key from the keyserver");
+       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");
+}

 
 int main(int argc, char *argv[])
 {
 
 int main(int argc, char *argv[])
 {


@@ -43,29 +89,127 @@ int main(int argc, char *argv[])
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_publickey        *keys = NULL;
        int                              rc = EXIT_SUCCESS;
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_publickey        *keys = NULL;
        int                              rc = EXIT_SUCCESS;

+       int                              result = 0;
+       char                            *search = NULL;
+       char                            *end = NULL;
+       uint64_t                         keyid = 0;
+       bool                             ishex = false;
+       bool                             verbose = false;
+       bool                             update = false;
+       bool                             binary = false;
+       bool                             fingerprint = false;
+       int                              optchar;
+
+       while ((optchar = getopt(argc, argv, "bfuv")) != -1 ) {
+               switch (optchar) {
+               case 'b': 
+                       binary = true;
+                       break;
+               case 'f': 
+                       fingerprint = true;
+                       break;
+               case 'u': 
+                       update = true;
+                       break;
+               case 'v': 
+                       verbose = true;
+                       setlogthreshold(LOGTHING_INFO);
+                       break;
+               }
+       }

 
 

-       read_openpgp_stream(stdin_getchar, NULL, &packets);
-       if (packets != NULL) {
-               parse_keys(packets, &keys);
-               free_packet_list(packets);
-               packets = NULL;
+       readconfig();
+       initlogthing("onak", config.logfile);

 
 

+       if ((argc - optind) < 1) {
+               usage();
+       } else if (!strcmp("dump", argv[optind])) {

                initdb();
                initdb();

-               fprintf(stderr, "Got %d new keys.\n",
-                               update_keys(&keys));
+               dumpdb("keydump");

                cleanupdb();
                cleanupdb();

-       } else {
-               rc = 1;
-               fprintf(stderr, "No keys read.\n");
-       }
+       } else if (!strcmp("add", argv[optind])) {
+               if (binary) {
+                       result = read_openpgp_stream(stdin_getchar, NULL,
+                                &packets);
+                       logthing(LOGTHING_INFO,
+                                       "read_openpgp_stream: %d", result);
+               } else {
+                       dearmor_openpgp_stream(stdin_getchar, NULL, &packets);
+               }
+               if (packets != NULL) {
+                       result = parse_keys(packets, &keys);
+                       free_packet_list(packets);
+                       packets = NULL;
+                       logthing(LOGTHING_INFO, "Finished reading %d keys.",
+                                       result);

 
 

-       if (keys != NULL) {
-               free_publickey(keys);
-               keys = NULL;
+                       initdb();
+                       logthing(LOGTHING_NOTICE, "Got %d new keys.",
+                                       update_keys(&keys));
+                       if (keys != NULL && update) {
+                               flatten_publickey(keys,
+                                       &packets,
+                                       &list_end);
+                               armor_openpgp_stream(stdout_putchar,
+                                       NULL,
+                                       packets);
+                               free_packet_list(packets);
+                               packets = NULL;
+                       }
+                       cleanupdb();
+               } else {
+                       rc = 1;
+                       logthing(LOGTHING_NOTICE, "No keys read.");
+               }
+
+               if (keys != NULL) {
+                       free_publickey(keys);
+                       keys = NULL;
+               } else {
+                       rc = 1;
+                       logthing(LOGTHING_NOTICE, "No changes.");
+               }
+       } else if ((argc - optind) == 2) {
+               search = argv[optind+1];
+               if (search != NULL) {
+                       keyid = strtoul(search, &end, 16);
+                       if (*search != 0 &&
+                                       end != NULL &&
+                                       *end == 0) {
+                               ishex = true;
+                       }
+               }
+               initdb();
+               if (!strcmp("index", argv[optind])) {
+                       find_keys(search, keyid, ishex, fingerprint,
+                                       false, false);
+               } else if (!strcmp("vindex", argv[optind])) {
+                       find_keys(search, keyid, ishex, fingerprint,
+                                       false, true);
+               } else if (!strcmp("delete", argv[optind])) {
+                       delete_key(getfullkeyid(keyid), false);
+               } else if (!strcmp("get", argv[optind])) {
+                       if (fetch_key(keyid, &keys, false)) {
+                               logthing(LOGTHING_INFO, "Got key.");
+                               flatten_publickey(keys,
+                                               &packets,
+                                               &list_end);
+                               armor_openpgp_stream(stdout_putchar,
+                                               NULL,
+                                               packets);
+                               free_packet_list(packets);
+                               packets = NULL;
+                       } else {
+                               puts("Key not found");
+                       }
+               }
+               cleanupdb();

        } else {
        } else {

-               rc = 1;
-               fprintf(stderr, "No changes.\n");
+               usage();

        }
 
        }
 

+       cleanuplogthing();
+       cleanupconfig();
+

        return rc;
 }
        return rc;
 }