Changeset 8cf2c507 for fedd

Timestamp:

Dec 10, 2010 10:28:52 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

f4f036f

Parents:

ddf0903

Message:

Remove a race condition in the save member. The authorizer's lock was being nulled to work around a pickling issue (my limited understanding of pickling). The pickling process has been made cleaner, and as a result the save cleaner and safer.

File:

• fedd/federation/authorizer.py (modified) (5 diffs)

fedd/federation/authorizer.py

@@ -223 +223 @@
             if rv != 0:
                 raise abac_authorizer.bad_name(
-                        'Cannot load identity from %s' % me.cert)
+                        'Cannot load identity from %s' % me)
         else:
             self.fedid = None
@@ -235 +235 @@
         if load:
             self.load(load)
+
+    # Modify the pickling operations so that the context and lock are not
+    # pickled
+
+    def __getstate__(self):
+        d = self.__dict__.copy()
+        del d['lock']
+        del d['context']
+        return d
+
+    def __setstate__(self, d):
+        # Import everything from the pickle dict (except what we excluded in
+        # __getstate__)
+        self.__dict__.update(d)
+        # Initialize the unpicklables
+        self.context = ABAC.Context()
+        self.lock = Lock()
 
     @staticmethod
@@ -421 +438 @@
             if not os.access(dir, os.F_OK):
                 os.mkdir(dir)
-            # These are unpicklable, so set them aside
-            context = self.context
-            lock = self.lock
-            self.context = None
-            self.lock = None
 
             f = open("%s/state" % dir, "w")
@@ -433 +445 @@
             if not os.access("%s/certs" %dir, os.F_OK):
                 os.mkdir("%s/certs" % dir)
-            seenid = set()
-            seenattr = set()
-
-            #restore unpicklable state 
-            self.context = context
-            self.lock = lock
-            #remove old certs
+
+            # Clear the certs subdir
             for fn in [ f for f in os.listdir("%s/certs" % dir) \
                     if abac_authorizer.cred_file_re.match(f)]:
                 os.unlink('%s/certs/%s' % (dir, fn))
+
+            # Save the context
             ii = 0
             ai = 0
+            seenid = set()
+            seenattr = set()
             for c in self.context.credentials():
                 id = c.issuer_cert()
@@ -463 +474 @@
                     seenattr.add(attr)
         except EnvironmentError, e:
-            # If we've mislaid self.lock, release lock (they're the same object)
-            if self.lock: self.lock.release()
-            elif lock: lock.release()
+            self.lock.release()
             raise e
         except pickle.PickleError, e:
-            # If we've mislaid self.lock, release lock (they're the same object)
-            if self.lock: self.lock.release()
-            elif lock: lock.release()
+            self.lock.release()
             raise e
         self.lock.release()