Changeset 4157521

Timestamp:

Sep 19, 2011 2:31:55 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

cd360a0

Parents:

a55f2f9

Message:

Convert to libcreddy. Closed #18

File:

• fedd/fedd_to_abac.py (modified) (4 diffs)

fedd/fedd_to_abac.py

@@ -10 +10 @@
 
 from string import join
+
+import Creddy
 
 from federation.authorizer import abac_authorizer
@@ -29 +31 @@
                 default=False, help='Create the --dir directory')
         self.add_option('--debug', action='store_true', dest='debug',
-                default=False, help='Just print the creddy commands')
+                default=False, help='Just print the libcreddy parameters')
         self.add_option('--policy_only', action='store_const', const=False,
                 dest='make_authorizer', default=True, 
@@ -97 +99 @@
 def make_credentials(roles, cert, key, creds_dir, debug):
     """
-    From the dict of identities, indexed by fedid, call creddy to create the
+    From the dict of identities, indexed by fedid, call libcreddy to create the
     ABAC certificates.  Return a list of the created files.  If debug is true,
-    just print the creddy commands.
+    just print the creddy attribute creation parameters.
     """
     credfiles = []
@@ -106 +108 @@
             cf = '%s/%s%03d_attr.der' % \
                     (creds_dir or 'new_cert_dir', id.name, i)
-            cmd = ['creddy', '--attribute', 
-                    '--issuer=%s' % (cert or 'cert_file'),
-                    '--key=%s' % (key or 'key_file'), '--role=%s' % r,
-                    '--subject-id=%s' % k, '--out=%s' % cf ]
+
+            cid = Creddy.ID(cert)
+            cid.load_privkey(key)
+            cattr = Creddy.Attribute(cid, r, 3600 * 24 * 365 * 10)
+            cattr.principal(k)
+
             if debug:
-                print join(cmd)
+                print 'cert %s key %s role %s principal %s out %s' % \
+                        (cert, key, r, k, cf)
             else:
-                rv =  subprocess.call(cmd)
-                if rv != 0:
-                    raise RuntimeError('%s failed: %d' % (join(cmd), rv))
-                else:
-                    credfiles.append(cf)
+                cattr.bake()
+                cattr.write_name(cf)
+                credfiles.append(cf)
     return credfiles