Add option to only accept updates for existing keys

[onak.git] / onak.c

diff --git a/onak.c b/onak.c
index 63f19d769679ccd9287c59e9e048aac7fc471230..030d46819bf6c5198655b57203cf2ebf27ee1cfa 100644 (file)
--- a/onak.c
+++ b/onak.c
@@ -241,7 +241,10 @@ int main(int argc, char *argv[])
                        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,
@@ -330,8 +333,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]);
@@ -376,9 +390,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."
@@ -437,7 +460,8 @@ 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);
+                               get_fingerprint(keys->publickey, &fingerprint);
+                               dbctx->delete_key(dbctx, &fingerprint, true);
                                cleankeys(&keys, config.clean_policies);
                                dbctx->store_key(dbctx, keys, true, false);
                        } else {