Changeset cd360a0 for fedd

Timestamp:

Sep 19, 2011 2:50:32 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

52131d3

Parents:

4157521

Message:

Move to libcreddy. Closes #20

File:

• fedd/access_to_abac.py (modified) (2 diffs)

fedd/access_to_abac.py

@@ -9 +9 @@
 from optparse import OptionParser, OptionValueError
 from tempfile import mkdtemp
+
+import Creddy
 
 from federation.fedid import fedid
@@ -289 +291 @@
         creddy='/usr/local/bin/creddy'):
     '''
-    Make the creddy calls to create the attributes from the list of credential
+    Make the the attributes from the list of credential
     objects in the creds parameter.
     '''
-    def attrs(r):
-        '''
-        Convert an attribute into creddy --subject-id and --subject-role
-        parameters
-        '''
-        if r.principal and r.link and r.attr:
-            return ['--subject-id=%s' % r.principal, 
-                    '--subject-role=%s.%s' % (r.attr, r.link),
-                    ]
-        elif r.principal and r.attr:
-            return ['--subject-id=%s' % r.principal, 
-                    '--subject-role=%s' %r.attr]
-        elif r.principal:
-            return ['--subject-id=%s' % r.prinicpal]
-        else:
-            raise parse_error('Attribute without a principal?')
-
-    # main line of create_creds
     for i, c in enumerate(creds):
-        cmd = [creddy, '--attribute', '--issuer=%s' % cert, '--key=%s' % key,
-                '--role=%s' % c.attr, '--out=%s/cred%d_attr.der' % (dir, i)]
+        cid = Creddy.ID(cert)
+        cid.load_privkey(key)
+        cattr = Creddy.Attribute(cid, c.attr, 3600 * 24 * 365 * 10)
         for r in c.req:
-            cmd.extend(attrs(r))
-        if debug:
-            print join(cmd)
-        else:
-            rv = subprocess.call(cmd)
-            if rv != 0:
-                raise credential_error("%s: %d" % (join(cmd), rv))
+            if r.principal and r.link and r.attr:
+                cattr.linking_role(r.principal, r.attr, r.link)
+            elif r.principal and r.attr:
+                cattr.role(r.principal, r.attr)
+            elif r.principal:
+                cattr.principal(r.principal)
+            else:
+                raise parse_error('Attribute without a principal?')
+        cattr.bake()
+        cattr.write_name('%s/cred%d_attr.der' % (dir, i))
 
 def clear_dir(dir):