Changeset e83f2f2 for fedd/federation/client_lib.py

Timestamp:

Dec 14, 2010 6:58:28 PM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

c092b7f

Parents:

2627eb3

Message:

Move proofs around. Lots of changes, including fault handling.

File:

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

fedd/federation/client_lib.py

@@ -7 +7 @@
 
 from string import join
+from datetime import datetime
 
 
@@ -31 +32 @@
                 callback=self.expand_file,
                 type="string", help="my certificate file")
+        self.add_option("--auth_log", action="callback", dest="auth_log",
+                callback=self.expand_file, default=None,
+                type="string", help="Log authentication decisions to this file")
         self.add_option("--abac", action="callback", dest="abac_dir",
                 callback=self.expand_file,
@@ -53 +57 @@
                 const=sys.stderr, help="Print SOAP exchange to stderr")
 
-def exit_with_fault(exc, out=sys.stderr):
+def log_authentication(fn, action, outcome, proof):
+    f = open(fn, 'a')
+    print >>f, '%s %s at %s' % (action, outcome, datetime.now())
+    if isinstance(proof, list):
+        for p in proof:
+            print >>f, p.to_xml()
+    else:
+        print >>f, proof.to_xml()
+    f.close()
+
+
+def exit_with_fault(exc, action, opts, out=sys.stderr):
     """
     Print an error message and exit.  exc is the RPCException that caused the
@@ -72 +87 @@
         code = -1
 
+    if exc.code == service_error.access and opts.auth_log:
+        try:
+            log_authentication(opts.auth_log, action, 'failed', exc.proof)
+        except EnvironmentError, e:
+            print >>sys.stderr, "Failed to log to %s: %s" % \
+                    (e.filename, e.strerror)
+
     print>>out, codestr
     print>>out, "Description: %s" % exc.desc
@@ -81 +103 @@
     XMLPRC calls.
     """
-    def __init__(self, desc=None, code=None, errstr=None):
+    def __init__(self, desc=None, code=None, errstr=None, proof=None):
         RuntimeError.__init__(self)
         self.desc = desc
@@ -87 +109 @@
         else: self.code = -1
         self.errstr = errstr
+        self.proof = proof
 
 class CertificateMismatchError(RuntimeError): pass
@@ -208 +231 @@
             except service_error, e:
                 raise RPCException(desc=e.desc, code=e.code, 
-                        errstr=e.code_string())
+                        errstr=e.code_string(), proof=e.proof)
     elif transport == "xmlrpc":
         if serialize_only: