Changeset c573278 for fedd/fedd_create.py

Timestamp:

Nov 24, 2010 3:45:50 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

725c55d

Parents:

de7cb08

Message:

Checkpoint. Still lots to do

File:

• fedd/fedd_create.py (modified) (6 diffs)

fedd/fedd_create.py

@@ -4 +4 @@
 import re
 import subprocess
+
+import ABAC
 
 from string import join
@@ -12 +14 @@
         wrangle_standard_options, do_rpc, get_experiment_names, save_certfile,\
         get_abac_certs
-from federation.util import abac_split_cert
+from federation.util import abac_split_cert, abac_context_to_creds
 
 class fedd_create_opts(client_opts):
@@ -101 +103 @@
     value if the filename in which the certificate was stored.
     '''
-
     certfile = keyfile = None
     expid = "%s" % fedid
@@ -110 +111 @@
     try:
         keyfile, certfile = abac_split_cert(cert)
-        print "%s %s" % (keyfile, certfile)
 
         rv = 0
-        if name: fn = '%s/%s_attr.der' % (dir, name)
-        else: fn = '%s/%s_attr.der' % (dir, expid)
+        if name: 
+            fn ='%s/%s_attr.der' % (dir, name) 
+            id_fn = '%s/%s_id.pem' % (dir, name)
+        else: 
+            fn = '%s/%s_attr.der' % (dir, expid)
+            id_fn = '%s/%s_id.pem' % (dir, expid)
 
         cmd = [creddy, '--attribute', '--issuer=%s' % certfile, 
@@ -122 +126 @@
         if not debug:
             if subprocess.call(cmd) != 0:
-                return None
+                return []
         else:
             print join(cmd)
-            return None
-
-        f = open(fn, 'r')
-        rv = f.read()
-        f.close()
-        return rv
+            return []
+
+        context = ABAC.Context()
+        if context.load_id_file(certfile) != ABAC.ABAC_CERT_SUCCESS or \
+                context.load_attribute_file(fn) != ABAC.ABAC_CERT_SUCCESS:
+            return []
+        ids, attrs = abac_context_to_creds(context)
+
+        return ids + attrs
+
 
     finally:
@@ -236 +244 @@
 if e_fedid and opts.delegate:
     try:
-        cred = delegate(e_fedid, cert, opts.abac_dir, name=opts.exp_name)
-        if cred:
-            acerts.append(cred)
+        creds = delegate(e_fedid, cert, opts.abac_dir, name=opts.exp_name)
+        if creds:
+            acerts.extend(creds)
     except EnvironmentError, e:
         sys.exit("Cannot delegate rights %s: %s" % (e.filename, e.strerror));