Changeset 6e63513 for fedd/federation/util.py

Timestamp:

Nov 23, 2010 6:42:19 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

25f66c3

Parents:

353db8c

Message:

Checkpoint

File:

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

fedd/federation/util.py

@@ -10 +10 @@
 
 from socket import sslerror
+from tempfile import mkstemp
 
 from M2Crypto import SSL
@@ -267 +268 @@
     cert_re = re.compile('\s*-----BEGIN CERTIFICATE-----$') 
     type = None
+    print cert
     f = open(cert, 'r')
     for line in f:
@@ -290 +292 @@
         '''
         Wraps up the reqular expression to start and end a diversion, as well as
-        the open file that gets the lines.
+        the open file that gets the lines.  If fd is passed in, use that system
+        file (probably from a mkstemp.  Otherwise open the given filename.
         '''
-        def __init__(self, start, end, fn):
+        def __init__(self, start, end, fn=None, fd=None):
             self.start = re.compile(start)
             self.end = re.compile(end)
-            # Open the file securely with minimal permissions. NB file cannot
-            # exist before this call.
-            self.f = os.fdopen(os.open(fn,
-                (os.O_WRONLY | os.O_CREAT | os.O_TRUNC | os.O_EXCL), 0600),
-                'w')
+
+            if not fd:
+                # Open the file securely with minimal permissions. NB file
+                # cannot exist before this call.
+                fd = os.open(fn,
+                    (os.O_WRONLY | os.O_CREAT | os.O_TRUNC | os.O_EXCL), 0600)
+
+            self.f = os.fdopen(fd, 'w')
 
         def close(self):
@@ -305 +311 @@
 
     if not keyfile:
-        f, keyfile = mkstemp(suffix=".pem")
-        os.close(f);
+        kf, rkeyfile = mkstemp(suffix=".pem")
+    else:
+        kf, rkeyfile = None, keyfile
+
     if not certfile:
-        f, certfile = mkstemp(suffix=".pem")
-        os.close(f);
+        cf, rcertfile = mkstemp(suffix=".pem")
+    else:
+        cf, rcertfile = None, certfile
 
     # Initialize the diversions
-    divs = [diversion(s, e, fn) for s, e,fn in (
+    divs = [diversion(s, e, fn=pfn, fd=pfd ) for s, e, pfn, pfd in (
         ('\s*-----BEGIN RSA PRIVATE KEY-----$', 
             '\s*-----END RSA PRIVATE KEY-----$',
-            keyfile),
+            keyfile, kf),
         ('\s*-----BEGIN CERTIFICATE-----$', 
             '\s*-----END CERTIFICATE-----$',
-            certfile))]
+            certfile, cf))]
 
     # walk through the file, beginning a diversion when a start regexp
@@ -340 +349 @@
     # This is probably unnecessary.  Close all the diversion files.
     for d in divs: d.close()
-    return keyfile, certfile
+    return rkeyfile, rcertfile
 
 def find_pickle_problem(o, st=None):