From: Tony Mack <tmack@cs.princeton.edu>
Date: Mon, 23 Mar 2009 20:15:52 +0000 (+0000)
Subject: the record returned when resolving a user now inculdes the users public keys as strings
X-Git-Tag: sfa-0.9-0@14641~549
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9855105c9794853017eb7efabca8e6c7b44f8148;p=sfa.git

the record returned when resolving a user now inculdes the users public keys as strings
---

diff --git a/geni/registry.py b/geni/registry.py
index 574f8f71..b5fb908e 100644
--- a/geni/registry.py
+++ b/geni/registry.py
@@ -305,6 +305,12 @@ class Registry(GeniServer):
             pl_res = self.shell.GetSlices(self.pl_auth, [pointer])
         elif (type == "user"):
             pl_res = self.shell.GetPersons(self.pl_auth, [pointer])
+            key_ids = pl_res[0]['key_ids']
+            keys = self.shell.GetKeys(self.pl_auth, key_ids)
+            pubkeys = []
+            if keys:
+                pubkeys = [key['key'] for key in keys]
+            pl_res[0]['keys'] = pubkeys
         elif (type == "node"):
             pl_res = self.shell.GetNodes(self.pl_auth, [pointer])
         else: