Changeset e062282

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

Location:

fedd

Files:

• fedd_create.py (modified) (2 diffs)
• federation/authorizer.py (modified) (4 diffs)
• federation/client_lib.py (modified) (1 diff)
• federation/proof.py (modified) (3 diffs)

fedd/fedd_create.py

@@ -269 +269 @@
 if opts.debug > 1: print >>sys.stderr, resp_dict
 
-proof = proof.from_dict(resp_dict.get('proof', {}))
-if proof and opts.auth_log:
-    log_authentication(opts.auth_log, 'New (create)', 'succeeded', proof)
+p = proof.from_dict(resp_dict.get('proof', {}))
+if p and opts.auth_log:
+    log_authentication(opts.auth_log, 'New (create)', 'succeeded', p)
 # Save the experiment ID certificate if we need it
 try:
@@ -343 +343 @@
 if e_fedid: print "fedid: %s" % e_fedid
 if st: print "status: %s" % st
-proof = proof.from_dict(resp_dict.get('proof', {}))
-if proof and opts.auth_log:
-    log_authentication(opts.auth_log, 'Create', 'succeeded', proof)
+#proof = proof.from_dict(resp_dict.get('proof', {}))
+p_list = resp_dict.get('proof', {})
+if p_list and opts.auth_log:
+    for p in p_list:
+        log_authentication(opts.auth_log, 'Create', 'succeeded', 
+                proof.from_dict(p))

fedd/federation/authorizer.py

@@ -21 +21 @@
 import os, os.path
 import re
+import fcntl
 
 class authorizer_base:
@@ -208 +209 @@
     class bad_cert_error(RuntimeError): pass
 
-    def __init__(self, certs=None, me=None, key=None, load=None, save=None):
+    def __init__(self, certs=None, me=None, key=None, load=None, save=None,
+            update=None):
         self.creddy_id = None
         self.globals = set()
@@ -215 +217 @@
         self.save_dir = load or save
         self.local_files = False
+        self.update_dir = os.path.abspath(update)
         if self.save_dir:
             self.save_dir = os.path.abspath(self.save_dir)
@@ -648 +651 @@
         return found
 
+    def update(self):
+        rv = False
+        if update_dir is None: return True
+        lf = None
+        files = []
+        try:
+            lf = open('%s/lock' % self.update_dir, 'r')
+        except EnvironmentError, e:
+            return rv
+        try:
+            fcntl.flock(lf, fcntl.LOCK_EX)
+            files = os.listdir(update_dir)
+            rv = self.import_credentials(file_list=files)
+            try: 
+                for fn in files:
+                    os.remove(fn)
+            except EnvironmentError, e:
+                # failure to clear the update directory is no biggie
+                pass
+            rv = True
+        finally:
+            fcntl.flock(fl, fcntl.LOCK_UN)
+        return rv
+
+            
+        
+
     def __str__(self):
 

fedd/federation/client_lib.py

@@ -59 +59 @@
 def log_authentication(fn, action, outcome, proof):
     f = open(fn, 'a')
-    print >>f, '%s %s at %s' % (action, outcome, datetime.now())
+    print >>f, '<comment>%s %s at %s</comment>' % (action, outcome, datetime.now())
     if isinstance(proof, list):
         for p in proof:

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):