X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=lookup.c;h=fda1686234f06160dfd7af7be1819c441fcf2bc2;hb=5719b2b50c87d77e4ed1cc054f000845fc9aa8cc;hp=273afc225c04d567636d92bcfc50d44eaa541752;hpb=9bcf53c1662548d457920cd415a2c7266c1128e2;p=onak.git

diff --git a/lookup.c b/lookup.c
index 273afc2..fda1686 100644
--- a/lookup.c
+++ b/lookup.c
@@ -13,8 +13,7 @@
  * 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.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <inttypes.h>
@@ -46,25 +45,31 @@
 #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(struct onak_dbctx *dbctx,
+		char *search, uint64_t keyid,
+		struct openpgp_fingerprint *fingerprint,
+		bool ishex, bool isfp, bool dispfp, 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 = dbctx->fetch_key_id(dbctx, keyid, &publickey,
+				false);
+	} else if (isfp) {
+		count = dbctx->fetch_key_fp(dbctx, fingerprint, &publickey,
+				false);
 	} else {
-		count = config.dbbackend->fetch_key_text(search, &publickey);
+		count = dbctx->fetch_key_text(dbctx, search, &publickey);
 	}
 	if (publickey != NULL) {
 		if (mrhkp) {
 			printf("info:1:%d\n", count);
 			mrkey_index(publickey);
 		} else {
-			key_index(publickey, verbose, fingerprint, skshash,
-				true);
+			key_index(dbctx, publickey, verbose, dispfp,
+				skshash, true);
 		}
 		free_publickey(publickey);
 	} else if (count == 0) {
@@ -86,18 +91,33 @@ 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;
 	int op = OP_UNKNOWN;
-	int i;
+	int i, j;
 	int indx = 0;
-	bool fingerprint = false;
+	bool dispfp = false;
 	bool skshash = false;
 	bool exact = false;
 	bool ishex = false;
+	bool isfp = false;
 	bool mrhkp = false;
 	uint64_t keyid = 0;
+	struct openpgp_fingerprint fingerprint;
 	char *search = NULL;
 	char *end = NULL;
 	struct openpgp_publickey *publickey = NULL;
@@ -105,6 +125,7 @@ int main(int argc, char *argv[])
 	struct openpgp_packet_list *list_end = NULL;
 	int result;
 	struct skshash hash;
+	struct onak_dbctx *dbctx;
 
 	params = getcgivars(argc, argv);
 	for (i = 0; params != NULL && params[i] != NULL; i += 2) {
@@ -125,14 +146,14 @@ int main(int argc, char *argv[])
 			params[i+1] = NULL;
 			if (search != NULL && strlen(search) == 42 &&
 					search[0] == '0' && search[1] == 'x') {
-				/*
-				 * Fingerprint. Truncate to last 64 bits for
-				 * now.
-				 */
-				keyid = strtoull(&search[26], &end, 16);
-				if (end != NULL && *end == 0) {
-					ishex = true;
+				fingerprint.length = MAX_FINGERPRINT_LEN;
+				for (j = 0; j < MAX_FINGERPRINT_LEN; j++) {
+					fingerprint.fp[j] = (hex2bin(
+							search[2 + j * 2])
+								<< 4) +
+						hex2bin(search[3 + j * 2]);
 				}
+				isfp = true;
 			} else if (search != NULL) {
 				keyid = strtoull(search, &end, 16);
 				if (*search != 0 &&
@@ -145,7 +166,7 @@ int main(int argc, char *argv[])
 			indx = atoi(params[i+1]);
 		} else if (!strcmp(params[i], "fingerprint")) {
 			if (!strcmp(params[i+1], "on")) {
-				fingerprint = true;
+				dispfp = true;
 			}
 		} else if (!strcmp(params[i], "hash")) {
 			if (!strcmp(params[i+1], "on")) {
@@ -193,19 +214,22 @@ int main(int argc, char *argv[])
 		readconfig(NULL);
 		initlogthing("lookup", config.logfile);
 		catchsignals();
-		config.dbbackend->initdb(false);
+		dbctx = config.dbinit(config.backend, false);
 		switch (op) {
 		case OP_GET:
 		case OP_HGET:
 			if (op == OP_HGET) {
 				parse_skshash(search, &hash);
-				result = config.dbbackend->fetch_key_skshash(
+				result = dbctx->fetch_key_skshash(dbctx,
 					&hash, &publickey);
 			} else if (ishex) {
-				result = config.dbbackend->fetch_key(keyid,
+				result = dbctx->fetch_key_id(dbctx, keyid,
 					&publickey, false);
+			} else if (isfp) {
+				result = dbctx->fetch_key_fp(dbctx,
+					&fingerprint, &publickey, false);
 			} else {
-				result = config.dbbackend->fetch_key_text(
+				result = dbctx->fetch_key_text(dbctx,
 					search,
 					&publickey);
 			}
@@ -231,21 +255,29 @@ int main(int argc, char *argv[])
 			}
 			break;
 		case OP_INDEX:
-			find_keys(search, keyid, ishex, fingerprint, skshash,
+			find_keys(dbctx, search, keyid, &fingerprint,
+					ishex, isfp, dispfp, skshash,
 					exact, false, mrhkp);
 			break;
 		case OP_VINDEX:
-			find_keys(search, keyid, ishex, fingerprint, skshash,
+			find_keys(dbctx, search, keyid, &fingerprint,
+					ishex, isfp, dispfp, skshash,
 					exact, true, mrhkp);
 			break;
 		case OP_PHOTO:
-			if (config.dbbackend->fetch_key(keyid, &publickey,
-					false)) {
+			if (isfp) {
+				dbctx->fetch_key_fp(dbctx, &fingerprint,
+					&publickey, false);
+			} else {
+				dbctx->fetch_key_id(dbctx, 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,
@@ -258,7 +290,7 @@ int main(int argc, char *argv[])
 		default:
 			puts("Unknown operation!");
 		}
-		config.dbbackend->cleanupdb();
+		dbctx->cleanupdb(dbctx);
 		cleanuplogthing();
 		cleanupconfig();
 	}