X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;ds=sidebyside;f=onak.c;h=a27ff983e78908d6de2e57013173d7b97d7118cf;hb=d8947462f94fabc9181b546081fec58cf730b025;hp=0c4673d7704323723c53133b9cc429f2700bd5c9;hpb=3648a31750b3b42197c404483a18ca63d5f8777b;p=onak.git
diff --git a/onak.c b/onak.c
index 0c4673d..a27ff98 100644
--- a/onak.c
+++ b/onak.c
@@ -15,8 +15,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 .
*/
#include
@@ -28,6 +27,8 @@
#include
#include
+#include "build-config.h"
+
#include "armor.h"
#include "charfuncs.h"
#include "cleankey.h"
@@ -42,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,
@@ -56,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 {
@@ -165,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;
@@ -177,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;
@@ -185,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;
@@ -207,7 +214,7 @@ int main(int argc, char *argv[])
if ((argc - optind) < 1) {
usage();
} else if (!strcmp("dump", argv[optind])) {
- dbctx = config.dbinit(true);
+ dbctx = config.dbinit(config.backend, true);
dumpstate.count = dumpstate.filenum = 0;
dumpstate.maxcount = 100000;
dumpstate.fd = -1;
@@ -234,14 +241,18 @@ int main(int argc, char *argv[])
logthing(LOGTHING_INFO, "Finished reading %d keys.",
result);
- result = cleankeys(keys);
+ dbctx = config.dbinit(config.backend, false);
+ result = cleankeys(dbctx, &keys,
+ config.clean_policies);
logthing(LOGTHING_INFO, "%d keys cleaned.",
result);
- dbctx = config.dbinit(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,
@@ -272,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);
@@ -289,7 +301,8 @@ 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,12 +331,31 @@ 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]);
+ } else {
+ /* Dump config to stdout */
+ writeconfig(NULL);
+ }
} else if ((argc - optind) == 2) {
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]);
@@ -337,15 +369,15 @@ int main(int argc, char *argv[])
ishex = true;
}
}
- dbctx = config.dbinit(false);
+ dbctx = config.dbinit(config.backend, false);
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."
@@ -368,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."
@@ -429,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);
+ 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");
@@ -444,6 +486,7 @@ int main(int argc, char *argv[])
cleanuplogthing();
cleanupconfig();
+ free(configfile);
return rc;
}