Changeset 65f6442

Timestamp:

Sep 20, 2011 11:06:44 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

1e9331e

Parents:

5954004

Message:

Move to lib creddy. Closes #22

File:

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

fedd/fedd_create.py

@@ -6 +6 @@
 
 import ABAC
+import Creddy
 
 from string import join, ascii_letters
@@ -102 +103 @@
             }
 
-def delegate(fedid, cert, dir, name=None, debug=False, 
-        creddy='/usr/local/bin/creddy'):
+def delegate(fedid, cert, dir, name=None, debug=False):
     '''
     Make the creddy call to create an attribute delegating rights to the new
@@ -127 +127 @@
             id_fn = '%s/%s_id.pem' % (dir, expid)
 
-        cmd = [creddy, '--attribute', '--issuer=%s' % certfile, 
-                '--key=%s' % keyfile,
-                '--role=acting_for', '--subject-id=%s' % expid, 
-                '--out=%s' % fn ]
-        if not debug:
-            if subprocess.call(cmd) != 0:
-                print >>sys.stderr, "Cannot delegate, things may fail"
-                return []
-        else:
-            print join(cmd)
+        try:
+            cid = Creddy.ID(certfile)
+            cid.load_privkey(keyfile)
+            cattr = Creddy.Attribute(cid, 'acting_for', 3600 * 24 * 365 * 10)
+            cattr.principal("%s" % expid)
+            cattr.bake()
+            cattr.write_name(fn)
+        except RuntimeError:
+            print >>sys.stderr, "Cannot create ABAC delegation. " + \
+                    "Did you run cert_to_fedid.py on your X.509 cert?"
             return []
 
@@ -142 +142 @@
         if context.load_id_file(certfile) != ABAC.ABAC_CERT_SUCCESS or \
                 context.load_attribute_file(fn) != ABAC.ABAC_CERT_SUCCESS:
-            print >>sys.stderr, "Cannot load delegation into ABAC. " + \
+            print >>sys.stderr, "Cannot load delegation into ABAC context. " + \
                     "Did you run cert_to_fedid.py on your X.509 cert?"
             return []