Changeset 2628e5d

Timestamp:

Sep 22, 2010 5:54:11 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

dc3a11e

Parents:

d39809f

Message:

Slight rearrangement, add a call to initialize the library and the loadfile
parameter for initialization.

File:

• fedd/federation/authorizer.py (modified) (1 diff)

fedd/federation/authorizer.py

@@ -185 +185 @@
     clean_attr_re = re.compile('[^A-Za-z_]+')
     cred_file_re = re.compile('.*\.der$')
-
-    def __init__(self, certs=None, me=None, key=None):
+    ABAC.libabac_init()
+
+    def __init__(self, certs=None, me=None, key=None, loadfile=None):
         self.bad_name = authorizer_base.bad_name
         self.attribute_error = authorizer_base.attribute_error
+        self.creddy = '/usr/local/bin/creddy'
         self.globals = set()
-        self.creddy = '/usr/local/bin/creddy'
+        self.lock = Lock()
         self.me = me
         self.key = key
         self.context = ABAC.Context()
-        self.lock = Lock()
-
         if me:
             self.fedid = fedid(file=self.me)
             self.context.load_id_file(self.me)
 
+        if isinstance(certs, basestring):
+            certs = [ certs ] 
+
         for dir in certs or []:
             self.context.load_directory(dir)
+
+        if loadfile:
+            self.load(loadfile)
 
     @staticmethod
     def clean_attr(attr):
         return abac_authorizer.clean_attr_re.sub('_', attr)
-
 
     def set_attribute(self, name=None, attr=None, cert=None):