Document our test keys

[onak.git] / lookup.c

diff --git a/lookup.c b/lookup.c
index 71c27c3357f32e27806fd0be668a8c5d244b7a3b..e5cd1ae8e79f452cbd91169ba46db992cede62fd 100644 (file)
--- a/lookup.c
+++ b/lookup.c
@@ -4,8 +4,6 @@
  * 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 <inttypes.h>
  */
 
 #include <inttypes.h>


@@ -16,6 +14,10 @@
 #include <unistd.h>
 
 #include "armor.h"
 #include <unistd.h>
 
 #include "armor.h"

+#include "charfuncs.h"
+#include "cleankey.h"
+#include "cleanup.h"
+#include "config.h"

 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"
 #include "getcgi.h"
 #include "keydb.h"
 #include "keyindex.h"


@@ -23,16 +25,13 @@
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "mem.h"
 #include "onak-conf.h"
 #include "parsekey.h"

+#include "photoid.h"

 
 #define OP_UNKNOWN 0
 #define OP_GET     1
 #define OP_INDEX   2
 #define OP_VINDEX  3
 
 #define OP_UNKNOWN 0
 #define OP_GET     1
 #define OP_INDEX   2
 #define OP_VINDEX  3

-
-int putnextchar(void *ctx, size_t count, unsigned char *c)
-{
-       return printf("%.*s", (int) count, c);
-}
+#define OP_PHOTO   4

 
 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose, bool mrhkp)
 
 void find_keys(char *search, uint64_t keyid, bool ishex,
                bool fingerprint, bool exact, bool verbose, bool mrhkp)


@@ -77,6 +76,7 @@ int main(int argc, char *argv[])
        char **params = NULL;
        int op = OP_UNKNOWN;
        int i;
        char **params = NULL;
        int op = OP_UNKNOWN;
        int i;

+       int indx = 0;

        bool fingerprint = false;
        bool exact = false;
        bool ishex = false;
        bool fingerprint = false;
        bool exact = false;
        bool ishex = false;


@@ -97,18 +97,22 @@ int main(int argc, char *argv[])
                                op = OP_INDEX;
                        } else if (!strcmp(params[i+1], "vindex")) {
                                op = OP_VINDEX;
                                op = OP_INDEX;
                        } else if (!strcmp(params[i+1], "vindex")) {
                                op = OP_VINDEX;

+                       } else if (!strcmp(params[i+1], "photo")) {
+                               op = OP_PHOTO;

                        }
                } else if (!strcmp(params[i], "search")) {
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {
                        }
                } else if (!strcmp(params[i], "search")) {
                        search = params[i+1];
                        params[i+1] = NULL;
                        if (search != NULL) {

-                               keyid = strtoul(search, &end, 16);
+                               keyid = strtoull(search, &end, 16);

                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {
                                        ishex = true;
                                }
                        }
                                if (*search != 0 &&
                                                end != NULL &&
                                                *end == 0) {
                                        ishex = true;
                                }
                        }

+               } else if (!strcmp(params[i], "idx")) {
+                       indx = atoi(params[i+1]);

                } else if (!strcmp(params[i], "fingerprint")) {
                        if (!strcmp(params[i+1], "on")) {
                                fingerprint = true;
                } else if (!strcmp(params[i], "fingerprint")) {
                        if (!strcmp(params[i+1], "on")) {
                                fingerprint = true;


@@ -141,6 +145,8 @@ int main(int argc, char *argv[])
 
        if (mrhkp) {
                puts("Content-Type: text/plain\n");
 
        if (mrhkp) {
                puts("Content-Type: text/plain\n");

+       } else if (op == OP_PHOTO) {
+               puts("Content-Type: image/jpeg\n");

        } else {
                start_html("Lookup of key");
        }
        } else {
                start_html("Lookup of key");
        }


@@ -150,21 +156,27 @@ int main(int argc, char *argv[])
        } else if (search == NULL) {
                puts("Error: No key to search for supplied.");
        } else {
        } else if (search == NULL) {
                puts("Error: No key to search for supplied.");
        } else {

-               readconfig();
+               readconfig(NULL);

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

-               initdb();
+               catchsignals();
+               initdb(true);

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

+                       logthing(LOGTHING_NOTICE, "Getting keyid 0x%llX",
+                                       keyid);

                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");
                        if (fetch_key(keyid, &publickey, false)) {
                                puts("<pre>");

+                               cleankeys(publickey);

                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);
                                flatten_publickey(publickey,
                                                        &packets,
                                                        &list_end);

-                               armor_openpgp_stream(putnextchar,
+                               armor_openpgp_stream(stdout_putchar,

                                                NULL,
                                                packets);
                                puts("</pre>");
                        } else {
                                                NULL,
                                                packets);
                                puts("</pre>");
                        } else {

+                               logthing(LOGTHING_NOTICE,
+                                       "Failed to fetch key.");

                                puts("Key not found");
                        }
                        break;
                                puts("Key not found");
                        }
                        break;


@@ -176,6 +188,21 @@ int main(int argc, char *argv[])
                        find_keys(search, keyid, ishex, fingerprint, exact,
                                        true, mrhkp);
                        break;
                        find_keys(search, keyid, ishex, fingerprint, exact,
                                        true, mrhkp);
                        break;

+               case OP_PHOTO:
+                       if (fetch_key(keyid, &publickey, false)) {
+                               unsigned char *photo = NULL;
+                               size_t         length = 0;
+
+                               if (getphoto(publickey, 0, &photo, &length)) {
+                                       fwrite(photo,
+                                                       1,
+                                                       length,
+                                                       stdout);
+                               }
+                               free_publickey(publickey);
+                               publickey = NULL;
+                       }
+                       break;

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


@@ -185,7 +212,8 @@ int main(int argc, char *argv[])
        }
        if (!mrhkp) {
                puts("<hr>");
        }
        if (!mrhkp) {
                puts("<hr>");

-               puts("Produced by onak " VERSION " by Jonathan McDowell");
+               puts("Produced by onak " PACKAGE_VERSION 
+                               " by Jonathan McDowell");

                end_html();
        }
 
                end_html();
        }