Changeset 36f642f for fedd

Timestamp:

Sep 16, 2011 5:26:57 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, info-ops, master

Children:

cbe0570

Parents:

6031c9d

Message:

Save split keys in abac_authorizers fixes #12

File:

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

fedd/federation/authorizer.py

@@ -213 +213 @@
         self.me = me
         self.save_dir = load or save
+        self.local_files = False
         if self.save_dir:
             self.save_dir = os.path.abspath(self.save_dir)
@@ -228 +229 @@
 
                 self.key, self.me = abac_split_cert(self.me, keyfile, certfile)
+                self.local_files = True
             else:
                 raise abac_authorizer.bad_cert_error("Combination " + \
@@ -444 +446 @@
         return rv
 
+    def copy_file(self, src, dest, mode=0600):
+        '''
+        Copy src to dest with file mode mode.  May raise exceptions on file ops
+        '''
+        d = open(dest, 'w')
+        s = open(src, 'r')
+        d.write(s.read())
+        s.close()
+        d.close()
+        os.chmod(dest, mode)
+
+
+
     def save(self, dir=None):
         self.lock.acquire()
@@ -457 +472 @@
                 os.mkdir(dir)
 
+            # if self.key and self.me were split, copy the split files into the
+            # new directory.
+            if self.local_files:
+                self.copy_file(self.key, '%s/key.pem' % dir)
+                self.copy_file(self.me, '%s/cert.pem' % dir)
+                # Point the key and me members to the new locations for
+                # pickling
+                hold_key = self.key
+                hold_me = self.me
+                self.key = '%s/key.pem' % dir
+                self.me = '%s/cert.pem' % dir
+
             f = open("%s/state" % dir, "w")
             pickle.dump(self, f)
             f.close()
+
+            if self.local_files:
+                self.key = hold_key
+                self.me = hold_me
 
             if not os.access("%s/certs" %dir, os.F_OK):