X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0f4971d043c38bae1bfb95201622a1405110f899..f5037a4a370b891e14971228c1d491184c7fe8bd:/gpgwww.c?ds=sidebyside

diff --git a/gpgwww.c b/gpgwww.c
index ad864f1..7d90a00 100644
--- a/gpgwww.c
+++ b/gpgwww.c
@@ -4,25 +4,33 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2001-2002 Project Purple.
- *
- * $Id: gpgwww.c,v 1.10 2003/06/04 20:57:08 noodles Exp $
  */
 
-// #include <stdint.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "armor.h"
+#include "charfuncs.h"
+#include "cleanup.h"
+#include "config.h"
 #include "getcgi.h"
 #include "hash.h"
 #include "keydb.h"
 #include "log.h"
+#include "mem.h"
 #include "onak-conf.h"
+#include "parsekey.h"
 #include "stats.h"
 
-void parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
+#define OP_UNKNOWN 0
+#define OP_GET     1
+
+int parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
 {
 	int i = 0;
+	int op = OP_UNKNOWN;
 
 	if (cgiparams != NULL) {
 		i = 0;
@@ -31,24 +39,113 @@ void parsecgistuff(char **cgiparams, uint64_t *from, uint64_t *to)
 				*to = strtoul(cgiparams[i+1], NULL, 16);
 			} else if (!strcmp(cgiparams[i], "from")) {
 				*from = strtoul(cgiparams[i+1], NULL, 16);
+			} else if (!strcmp(cgiparams[i], "op")) {
+				if (!strcmp(cgiparams[i+1], "get")) {
+					op = OP_GET;
+				}
 			}
 			i += 2;
 		}
 	}
 
-	return;
+	return op;
+}
+
+int getkeyspath(uint64_t have, uint64_t want, int count)
+{
+	struct openpgp_publickey *publickey = NULL;
+	struct openpgp_packet_list *packets = NULL;
+	struct openpgp_packet_list *list_end = NULL;
+	struct stats_key *keyinfoa, *keyinfob, *curkey;
+	uint64_t fullhave, fullwant;
+	int rec;
+	int pathlen = 0;
+
+	fullhave = config.dbbackend->getfullkeyid(have);
+	fullwant = config.dbbackend->getfullkeyid(want);
+
+	/*
+	 * Make sure the keys we have and want are in the cache.
+	 */
+	config.dbbackend->cached_getkeysigs(fullhave);
+	config.dbbackend->cached_getkeysigs(fullwant);
+
+	if ((keyinfoa = findinhash(fullhave)) == NULL) {
+		return 1;
+	}
+	if ((keyinfob = findinhash(fullwant)) == NULL) {
+		return 1;
+	}
+	
+	while ((!cleanup()) && (pathlen < count)) {
+		/*
+		 * Fill the tree info up.
+		 */
+		initcolour(true);
+		rec = findpath(keyinfoa, keyinfob);
+		keyinfob->parent = 0;
+		if (keyinfoa->colour == 0) {
+			pathlen = count;
+		} else {
+			/*
+			 * Skip the first key, as the remote user will already
+			 * have it
+			 */
+			curkey = findinhash(keyinfoa->parent);
+			while (curkey != NULL && curkey->keyid != 0) {
+	    			if (curkey->keyid != fullwant &&
+						config.dbbackend->fetch_key(
+						curkey->keyid,
+						&publickey, false)) {
+	      				flatten_publickey(publickey,
+							&packets,
+							&list_end);
+					free_publickey(publickey);
+					publickey = NULL;
+				}
+				if (curkey != keyinfoa && curkey != keyinfob) {
+					curkey->disabled = true;
+				}
+				curkey = findinhash(curkey->parent);
+			}
+		}
+		pathlen++;
+	}
+
+	/*
+	 * Add the destination key to the list of returned keys.
+	 */
+	if (config.dbbackend->fetch_key(fullwant, &publickey, false)) {
+		flatten_publickey(publickey,
+				&packets,
+				&list_end);
+		free_publickey(publickey);
+		publickey = NULL;
+	}
+
+	armor_openpgp_stream(stdout_putchar, NULL, packets);
+	free_packet_list(packets);
+	packets = list_end = NULL;
+
+	return 0;
 }
 
 int main(int argc, char *argv[])
 {
-	char **cgiparams = NULL;	/* Our CGI parameter block */
-	uint64_t from = 0, to = 0;
+	char     **cgiparams = NULL;	/* Our CGI parameter block */
+	uint64_t   from = 0, to = 0;
+	int        op = OP_UNKNOWN;
 
 	cgiparams = getcgivars(argc, argv);
 
-	start_html("Experimental PGP key path finder results");
 
-	parsecgistuff(cgiparams, &from, &to);
+	op = parsecgistuff(cgiparams, &from, &to);
+	
+	if (op != OP_GET) {
+		start_html("Experimental PGP key path finder results");
+	} else {
+		puts("Content-Type: text/plain\n");
+	}
 
 	if (from == 0 || to == 0) {
 		printf("Must pass from & to\n");
@@ -56,27 +153,48 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	printf("<P>Looking for path from 0x%llX to 0x%llX.\n", from, to);
-	printf("<A HREF=\"gpgwww?from=0x%08llX&to=0x%08llX\">"
-			"Find reverse path</A></P>\n",
-			to,
-			from);
+	if (op != OP_GET) {
+		printf("<P>Looking for path from 0x%016" PRIX64" to 0x%016"
+				PRIX64 ".\n",
+				from, to);
+		printf("<A HREF=\"gpgwww?from=0x%016" PRIX64 "&to=0x%016" PRIX64
+				"\">Find reverse path</A>\n",
+				to,
+				from);
+		printf("<A HREF=\"gpgwww?from=0x%08" PRIX64 "&to=0x%08" PRIX64
+				"&op=get\">"
+				"Get all keys listed</A></P>\n",
+				from,
+				to);
+	}
 
-	readconfig();
+	readconfig(NULL);
 	initlogthing("gpgwww", config.logfile);
-	initdb();
+	catchsignals();
+	config.dbbackend->initdb(true);
 	inithash();
-	dofindpath(from, to, true, 3);
+	logthing(LOGTHING_NOTICE, "Looking for path from 0x%016" PRIX64
+			" to 0x%016"
+			PRIX64,
+			from,
+			to);
+	if (op == OP_GET) {
+		getkeyspath(from, to, 3);
+	} else {
+		dofindpath(from, to, true, 3);
+	}
 	destroyhash();
-	cleanupdb();
+	config.dbbackend->cleanupdb();
 	cleanuplogthing();
 	cleanupconfig();
 
-	puts("<HR>");
-	puts("Produced by gpgwww " VERSION ", part of onak. "
-		"<A HREF=\"mailto:noodles-onak@earth.li\">"
-		"Jonathan McDowell</A>");
-	end_html();
+	if (op != OP_GET) {
+		puts("<HR>");
+		puts("Produced by gpgwww " PACKAGE_VERSION ", part of onak. "
+			"<A HREF=\"mailto:noodles-onak@earth.li\">"
+			"Jonathan McDowell</A>");
+		end_html();
+	}
 
 	cleanupcgi(cgiparams);
 	cgiparams = NULL;