X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=cmdline%2Fsfi.py;h=5ef4f89a1d4e42e0d2c90a5c13154a243cfd2ab7;hb=1569931a5dbbe54f07723e8352d2ebdf96cc0373;hp=481fbf2fe5d6ade15627d15a7454a244c43e5f48;hpb=5a04ddd0df353a10f926ceaddfddd88f17997e85;p=sfa.git

diff --git a/cmdline/sfi.py b/cmdline/sfi.py
index 481fbf2f..5ef4f89a 100755
--- a/cmdline/sfi.py
+++ b/cmdline/sfi.py
@@ -12,6 +12,8 @@ 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
 
 sfi_dir = os.path.expanduser("~/.sfi/")
 slicemgr = None
@@ -181,6 +183,42 @@ def get_slice_cred(name):
          print "Failed to get slice credential"
          sys.exit(-1)
 
+def delegate_cred(cred, hrn, type = 'authority'):
+    # the gid and hrn of the object we are delegating
+    object_gid = cred.get_gid_object()
+    object_hrn = object_gid.get_hrn()
+    cred.set_delegate(True)
+    if not cred.get_delegate():
+        raise Exception, "Error: Object credential %(object_hrn)s does not have delegate bit set" % locals()
+       
+
+    records = registry.resolve(cred, hrn)
+    records = filter_records(type, records)
+    
+    if not records:
+        raise Exception, "Error: Didn't find a %(type)s record for %(hrn)s" % locals()
+
+    # the gid of the user who will be delegated too
+    delegee_gid = records[0].get_gid_object()
+    delegee_hrn = delegee_gid.get_hrn()
+    
+    # the key and hrn of the user who will be delegating
+    user_key = Keypair(filename = get_key_file())
+    user_hrn = cred.get_gid_caller().get_hrn()
+
+    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_delegate(True)
+    dcred.set_pubkey(object_gid.get_pubkey())
+    dcred.set_issuer(user_key, user_hrn)
+    dcred.set_parent(cred)
+    dcred.encode()
+    dcred.sign()
+
+    return dcred
+
 def get_rspec_file(rspec):
    if (os.path.isabs(rspec)):
       file = rspec
@@ -217,7 +255,6 @@ def load_publickey_string(fn):
        os.remove(outfn)
 
    return key_string
-
 #
 # Generate sub-command parser
 #
@@ -233,7 +270,8 @@ def create_cmd_parser(command, additional_cmdargs = None):
               "delete": "name",
               "reset": "name",
               "start": "name",
-              "stop": "name"
+              "stop": "name",
+              "delegate": "name"
              }
 
    if additional_cmdargs:
@@ -261,6 +299,12 @@ def create_cmd_parser(command, additional_cmdargs = None):
    if command in ("show", "list", "resources"):
       parser.add_option("-o", "--output", dest="file",
            help="output XML to file", metavar="FILE", default=None)
+   if command in ("delegate"):
+      parser.add_option("-u", "--user",
+        action="store_true", dest="delegate_user", default=False,
+        help="delegate user credential")
+      parser.add_option("-s", "--slice", dest="delegate_slice",
+        help="delegate slice credential", metavar="HRN", default=None)
    return parser
 
 def create_parser():
@@ -304,10 +348,10 @@ def main():
    (cmd_opts, cmd_args) = create_cmd_parser(command).parse_args(args[1:])
    verbose = options.verbose
    if verbose :
