Changeset 67fa1cf

Timestamp:

May 30, 2013 3:53:29 PM (11 years ago)

Author:

Ted Faber <faber@…>

Branches:

master

Children:

1f9c361, b213b53

Parents:

e8f2d4c

Message:

MOve over to ABAC 0.1.4

Location:

fedd

Files:

• access_to_abac.py (modified) (3 diffs)
• fedd_create.py (modified) (2 diffs)
• fedd_to_abac.py (modified) (2 diffs)
• fedd_to_user_certs.py (modified) (2 diffs)
• federation/authorizer.py (modified) (9 diffs)
• federation/proof.py (modified) (2 diffs)

fedd/access_to_abac.py

@@ -10 +10 @@
 from tempfile import mkdtemp
 
-import Creddy
+import ABAC
 
 from deter import fedid
@@ -326 +326 @@
     cfiles = []
     for i, c in enumerate(creds):
-        cid = Creddy.ID(cert)
+        cid = ABAC.ID(cert)
         cid.load_privkey(key)
-        cattr = Creddy.Attribute(cid, c.attr, 3600 * 24 * 365 * 10)
+        cattr = ABAC.Attribute(cid, c.attr, 3600 * 24 * 365 * 10)
         for r in c.req:
             if r.principal and r.link and r.attr:
@@ -340 +340 @@
         cattr.bake()
         fn = '%s/cred%d_attr.der' % (dir, i)
-        cattr.write_name(fn)
+        cattr.write_file(fn)
         cfiles.append(fn)
     return cfiles

fedd/fedd_create.py

@@ -6 +6 @@
 
 import ABAC
-import Creddy
 
 from string import join, ascii_letters
@@ -129 +128 @@
 
         try:
-            cid = Creddy.ID(certfile)
+            cid = ABAC.ID(certfile)
             cid.load_privkey(keyfile)
-            cattr = Creddy.Attribute(cid, 'acting_for', 3600 * 24 * 365 * 10)
+            cattr = ABAC.Attribute(cid, 'acting_for', 3600 * 24 * 365 * 10)
             cattr.principal("%s" % expid)
             cattr.bake()
-            cattr.write_name(fn)
+            cattr.write_file(fn)
         except RuntimeError:
             print >>sys.stderr, "Cannot create ABAC delegation. " + \

fedd/fedd_to_abac.py

@@ -11 +11 @@
 from string import join
 
-import Creddy
+import ABAC
 
 from federation.authorizer import abac_authorizer
@@ -114 +114 @@
                         (cert, key, r, k, cf)
             else:
-                cid = Creddy.ID(cert)
+                cid = ABAC.ID(cert)
                 cid.load_privkey(key)
-                cattr = Creddy.Attribute(cid, r, 3600 * 24 * 365 * 10)
+                cattr = ABAC.Attribute(cid, r, 3600 * 24 * 365 * 10)
                 cattr.principal(k)
                 cattr.bake()
-                cattr.write_name(cf)
+                cattr.write_file(cf)
                 credfiles.append(cf)
     return credfiles

fedd/fedd_to_user_certs.py

@@ -10 +10 @@
 from tempfile import mkdtemp
 
-import Creddy
+import ABAC
 
 from federation.authorizer import abac_authorizer
@@ -118 +118 @@
         try:
             os.chdir(td)
-            cid = Creddy.ID(cert)
+            cid = ABAC.ID(cert)
             cid.write_cert_name('issuer.pem')
             zf.write('issuer.pem')
             for i, r in enumerate(id.roles):
                 cf = '%s%03d_attr.der' % (id.name, i)
-                cid = Creddy.ID(cert)
+                cid = ABAC.ID(cert)
                 cid.load_privkey(key)
-                cattr = Creddy.Attribute(cid, r, 3600 * 24 * 365 * 10)
+                cattr = ABAC.Attribute(cid, r, 3600 * 24 * 365 * 10)
                 cattr.principal(k)
                 cattr.bake()
-                cattr.write_name(cf)
+                cattr.write_file(cf)
                 zf.write(cf)
             os.chdir(cwd)

fedd/federation/authorizer.py

@@ -15 +15 @@
 
 import ABAC
-import Creddy
 import pickle
 
@@ -258 +257 @@
 
         for dir in certs or []:
-            self.context.load_directory(dir)
+            self.resilient_load_directory(dir)
 
         if load:
@@ -266 +265 @@
         self.creddy_id = None
         try:
-            self.creddy_id = Creddy.ID(self.me)
+            self.creddy_id = ABAC.ID(self.me)
         except:
             raise abac_authorizer.bad_cert_error('Cannot load cert %s' \
@@ -277 +276 @@
             raise abac_authorized_bad_cert_error('Cannot load key %s' \
                     % self.key)
+
+    def resilient_load_directory(self, dirname):
+        '''
+        ABAC.Context.load_directory has foolish arbitrary filename
+        distinctions.  This tries to load the contents of dirname into the
+        authorizer's context first as IDs and then any that fail as attributes.
+        '''
+        files = os.listdir(dirname)
+        attrs = []
+        for f in files:
+            p = os.path.join(dirname, f)
+            if not os.path.isfile(p): continue
+            if self.context.load_id_file(p) != ABAC.ABAC_CERT_SUCCESS:
+                attrs.append(p)
+        for p in attrs:
+            self.context.load_attribute_file(p) 
 
 
@@ -318 +333 @@
             if data_list is None: data_list = []
             for fn in file_list:
-                # Try to parse file as a Creddy ID, so we can import PEM files
+                # Try to parse file as a ABAC ID, so we can import PEM files
                 try:
-                    cid = Creddy.ID(fn)
+                    cid = ABAC.ID(fn)
                     data_list.append(cid.cert_chunk())
                     continue
@@ -379 +394 @@
                 # This will simplify when we have libcreddy
                 try:
-                    attrcert = Creddy.Attribute(self.creddy_id, 
+                    attrcert = ABAC.Attribute(self.creddy_id, 
                             self.clean_attr(attr), 3600 * 24 * 365 * 10)
                     attrcert.principal("%s" % name)
@@ -575 +590 @@
                 attr = c.attribute_cert()
                 # NB: file naming conventions matter here.  The trailing_ID and
-                # _attr are required by ABAC.COntext.load_directory()
+                # _attr are required by ABAC.Context.load_directory().  We use
+                # resilient_load_directory now, but no sense pulling these out
+                # now.
                 if id and id not in seenid:
-                    f = open("%s/certs/ID_%05d_ID.der" % (dir, ii), "w")
+                    f = open("%s/certs/ID_%05d_ID.xml" % (dir, ii), "w")
                     f.write(id)
                     f.close()
@@ -583 +600 @@
                     seenid.add(id)
                 if attr and attr not in seenattr:
-                    f = open("%s/certs/attr_%05d_attr.der" % (dir, ai), "w")
+                    f = open("%s/certs/attr_%05d_attr.xml" % (dir, ai), "w")
                     f.write(attr)
                     f.close()
@@ -620 +637 @@
                 if self.key:
                     self.init_libcreddy_id()
-            self.context.load_directory("%s/certs" % dir)
+            self.resilient_load_directory("%s/certs" % dir)
             self.save_dir = dir
         except EnvironmentError, e:

fedd/federation/proof.py

@@ -3 +3 @@
 
 import ABAC
-import Creddy
 import sys
 import os, os.path
@@ -43 +42 @@
                 f.close()
 
-                cid = Creddy.ID(der_name)
+                cid = ABAC.ID(der_name)
 
                 tf = open(pem_name, 'w')