From ff14e0df8e6fb43cf63544ee727020bf0a87748f Mon Sep 17 00:00:00 2001 From: putro Date: Fri, 4 Apr 2014 21:25:25 +0200 Subject: [PATCH] added nym deletion feature --- autonym.py | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/autonym.py b/autonym.py index ecc59f5..f495a0f 100755 --- a/autonym.py +++ b/autonym.py @@ -124,20 +124,36 @@ def createNym(): setActiveNym(email) msg = prepareSetupMsg(gpgfuncts.selectSecKey(email), subj_type, subject) - print msg - pressKey() - emsg = signCryptMsg(msg, dest, sign=False) + emsg = signCryptMsg(msg, dest, sign=False, passphrase="") if not emsg: config['last_message'] = "Something went wrong while preparing the message, recipient key missing ???" menu() sendMixMsg(dest, emsg) def deleteNym(): - config['last_message'] = "Function not yet implemented" - #print "Choose nym to delete" - #askNym() - menu() + print "Choose nym to delete" + askNym() + dest = "config@" + anym.domain + + if not gpgfuncts.selectKey(dest): + config['last_message'] = "Server %s key not available, abort" % server + menu() + if not gpgfuncts.selectKey(anym.name): + print "no key available, creating a new one for %s" % email + menu() + + if not anym['passphrase']: + pwd = askPassphrase() + else: + pwd = anym['passphrase'] + + msg = prepareSetupMsg(gpgfuncts.selectSecKey(anym.name), "delete", "yes") + emsg = signCryptMsg(msg, dest, sign=anym.fp, passphrase=pwd) + if not emsg: + config['last_message'] = "Something went wrong while preparing the message, recipient key missing ???" + menu() + sendMixMsg(dest, emsg) def prepareSetupMsg(keyid, subj_type, subject): @@ -146,8 +162,8 @@ def prepareSetupMsg(keyid, subj_type, subject): return msg -def signCryptMsg(msg, dest, sign): - msg = gpgfuncts.encrypt(msg, dest, sign=sign) +def signCryptMsg(msg, dest, sign, passphrase): + msg = gpgfuncts.stripVersion(str(gpgfuncts.encrypt(msg, dest, sign=sign, passphrase=passphrase))) return msg -- GitLab