Step 2 of SSL client cert integration

 * Make the client use pyOpenSSL (so that ca support can be implemented)
 * Make the server handle SSL errors more cleanly

Remaining SSL client cert integration steps:
 * Implement the CertMgr plugin (ChrisV)
 * Implement server side cert policies
 * Implement no-cert fallback mode for client 



git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1872 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 5 insertions, 10 deletions

diff --git a/src/lib/Server/Component.py b/src/lib/Server/Component.py
index 3315276b2..e88b5cabe 100644
--- a/src/lib/Server/Component.py
+++ b/src/lib/Server/Component.py
@@ -67,12 +67,6 @@ class SSLServer(BaseHTTPServer.HTTPServer):
         print cert.get_pubkey()
         return ok
 
-
-#         print cert.subject_name_hash()
-#         
-#         print dir(cert.get_pubkey())
-#         return ok
-
     def handle_request(self):
         """Handle one request, possibly blocking."""
         try:
@@ -83,10 +77,11 @@ class SSLServer(BaseHTTPServer.HTTPServer):
             try:
                 self.process_request(request, client_address)
             except Exception, err:
-                print err
-                if err[0][0][0] == 'SSL routines':
-                    log.error("%s from %s" % (err[0][0][2], client_address[0]))
-                else:
+                print err, type(err)
+                try:
+                    if err[0][0][0] == 'SSL routines':
+                        log.error("%s from %s" % (err[0][0][2], client_address[0]))
+                except:
                     log.error("Unknown socket I/O failure from %s" % (client_address[0]), exc_info=1)
                 self.close_request(request)