Changeset dee164e for fedd/federation/experiment_control.py

Timestamp:

Nov 30, 2010 7:20:16 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

c324ad3

Parents:

4692a16

Message:

Looks like internal works now.

Had to add default entries to the access list to accomodate that, and discovered that ABAC requires strings - not unicode.

Moved lookup_access into the aceess class as most should be able to use it directly now.

File:

• fedd/federation/experiment_control.py (modified) (2 diffs)

fedd/federation/experiment_control.py

@@ -1999 +1999 @@
             for tb in [ t for t in topo if t not in allocated]:
                 #XXX: ABAC
-                self.get_access(tb, None, tbparams, access_user, masters, tbmap)
+                if self.auth_type =='legacy':
+                    self.get_access(tb, None, tbparams, access_user, 
+                            masters, tbmap)
+                elif self.auth_type == 'abac':
+                    self.get_abac_access(tb, tbparams, fid, masters, tbmap, 
+                            expid, expcert_file)
+                else:
+                    raise service_error(service_error.internal, 
+                            "Unknown auth_type %s" % self.auth_type)
                 allocated[tb] = 1
                 store_keys = topo[tb].get_attribute('store_keys')
@@ -2044 +2052 @@
             if self.state_filename: self.write_state()
             self.state_lock.release()
+            if tmpdir and self.cleanup:
+                self.remove_dirs(tmpdir)
             raise e