Changeset b67fd22

Timestamp:

Dec 10, 2010 1:41:55 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

e65150a

Parents:

f4f036f

Message:

Remove abac credentials when the experiment is removed.

File:

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

fedd/federation/experiment_control.py

@@ -1083 +1083 @@
         """
 
-        for p, a in attrs:
-            self.auth.unset_attribute(p, a)
-        self.auth.save()
-
         if need_state_lock: self.state_lock.acquire()
-        self.state[expid]['auth'] = set()
+        if expid in self.state and 'auth' in self.state[expid]:
+            for p, a in self.state[expid]['auth']:
+                self.auth.unset_attribute(p, a)
+            self.state[expid]['auth'] = set()
         if self.state_filename: self.write_state()
         if need_state_lock: self.state_lock.release()
+        self.auth.save()
 
 
@@ -1118 +1118 @@
                 if status and status == 'failed':
                     # remove the old access attributes
-                    self.clear_experiment_authorization(self.state[eid]['auth'],
+                    self.clear_experiment_authorization(eid,
                             need_state_lock=False)
                     overwrite = True
@@ -2367 +2367 @@
             self.state_lock.acquire()
             for id in ids:
+                self.clear_experiment_authorizaton(id, need_state_lock=False)
                 if id in self.state: del self.state[id]