commit: 62ee882e544cac60c9aeeeec784265bd2cfe1c35
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 11 00:52:09 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Dec 20 16:46:05 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/gentoo-keys.git;a=commit;h=62ee882e
gkeys: Add refreshkey action and support code
---
gkeys/actions.py | 30 ++++++++++++++++++++++++++++++
gkeys/lib.py | 18 ++++++++++++++++++
2 files changed, 48 insertions(+)
diff --git a/gkeys/actions.py b/gkeys/actions.py
index 4c430e7..5b534cb 100644
--- a/gkeys/actions.py
+++ b/gkeys/actions.py
@@ -27,6 +27,7 @@ from gkeys.checks import SPECCHECK_SUMMARY, convert_pf,
convert_yn
Available_Actions = ['listseed', 'addseed', 'removeseed', 'moveseed',
'fetchseed',
'listseedfiles', 'listkey', 'installkey', 'removekey', 'movekey',
'installed', 'importkey', 'verify', 'checkkey', 'sign',
'speccheck']
+ 'refreshkey']
Action_Options = {
'listseed': ['nick', 'name', 'keydir', 'fingerprint', 'seedfile', 'file'],
@@ -45,6 +46,7 @@ Action_Options = {
'checkkey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
'sign': ['nick', 'name', 'keydir', 'fingerprint', 'file', 'keyring'],
'speccheck': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
+ 'refreshkey': ['nick', 'name', 'keydir', 'fingerprint', 'category',
'keyring', 'keyid'],
}
@@ -733,3 +735,31 @@ class Actions(object):
)
success.append(True)
return (False not in success, ['', msgs])
+
+
+ def refreshkey(self, args):
+ '''Calls gpg with the --refresh-keys option
+ for in place updates of the installed keys'''
+ if not args.category:
+ return (False, ["Please specify seeds type."])
+ self.logger.debug("ACTIONS: refreshkey; args: %s" % str(args))
+ handler = SeedHandler(self.logger, self.config)
+ seeds = handler.load_category(args.category)
+ catdir = self.config.get_key(args.category + "-category")
+ self.logger.debug("ACTIONS: refreshkey; catdir = %s" % catdir)
+ self.gpg = GkeysGPG(self.config, catdir)
+ results = {}
+ kwargs = handler.build_gkeydict(args)
+ keyresults = seeds.list(**kwargs)
+ self.output('', '\n Refreshig keys...')
+ for gkey in sorted(keyresults):
+ self.logger.info("Refreshig key %s, %s" % (gkey.nick, gkey.keyid))
+ self.output('', " %s: %s" % (gkey.name, ', '.join(gkey.keyid)))
+ #self.output('', " ===============")
+ self.logger.debug("ACTIONS: refreshkey; gkey = %s" % str(gkey))
+ results[gkey.keydir] = self.gpg.refresh_key(gkey)
+ return (True, ['Completed'])
+
+
+
+
diff --git a/gkeys/lib.py b/gkeys/lib.py
index d2b3119..50ed63e 100644
--- a/gkeys/lib.py
+++ b/gkeys/lib.py
@@ -179,6 +179,24 @@ class GkeysGPG(GPG):
return []
+ def refresh_key(self, gkey):
+ '''Refresh the specified key in the specified keydir
+
+ @param key: tuple of (name, nick, keydir, fingerprint)
+ @param keydir: the keydir to add the key to
+ '''
+ self.config.defaults['gpg_defaults'].append('--no-permission-warning')
+ self.set_keyserver()
+ self.set_keydir(gkey.keydir, 'refresh-keys', reset=True)
+ self.set_keyring('pubring.gpg', 'refresh-keys', reset=False)
+ logger.debug("LIB: refresh_key, gkey: %s" % str(gkey))
+ logger.debug("** Calling runGPG with Running 'gpg %s --refresh-keys'
for: %s"
+ % (' '.join(self.config.get_key('tasks', 'refresh-keys')),
str(gkey)))
+ result = self.runGPG(task='refresh-keys', inputfile='')
+ logger.info('GPG return code: ' + str(result.returncode))
+ return result
+
+
def update_key(self, gkey, keydir):
'''Update the specified key in the specified keydir
