fix create_gid_key not stored correctly in record rspec, add genidump tool

diff --git a/cmdline/editRecord.py b/cmdline/editRecord.py
index be18c31..a7f801f 100644 (file)
--- a/cmdline/editRecord.py
+++ b/cmdline/editRecord.py
@@ -192,7 +192,7 @@ def main():
 
        geni_info["create_gid"] = True
        geni_info["create_gid_hrn"] = record.name
-       geni_info["create_gid_key"] = load_publickey_string(pubkeyfile)
+       geni_info["create_gid_key"] = load_publickey_string(pubkeyfile).replace("\n", "|") # XXX smbaker: the rspec kills newlines
 
    if researcher:
        update_list(geni_info, "researcher", researcher)

diff --git a/cmdline/genidump.py b/cmdline/genidump.py
new file mode 100644 (file)
index 0000000..03fb71d
--- /dev/null
+++ b/cmdline/genidump.py
@@ -0,0 +1,63 @@
+#! /usr/bin/env python
+from __future__ import with_statement
+
+import sys
+import os, os.path
+import tempfile
+import xmlrpclib
+from optparse import OptionParser
+from geni.util.cert import Keypair, Certificate
+from geni.util.credential import Credential
+from geni.util.geniclient import GeniClient, ServerException
+from geni.util.gid import create_uuid
+from geni.util.record import GeniRecord
+from geni.util.rspec import Rspec
+from types import StringTypes, ListType
+
+def determine_geni_filekind(fn):
+    from geni.util.cert import Certificate
+
+    cert = Certificate(filename = fn)
+
+    data = cert.get_data()
+    if data:
+        dict = xmlrpclib.loads(data)[0][0]
+    else:
+        dict = {}
+
+    if "gidCaller" in dict:
+        return "credential"
+
+    if "uuid" in dict:
+        return "gid"
+
+    return "unknown"
+
+def create_parser():
+   # Generate command line parser
+   parser = OptionParser(usage="genidump [options] filename")
+
+   return parser
+
+def main():
+   parser = create_parser()
+   (options, args) = parser.parse_args()
+
+   if len(args) <= 0:
+        print "No filename given. Use -h for help."
+        return -1
+
+   filename = args[0]
+   kind = determine_geni_filekind(filename)
+
+   if kind=="credential":
+       cred = Credential(filename = filename)
+       cred.dump(dump_parents = True)
+   elif kind=="gid":
+       gid = Gid(filename = filename)
+       gid.dump(dump_parents = True)
+   else:
+       print "unknown filekind", kind
+
+if __name__=="__main__":
+   main()

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index e054b3b..e121444 100755 (executable)
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -371,24 +371,28 @@ def delegate(opts, args):
    global registry
    user_cred = get_user_cred()
    if opts.delegate_user:
-       cred = user_cred
+       object_cred = user_cred
    elif opts.delegate_slice:
-       cred = get_slice_cred(opt.delegate_slice)
+       object_cred = get_slice_cred(opts.delegate_slice)
    else:
        print "Must specify either --user or --slice <hrn>"
        return
 
+   # the gid and hrn of the object we are delegating
+   object_gid = object_cred.get_gid_object()
+   object_hrn = object_gid.get_hrn()
+
+   if not object_cred.get_delegate():
+       print "Error: Object credential", object_hrn, "does not have delegate bit set"
+       return
+
    records = registry.resolve(user_cred, args[0])
    records = filter_records("user", records)
 
    if not records:
-       print "Didn't find a user record for", delegee_name
+       print "Error: Didn't find a user record for", delegee_name
        return
 
-   # the gid and hrn of the object we are delegating
-   object_gid = cred.get_gid_object()
-   object_hrn = object_gid.get_hrn()
-
    # the gid of the user who will be delegated too
    delegee_gid = records[0].get_gid_object()
    delegee_hrn = delegee_gid.get_hrn()
@@ -397,14 +401,14 @@ def delegate(opts, args):
    user_key = Keypair(filename = get_key_file())
    user_hrn = user_cred.get_gid_caller().get_hrn()
 
-   dcred = Credential(subject=cred.get_subject())
+   dcred = Credential(subject=object_hrn + " delegated to " + delegee_hrn)
    dcred.set_gid_caller(delegee_gid)
    dcred.set_gid_object(object_gid)
-   dcred.set_privileges(cred.get_privileges())
+   dcred.set_privileges(object_cred.get_privileges())
    dcred.set_delegate(True)
    dcred.set_pubkey(object_gid.get_pubkey())
    dcred.set_issuer(user_key, user_hrn)
-   dcred.set_parent(cred)
+   dcred.set_parent(object_cred)
    dcred.encode()
    dcred.sign()
 
@@ -438,7 +442,8 @@ def add(opts, args):
    #   broken and has no way for us to get the key back out of the gid)
    geni_info = record.get_geni_info()
    if "create_gid" in geni_info:
-       gid = registry.create_gid(auth_cred, geni_info["create_gid_hrn"], create_uuid(), geni_info["create_gid_key"])
+       key_string = geni_info["create_gid_key"].replace("|","\n") # XXX smbaker: the rspec kills newlines
+       gid = registry.create_gid(auth_cred, geni_info["create_gid_hrn"], create_uuid(), key_string)
        record.set_gid(gid)
 
        del geni_info["create_gid"]