X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=onak.c;h=717402ee41137e0e90aa6862d87c8a4396d3f552;hb=f3745f1a2bbf08e7e1abed1a980f076ffa4f1dfd;hp=ef7134162a649d4861dbf9201043ec9d28941f20;hpb=2e969db9d32b8fba8a22125fe5b66323b6d1f71e;p=onak.git
diff --git a/onak.c b/onak.c
index ef71341..717402e 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,
@@ -234,14 +234,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(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,
@@ -272,6 +276,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 +294,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 +324,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]);
@@ -368,9 +393,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 +463,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");