cscvs to tla changeset 91

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 3c55a61f1f2e6022fa1a699b38da197aacab1a09..71c27c3357f32e27806fd0be668a8c5d244b7a3b 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -4,21 +4,24 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple

+ *
+ * $Id: lookup.c,v 1.10 2003/06/07 13:45:34 noodles Exp $

  */
 
  */
 

-//#include <stdint.h>

 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>

+#include <string.h>

 #include <unistd.h>
 
 #include "armor.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
 #include <unistd.h>
 
 #include "armor.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"

+#include "log.h"

 #include "mem.h"
 #include "mem.h"

-#include "onak_conf.h"
+#include "onak-conf.h"

 #include "parsekey.h"
 
 #define OP_UNKNOWN 0
 #include "parsekey.h"
 
 #define OP_UNKNOWN 0


@@ -26,32 +29,46 @@
 #define OP_INDEX   2
 #define OP_VINDEX  3
 
 #define OP_INDEX   2
 #define OP_VINDEX  3
 

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

 {
 {

-        return putchar(c);
+       return printf("%.*s", (int) count, c);

 }
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
 }
 
 void find_keys(char *search, uint64_t keyid, bool ishex,

-               bool fingerprint, bool exact, bool verbose)
+               bool fingerprint, bool exact, bool verbose, bool mrhkp)

 {
        struct openpgp_publickey *publickey = NULL;
        int count = 0;
 
        if (ishex) {
 {
        struct openpgp_publickey *publickey = NULL;
        int count = 0;
 
        if (ishex) {

-               count = fetch_key(keyid, &publickey);
+               count = fetch_key(keyid, &publickey, false);

        } else {
                count = fetch_key_text(search, &publickey);
        }
        if (publickey != NULL) {
        } else {
                count = fetch_key_text(search, &publickey);
        }
        if (publickey != NULL) {

-               key_index(publickey, verbose, fingerprint, true);
+               if (mrhkp) {
+                       printf("info:1:%d\n", count);
+                       mrkey_index(publickey);
+               } else {
+                       key_index(publickey, verbose, fingerprint, true);
+               }

                free_publickey(publickey);
        } else if (count == 0) {
                free_publickey(publickey);
        } else if (count == 0) {

-               puts("Key not found.");
+               if (mrhkp) {
+                       puts("info:1:0");
+               } else {
+                       puts("Key not found.");
+               }

        } else {
        } else {

-               printf("Found %d keys, but maximum number to return is %d.\n",
+               if (mrhkp) {
+                       puts("info:1:0");
+               } else {
+                       printf("Found %d keys, but maximum number to return"
+                               " is %d.\n",

                                count,
                                config.maxkeys);
                                count,
                                config.maxkeys);

-               puts("Try again with a more specific search.");
+                       puts("Try again with a more specific search.");
+               }

        }
 }
 
        }
 }
 


@@ -63,6 +80,7 @@ int main(int argc, char *argv[])
        bool fingerprint = false;
        bool exact = false;
        bool ishex = false;
        bool fingerprint = false;
        bool exact = false;
        bool ishex = false;

+       bool mrhkp = false;

        uint64_t keyid = 0;
        char *search = NULL;
        char *end = NULL;
        uint64_t keyid = 0;
        char *search = NULL;
        char *end = NULL;


@@ -82,6 +100,7 @@ int main(int argc, char *argv[])
                        }
                } else if (!strcmp(params[i], "search")) {
                        search = params[i+1];
                        }
                } else if (!strcmp(params[i], "search")) {
                        search = params[i+1];

+                       params[i+1] = NULL;

                        if (search != NULL) {
                                keyid = strtoul(search, &end, 16);
                                if (*search != 0 &&
                        if (search != NULL) {
                                keyid = strtoul(search, &end, 16);
                                if (*search != 0 &&


@@ -98,24 +117,45 @@ int main(int argc, char *argv[])
                        if (!strcmp(params[i+1], "on")) {
                                exact = true;
                        }
                        if (!strcmp(params[i+1], "on")) {
                                exact = true;
                        }

+               } else if (!strcmp(params[i], "options")) {
+                       /*
+                        * TODO: We should be smarter about this; options may
+                        * have several entries. For now mr is the only valid
+                        * one though.
+                        */
+                       if (!strcmp(params[i+1], "mr")) {
+                               mrhkp = true;
+                       }
+               }
+               free(params[i]);
+               params[i] = NULL;
+               if (params[i+1] != NULL) {
+                       free(params[i+1]);
+                       params[i+1] = NULL;

                }
        }
                }
        }

+       if (params != NULL) {
+               free(params);
+               params = NULL;
+       }

 
 

-//     puts("HTTP/1.0 200 OK");
-//     puts("Server: onak 0.0.1");
-       puts("Content-Type: text/html\n");
-       puts("<html>\n<title>Lookup of key</title>");
-       puts("<body>");
+       if (mrhkp) {
+               puts("Content-Type: text/plain\n");
+       } else {
+               start_html("Lookup of key");
+       }

 
        if (op == OP_UNKNOWN) {
                puts("Error: No operation supplied.");
        } else if (search == NULL) {
                puts("Error: No key to search for supplied.");
        } else {
 
        if (op == OP_UNKNOWN) {
                puts("Error: No operation supplied.");
        } else if (search == NULL) {
                puts("Error: No key to search for supplied.");
        } else {

+               readconfig();
+               initlogthing("lookup", config.logfile);

                initdb();
                switch (op) {
                case OP_GET:
                initdb();
                switch (op) {
                case OP_GET:

-                       if (fetch_key(keyid, &publickey)) {
+                       if (fetch_key(keyid, &publickey, false)) {

                                puts("<pre>");
                                flatten_publickey(publickey,
                                                        &packets,
                                puts("<pre>");
                                flatten_publickey(publickey,
                                                        &packets,


@@ -130,19 +170,29 @@ int main(int argc, char *argv[])
                        break;
                case OP_INDEX:
                        find_keys(search, keyid, ishex, fingerprint, exact,
                        break;
                case OP_INDEX:
                        find_keys(search, keyid, ishex, fingerprint, exact,

-                                       false);
+                                       false, mrhkp);

                        break;
                case OP_VINDEX:
                        find_keys(search, keyid, ishex, fingerprint, exact,
                        break;
                case OP_VINDEX:
                        find_keys(search, keyid, ishex, fingerprint, exact,

-                                       true);
+                                       true, mrhkp);

                        break;
                default:
                        puts("Unknown operation!");
                }
                cleanupdb();
                        break;
                default:
                        puts("Unknown operation!");
                }
                cleanupdb();

+               cleanuplogthing();
+               cleanupconfig();
+       }
+       if (!mrhkp) {
+               puts("<hr>");
+               puts("Produced by onak " VERSION " by Jonathan McDowell");
+               end_html();
+       }
+
+       if (search != NULL) {
+               free(search);
+               search = NULL;

        }
        }

-       puts("<hr>");
-       puts("Produced by onak " VERSION " by Jonathan McDowell");
-       puts("</body>\n</html>");
+       

        return (EXIT_SUCCESS);
 }
        return (EXIT_SUCCESS);
 }