X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=onak.c;h=a27ff983e78908d6de2e57013173d7b97d7118cf;hp=085a876c54c9dac6ceb1d4f22bbb8ec2fcff8f91;hb=a2979c20e1ab2d52e3a961ac7dad45fee9d6345a;hpb=a0d1c99184eeb07a6a7711e168c3db4b8c0937eb

diff --git a/onak.c b/onak.c
index 085a876..a27ff98 100644
--- a/onak.c
+++ b/onak.c
@@ -27,6 +27,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "build-config.h"
+
 #include "armor.h"
 #include "charfuncs.h"
 #include "cleankey.h"
@@ -41,7 +43,6 @@
 #include "onak-conf.h"
 #include "parsekey.h"
 #include "photoid.h"
-#include "version.h"
 
 void find_keys(struct onak_dbctx *dbctx,
 		char *search, uint64_t keyid,
@@ -55,7 +56,10 @@ void find_keys(struct onak_dbctx *dbctx,
 	if (ishex) {
 		count = dbctx->fetch_key_id(dbctx, keyid, &publickey,
 				false);
-	} else if (isfp) {
+	} else if (isfp && exact) {
+		count = dbctx->fetch_key(dbctx, fingerprint,
+				&publickey, false);
+	} else if (isfp && !exact) {
 		count = dbctx->fetch_key_fp(dbctx, fingerprint,
 				&publickey, false);
 	} else {
@@ -164,6 +168,7 @@ int main(int argc, char *argv[])
 	char				*end = NULL;
 	uint64_t			 keyid = 0;
 	int				 i;
+	bool				 exact = false;
 	bool				 ishex = false;
 	bool				 isfp = false;
 	bool				 update = false;
@@ -176,7 +181,7 @@ int main(int argc, char *argv[])
 	struct onak_dbctx		*dbctx;
 	struct openpgp_fingerprint	 fingerprint;
 
-	while ((optchar = getopt(argc, argv, "bc:fsuv")) != -1 ) {
+	while ((optchar = getopt(argc, argv, "bc:efsuv")) != -1 ) {
 		switch (optchar) {
 		case 'b': 
 			binary = true;
@@ -184,6 +189,9 @@ int main(int argc, char *argv[])
 		case 'c':
 			configfile = strdup(optarg);
 			break;
+		case 'e':
+			exact = true;
+			break;
 		case 'f': 
 			dispfp = true;
 			break;
@@ -233,14 +241,18 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_INFO, "Finished reading %d keys.",
 					result);
 
-			result = cleankeys(&keys, config.clean_policies);
+			dbctx = config.dbinit(config.backend, false);
+			result = cleankeys(dbctx, &keys,
+					config.clean_policies);
 			logthing(LOGTHING_INFO, "%d keys cleaned.",
 					result);
 
-			dbctx = config.dbinit(config.backend, false);
 			logthing(LOGTHING_NOTICE, "Got %d new keys.",
 					dbctx->update_keys(dbctx, &keys,
-					false));
+						&config.blacklist,
+						(config.clean_policies &
+						 ONAK_CLEAN_UPDATE_ONLY),
+						false));
 			if (keys != NULL && update) {
 				flatten_publickey(keys,
 					&packets,
@@ -271,6 +283,7 @@ int main(int argc, char *argv[])
 			logthing(LOGTHING_NOTICE, "No changes.");
 		}
 	} else if (!strcmp("clean", argv[optind])) {
+		dbctx = config.dbinit(config.backend, true);
 		if (binary) {
 			result = read_openpgp_stream(stdin_getchar, NULL,
 				 &packets, 0);
@@ -288,7 +301,7 @@ int main(int argc, char *argv[])
 					result);
 
 			if (keys != NULL) {
-				result = cleankeys(&keys,
+				result = cleankeys(dbctx, &keys,
 						config.clean_policies);
 				logthing(LOGTHING_INFO, "%d keys cleaned.",
 						result);
@@ -318,6 +331,7 @@ int main(int argc, char *argv[])
 			free_publickey(keys);
 			keys = NULL;
 		}
+		dbctx->cleanupdb(dbctx);
 	} else if (!strcmp("dumpconfig", argv[optind])) {
 		if ((argc - optind) == 2) {
 			writeconfig(argv[optind + 1]);
@@ -329,8 +343,19 @@ int main(int argc, char *argv[])
 		search = argv[optind+1];
 		if (search != NULL && strlen(search) == 42 &&
 				search[0] == '0' && search[1] == 'x') {
-			fingerprint.length = MAX_FINGERPRINT_LEN;
-			for (i = 0; i < MAX_FINGERPRINT_LEN; i++) {
+			/* v4 fingerprint */
+			fingerprint.length = 20;
+			for (i = 0; i < 20; i++) {
+				fingerprint.fp[i] =
+					(hex2bin(search[2 + i * 2]) << 4) +
+						hex2bin(search[3 + i * 2]);
+			}
+			isfp = true;
+		} else if (search != NULL && strlen(search) == 66 &&
+				search[0] == '0' && search[1] == 'x') {
+			/* v5 fingerprint */
+			fingerprint.length = 32;
+			for (i = 0; i < 32; i++) {
 				fingerprint.fp[i] =
 					(hex2bin(search[2 + i * 2]) << 4) +
 						hex2bin(search[3 + i * 2]);
@@ -348,11 +373,11 @@ int main(int argc, char *argv[])
 		if (!strcmp("index", argv[optind])) {
 			find_keys(dbctx, search, keyid, &fingerprint, ishex,
 					isfp, dispfp, skshash,
-					false, false);
+					exact, false);
 		} else if (!strcmp("vindex", argv[optind])) {
 			find_keys(dbctx, search, keyid, &fingerprint, ishex,
 					isfp, dispfp, skshash,
-					false, true);
+					exact, true);
 		} else if (!strcmp("getphoto", argv[optind])) {
 			if (!ishex) {
 				puts("Can't get a key on uid text."
@@ -375,9 +400,18 @@ int main(int argc, char *argv[])
 				puts("Key not found");
 			}
 		} else if (!strcmp("delete", argv[optind])) {
-			dbctx->delete_key(dbctx,
-					dbctx->getfullkeyid(dbctx, keyid),
-					false);
+			if (!isfp) {
+				if (dbctx->fetch_key_id(dbctx, keyid, &keys,
+							false)) {
+					get_fingerprint(keys->publickey,
+							&fingerprint);
+					dbctx->delete_key(dbctx, &fingerprint,
+							false);
+					free_publickey(keys);
+					keys = NULL;
+				}
+			} else
+				dbctx->delete_key(dbctx, &fingerprint, false);
 		} else if (!strcmp("get", argv[optind])) {
 			if (!(ishex || isfp)) {
 				puts("Can't get a key on uid text."
@@ -436,8 +470,9 @@ int main(int argc, char *argv[])
 		} else if (!strcmp("reindex", argv[optind])) {
 			dbctx->starttrans(dbctx);
 			if (dbctx->fetch_key_id(dbctx, keyid, &keys, true)) {
-				dbctx->delete_key(dbctx, keyid, true);
-				cleankeys(&keys, config.clean_policies);
+				get_fingerprint(keys->publickey, &fingerprint);
+				dbctx->delete_key(dbctx, &fingerprint, true);
+				cleankeys(dbctx, &keys, config.clean_policies);
 				dbctx->store_key(dbctx, keys, true, false);
 			} else {
 				puts("Key not found");