Changeset 962ea25

Timestamp:

Sep 23, 2010 5:49:51 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

add53ea

Parents:

835cf55

Message:

Move that gross fedid generation code into the fedid class

Location:

fedd/federation

Files:

• experiment_control.py (modified) (1 diff)
• fedid.py (modified) (3 diffs)

fedd/federation/experiment_control.py

@@ -1567 +1567 @@
         if 'experimentAccess' in req and 'X509' in req['experimentAccess']:
             expcert = req['experimentAccess']['X509']
-            tf = tempfile.NamedTemporaryFile()
-            tf.write(expcert)
-            tf.flush()
-            expid = fedid(file=tf.name)
-            tf.close()
+            expid = fedid(certstr=expcert)
             self.state_lock.acquire()
             if expid in self.state:

fedd/federation/fedid.py

@@ -23 +23 @@
     """
     HASHSIZE=20
-    def __init__(self, bits=None, hexstr=None, cert=None, file=None):
+    def __init__(self, bits=None, hexstr=None, cert=None, file=None, 
+            certstr=None):
         if bits != None:
             self.set_bits(bits)
@@ -32 +33 @@
         elif file != None:
             self.set_file(file)
+        elif certstr:
+            self.set_certstr(certstr)
         else:
             self.buf = None
@@ -85 +88 @@
         """Get the 160 bit buffer from the fedid"""
         return self.buf
+
+    def set_certstr(self, certstr):
+        """
+        Certstr is the contents of a certificate file.  Unfortunately we
+        basically have to stuff it back into a temp file to read it.
+        """
+        tf = tempfile.NamedTemporaryFile()
+        tf.write(certstr)
+        tf.flush()
+        self.set_file(tf.name)
+        tf.close()
 
     def set_file(self, file):