Changeset 9be06f0 for fedd

Timestamp:

Apr 6, 2012 3:19:59 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

cf7bc45

Parents:

cde9b98

Message:

Be more principled about loading credentials

File:

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

fedd/federation/authorizer.py

@@ -302 +302 @@
 
     def import_credentials(self, file_list=None, data_list=None):
+        '''
+        Import a list of credentials.  Be careful about dependencies and only
+        use one logic loop.  if files are given, append them to the list of
+        chunks and then try to read each chunk as an ID and then the failed
+        ones as attributes.
+        '''
+        if file_list:
+            if data_list is None: data_list = []
+            for fn in file_list:
+                try:
+                    f = open(fn, 'r')
+                    data_list.append(f.read())
+                    f.close()
+                except EnvironmentError, e:
+                    # Ignore unreadable files
+                    pass
+        # Now one way or another data_list is ready
         if data_list:
-            return any([self.import_credential(data=d) for d in data_list])
-        elif file_list:
-            return any([self.import_credential(file=f) for f in file_list])
+            rv = False
+            attr_list = [ ]
+            for d in data_list:
+                if self.context.load_id_chunk(d) != ABAC.ABAC_CERT_SUCCESS:
+                    attr_list.append(d)
+                else:
+                    rv = True
+
+            for d in attr_list:
+                v = self.context.load_attribute_chunk(d) 
+                if v == ABAC.ABAC_CERT_SUCCESS:
+                    rv = True
+            return rv
         else:
             return False