Add list-keys subcommand.

2 files changed, 17 insertions, 0 deletions

diff --git a/obnamlib/plugins/encryption_plugin.py b/obnamlib/plugins/encryption_plugin.py
index fd706d66..6ee4f362 100644
--- a/obnamlib/plugins/encryption_plugin.py
+++ b/obnamlib/plugins/encryption_plugin.py
@@ -40,6 +40,7 @@ class EncryptionPlugin(obnamlib.ObnamPlugin):
         self._pubkey = None
         
         self.app.register_command('client-keys', self.client_keys)
+        self.app.register_command('list-keys', self.list_keys)
 
     @property
     def keyid(self):
@@ -118,6 +119,19 @@ class EncryptionPlugin(obnamlib.ObnamPlugin):
                 keyid = 'no key'
             print client, keyid
 
+    def list_keys(self, args):
+        repo = self.app.open_repository()
+        toplevels = repo.fs.listdir('.')
+        keys = dict()
+        for toplevel in toplevels:
+            userkeys = self.read_keyring(repo, toplevel)
+            for keyid in userkeys.keyids():
+                keys[keyid] = keys.get(keyid, []) + [toplevel]
+        for keyid in keys:
+            print 'key: %s' % keyid
+            for toplevel in keys[keyid]:
+                print '  %s' % toplevel
+
 #    def add_client(self, repo, client_public_key):
 #        self.add_to_userkeys(repo, 'metadata', client_public_key)
 #        self.add_to_userkeys(repo, 'clientlist', client_public_key)
diff --git a/test-encrypted-repo b/test-encrypted-repo
index 03dc6fab..2193bd38 100755
--- a/test-encrypted-repo
+++ b/test-encrypted-repo
@@ -21,3 +21,6 @@ diff -u temp.data.manifest temp.restored.manifest
 
 echo "client keys:"
 $cmd client-keys
+
+echo "list-keys:"
+$cmd list-keys