From 4f9b27182455335732cb4a5b71d40f83152923c1 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Mon, 29 Aug 2016 20:39:19 +0530 Subject: [PATCH] monkeysphere: Make sure show keys output is robust --- actions/monkeysphere | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/actions/monkeysphere b/actions/monkeysphere index 0c2febdc5..c5e6a87bc 100755 --- a/actions/monkeysphere +++ b/actions/monkeysphere @@ -125,7 +125,8 @@ def get_monkeysphere_keys(key_id=None): return {} # parse output - keys = [dict()] + default_dict = {'imported_domains': [], 'available_domains': []} + keys = [default_dict.copy()] lines = output.decode().strip().split('\n') for line in lines: if line.startswith('pub'): @@ -140,8 +141,7 @@ def get_monkeysphere_keys(key_id=None): keys[-1].setdefault('uids', []).append(uid) matches = re.match('([a-zA-Z]*)://(.*)(:\d*)?', uid) keys[-1]['service'] = matches.group(1) - keys[-1].setdefault('imported_domains', []) \ - .append(matches.group(2)) + keys[-1]['imported_domains'].append(matches.group(2)) elif line.startswith('OpenPGP fingerprint:'): keys[-1]['openpgp_fingerprint'] = \ line.lstrip('OpenPGP fingerprint:') @@ -151,7 +151,7 @@ def get_monkeysphere_keys(key_id=None): keys[-1]['ssh_fingerprint'] = data[1] keys[-1]['ssh_key_type'] = data[2].strip('()') elif line == '': - keys.append(dict()) + keys.append(default_dict.copy()) return {key['ssh_fingerprint']: key for key in keys}