X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=13ffbcc9e11848557f454c96de6009673411d058;hb=7f6a0a82eafb84548e5a298485533a2fd506f98d;hp=9a9ccbd7a80d68c46a300db30ccb0430058b4aa3;hpb=8fc32ce43451185ca899b65ceec273425a358f00;p=onak.git

diff --git a/lookup.c b/lookup.c
index 9a9ccbd..13ffbcc 100644
--- a/lookup.c
+++ b/lookup.c
@@ -1,9 +1,20 @@
 /*
  * lookup.c - CGI to lookup keys.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007-2009,2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <inttypes.h>
@@ -35,15 +46,19 @@
 #define OP_PHOTO   4
 #define OP_HGET    5
 
-void find_keys(char *search, uint64_t keyid, bool ishex,
-		bool fingerprint, bool skshash, bool exact, bool verbose,
-		bool mrhkp)
+void find_keys(char *search, uint64_t keyid, uint8_t *fp, size_t fpsize,
+		bool ishex, bool isfp, bool fingerprint, bool skshash,
+		bool exact, bool verbose, bool mrhkp)
 {
 	struct openpgp_publickey *publickey = NULL;
 	int count = 0;
 
 	if (ishex) {
-		count = config.dbbackend->fetch_key(keyid, &publickey, false);
+		count = config.dbbackend->fetch_key_id(keyid, &publickey,
+				false);
+	} else if (isfp) {
+		count = config.dbbackend->fetch_key_fp(fp, fpsize, &publickey,
+				false);
 	} else {
 		count = config.dbbackend->fetch_key_text(search, &publickey);
 	}
@@ -75,6 +90,19 @@ void find_keys(char *search, uint64_t keyid, bool ishex,
 	}
 }
 
+static uint8_t hex2bin(char c)
+{
+	if (c >= '0' && c <= '9') {
+		return (c - '0');
+	} else if (c >= 'a' && c <= 'f') {
+		return (c - 'a' + 10);
+	} else if (c >= 'A' && c <= 'F') {
+		return (c - 'A' + 10);
+	}
+
+	return 255;
+}
+
 int main(int argc, char *argv[])
 {
 	char **params = NULL;
@@ -85,8 +113,10 @@ int main(int argc, char *argv[])
 	bool skshash = false;
 	bool exact = false;
 	bool ishex = false;
+	bool isfp = false;
 	bool mrhkp = false;
 	uint64_t keyid = 0;
+	uint8_t fp[MAX_FINGERPRINT_LEN];
 	char *search = NULL;
 	char *end = NULL;
 	struct openpgp_publickey *publickey = NULL;
@@ -112,7 +142,15 @@ int main(int argc, char *argv[])
 		} else if (!strcmp(params[i], "search")) {
 			search = params[i+1];
 			params[i+1] = NULL;
-			if (search != NULL) {
+			if (search != NULL && strlen(search) == 42 &&
+					search[0] == '0' && search[1] == 'x') {
+				for (i = 0; i < MAX_FINGERPRINT_LEN; i++) {
+					fp[i] = (hex2bin(search[2 + i * 2])
+								<< 4) +
+						hex2bin(search[3 + i * 2]);
+				}
+				isfp = true;
+			} else if (search != NULL) {
 				keyid = strtoull(search, &end, 16);
 				if (*search != 0 &&
 						end != NULL &&
@@ -181,8 +219,11 @@ int main(int argc, char *argv[])
 				result = config.dbbackend->fetch_key_skshash(
 					&hash, &publickey);
 			} else if (ishex) {
-				result = config.dbbackend->fetch_key(keyid,
+				result = config.dbbackend->fetch_key_id(keyid,
 					&publickey, false);
+			} else if (isfp) {
+				result = config.dbbackend->fetch_key_fp(fp,
+					MAX_FINGERPRINT_LEN, &publickey, false);
 			} else {
 				result = config.dbbackend->fetch_key_text(
 					search,
@@ -210,21 +251,30 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case OP_INDEX:
-			find_keys(search, keyid, ishex, fingerprint, skshash,
+			find_keys(search, keyid, fp, MAX_FINGERPRINT_LEN,
+					ishex, isfp, fingerprint, skshash,
 					exact, false, mrhkp);
 			break;
 		case OP_VINDEX:
-			find_keys(search, keyid, ishex, fingerprint, skshash,
+			find_keys(search, keyid, fp, MAX_FINGERPRINT_LEN,
+					ishex, isfp, fingerprint, skshash,
 					exact, true, mrhkp);
 			break;
 		case OP_PHOTO:
-			if (config.dbbackend->fetch_key(keyid, &publickey,
-					false)) {
+			if (isfp) {
+				config.dbbackend->fetch_key_fp(fp,
+					MAX_FINGERPRINT_LEN,
+					&publickey, false);
+			} else {
+				config.dbbackend->fetch_key_id(keyid,
+					&publickey, false);
+			}
+			if (publickey != NULL) {
 				unsigned char *photo = NULL;
 				size_t         length = 0;
 
 				if (getphoto(publickey, indx, &photo,
-						&length)) {
+						&length) == ONAK_E_OK) {
 					fwrite(photo,
 							1,
 							length,