Changeset 7206e5a for fedd/federation/client_lib.py

Timestamp:

Sep 23, 2010 5:44:47 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

835cf55

Parents:

09b1e9d

Message:

checkpoint: new works pretty well

File:

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

fedd/federation/client_lib.py

@@ -80 +80 @@
         self.errstr = errstr
 
+class CertificateMismatchError(RuntimeError): pass
+
 
 def get_user_cert():
@@ -97 +99 @@
                 if os.path.isfile("%s/%s" % (dir,p))]:
             f = open(fn, 'r')
-            rv.append(join(f))
+            rv.append(f.read())
             f.close()
     return rv
@@ -138 +140 @@
     return (cert, fid, url)
 
-def save_certfile(out_certfile, ea):
+def save_certfile(out_certfile, ea, check_cert=None):
     """
     if the experiment authority section in ea has a certificate and the
     out_certfile parameter has a place to put it, save the cert to the file.
-    EnvronnemtError s can come from the file operations.
+    EnvronmentError s can come from the file operations.  If check_cert is
+    given, the certificate in ea is compared with it and if they are not equal,
+    a CertificateMismatchError is raised.
     """
     if out_certfile and ea and 'X509' in ea:
+        out_cert = ea['X509']
+        if check_cert and check_cert != out_cert:
+            raise CertificateMismatchError()
         f = open(out_certfile, "w")
-        print >>f, ea['X509']
+        f.write(out_cert)
         f.close()