Changeset e062282 for fedd/federation/proof.py

Timestamp:

Jul 7, 2012 5:42:28 PM (12 years ago)

Author:

Ted Faber <faber@…>

Branches:

compt_changes, master

Children:

7718539

Parents:

cd5b279 (diff), d064566 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

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

fedd/federation/proof.py

@@ -3 +3 @@
 
 import ABAC
+import Creddy
 import sys
 import os, os.path
@@ -9 +10 @@
 from base64 import b64encode, b64decode
 from xml.parsers.expat import ParserCreate
+from tempfile import mkdtemp
+from shutil import rmtree
 
 class proof:
@@ -29 +32 @@
         ids = set([c.issuer_cert() for c in self.creds])
         attrs = set([c.attribute_cert() for c in self.creds])
-        return list(ids) + list(attrs)
+        out_ids = []
+        d = mkdtemp()
+        for i, c in enumerate(ids):
+            try:
+                der_name = os.path.join(d, 'file%04d.der' % i)
+                pem_name = os.path.join(d, 'file%04d.pem' % i)
+                f = open(der_name, 'w')
+                f.write(c)
+                f.close()
+
+                cid = Creddy.ID(der_name)
+
+                tf = open(pem_name, 'w')
+                cid.write_cert(tf)
+                tf.close()
+                tf = open(pem_name, 'r')
+                out_ids.append(tf.read())
+                tf.close()
+            except EnvironmentError, e:
+                print "Certs to creds Error: %s" % e
+                pass
+        rmtree(d)
+
+        return out_ids + list(attrs)
 
     def __str__(self):