-      print "Resgistry %s, sm %s, dir %s, user %s, auth %s" % (options.registry, 
-                                            options.sm, 
+      print "Resgistry %s, sm %s, dir %s, user %s, auth %s" % (options.registry,
+                                            options.sm,
                                             options.dir,
-                                            options.user, 
+                                            options.user,
                                             options.auth)
       print "Command %s" %command
       if command in ("resources"):
@@ -358,6 +402,60 @@ def show(opts, args):
        save_records_to_file(opts.file, records)
    return
 
+def delegate(opts, args):
+   global registry
+   user_cred = get_user_cred()
+   if opts.delegate_user:
+       object_cred = user_cred
+   elif opts.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 "Error: Didn't find a user record for", args[0]
+       return
+
+   # the gid of the user who will be delegated too
+   delegee_gid = records[0].get_gid_object()
+   delegee_hrn = delegee_gid.get_hrn()
+
+   # the key and hrn of the user who will be delegating
+   user_key = Keypair(filename = get_key_file())
+   user_hrn = user_cred.get_gid_caller().get_hrn()
+
+   dcred = Credential(subject=object_hrn + " delegated to " + delegee_hrn)
+   dcred.set_gid_caller(delegee_gid)
+   dcred.set_gid_object(object_gid)
+   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(object_cred)
+   dcred.encode()
+   dcred.sign()
+
+   if opts.delegate_user:
+       dest_fn = os.path.join(sfi_dir, get_leaf(delegee_hrn) + "_" + get_leaf(object_hrn) + ".cred")
+   elif opts.delegate_slice:
+       dest_fn = os.path_join(sfi_dir, get_leaf(delegee_hrn) + "_slice_" + get_leaf(object_hrn) + ".cred")
+
+   dcred.save_to_file(dest_fn, save_parents = True)
+
+   print "delegated credential for", object_hrn, "to", delegee_hrn, "and wrote to", dest_fn
+
 # removed named registry record
 #   - have to first retrieve the record to be removed
 def remove(opts, args):
@@ -379,7 +477,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"]
@@ -398,17 +497,21 @@ def update(opts, args):
        if record.get_name() == user_cred.get_gid_object().get_hrn():
           cred = user_cred
        else:
-          create = get_auth_cred()
+          cred = get_auth_cred()
    elif record.get_type() in ["slice"]:
        try:
            cred = get_slice_cred(record.get_name())
        except ServerException, e:
-           if "PermissionError" in e.args[0]:
+           # XXX smbaker -- once we have better error return codes, update this
+           # to do something better than a string compare
+           if "Permission error" in e.args[0]:
                cred = get_auth_cred()
            else:
                raise
-   elif record.get_type() in ["sa", "ma", "node"]:
+   elif record.get_type() in ["authority"]:
        cred = get_auth_cred()
+   elif record.get_type() == 'node':
+        cred = get_auth_cred()
    else:
        raise "unknown record type" + record.get_type()
    return registry.update(cred, record)
@@ -438,8 +541,8 @@ def update(opts, args):
 # list instantiated slices
 def slices(opts, args):
    global slicemgr
-   user_cred = get_user_cred() 
-   results = slicemgr.slices(user_cred)
+   user_cred = get_user_cred()
+   results = slicemgr.get_slices(user_cred)
    display_list(results)
    return
 
@@ -448,13 +551,14 @@ def resources(opts, args):
    global slicemgr
    if args: 
        slice_cred = get_slice_cred(args[0])
-       result = slicemgr.resources(slice_cred, args[0])
+       result = slicemgr.get_resources(slice_cred, args[0])
    else:
        user_cred = get_user_cred()
-       result = slicemgr.resources(user_cred)   
-   display_rspec(result)
+       result = slicemgr.get_resources(user_cred)
+   format = opts.format      
+   display_rspec(result, format)
    if (opts.file is not None):
-      save_rspec_to_file(opts.file, result)
+      save_rspec_to_file(result, opts.file)
    return
 
 # created named slice with given rspec
@@ -478,20 +582,23 @@ def delete(opts, args):
 # start named slice
 def start(opts, args):
    global slicemgr
+   slice_hrn = args[0]
    slice_cred = get_slice_cred(args[0])
-   return slicemgr.start_slice(slice_cred)
+   return slicemgr.start_slice(slice_cred, slice_hrn)
 
 # stop named slice
 def stop(opts, args):
    global slicemgr
+   slice_hrn = args[0]
    slice_cred = get_slice_cred(args[0])
-   return slicemgr.stop_slice(slice_cred)
+   return slicemgr.stop_slice(slice_cred, slice_hrn)
 
 # reset named slice
 def reset(opts, args):
    global slicemgr
+   slice_hrn = args[0]
    slice_cred = get_slice_cred(args[0])
-   return slicemgr.reset_slice(slice_cred)
+   return slicemgr.reset_slice(slice_cred, slice_hrn)
 
 #
 #
@@ -500,9 +607,33 @@ def reset(opts, args):
 #
 #
 
-def display_rspec(rspec):
-   print rspec
-   return
+def display_rspec(rspec, format = 'rspec'):
+    if format in ['dns']:
+        spec = Rspec()
+        spec.parseString(rspec)
+        hostnames = []
+        nodespecs = spec.getDictsByTagName('NodeSpec')
+        for nodespec in nodespecs:
+            if nodespec.has_key('name') and nodespec['name']:
+                if isinstance(nodespec['name'], ListType):
+                    hostnames.extend(nodespec['name'])
+                elif isinstance(nodespec['name'], StringTypes):
+                    hostnames.append(nodespec['name'])
+        result = hostnames
+    elif format in ['ip']:
+        spec = Rspec()
+        spec.parseString(rspec)
+        ips = []
+        ifspecs = spec.getDictsByTagName('IfSpec')
+        for ifspec in ifspecs:
+            if ifspec.has_key('addr') and ifspec['addr']:
+                ips.append(ifspec['addr'])
+        result = ips 
+    else:     
+        result = rspec
+
+    print result
+    return
 
 def display_list(results):
     for result in results: