Changeset 4145

Timestamp:

28/08/08 09:55:31 (12 years ago)

Author:

pjkersha

Message:

Added capability for SSL client Authentication.

• Client cert and private key are passed to init via the clntCertFilePath and clntPriKeyFilePath keywords respectively.
• Tested against Apache mod_ssl setup with SSLRequire directive set to require a particular DN component.

File:

• TI12-security/trunk/python/ndg.security.common/ndg/security/common/m2CryptoSSLUtility.py (modified) (3 diffs)

TI12-security/trunk/python/ndg.security.common/ndg/security/common/m2CryptoSSLUtility.py

@@ -171 +171 @@
         @keyword writeTimeout: similar to read timeout'''
         
-        if 'postConnectionCheck' in kw:
-            self._postConnectionCheck = kw.pop('postConnectionCheck')
-        else:
-            self._postConnectionCheck = SSL.Checker.Checker
+        self._postConnectionCheck = kw.pop('postConnectionCheck',
+                                           SSL.Checker.Checker)
         
         if 'readTimeout' in kw:
@@ -191 +189 @@
         else:
             self.writeTimeout = HTTPSConnection.defWriteTimeout
-            
+    
+        self._clntCertFilePath = kw.pop('clntCertFilePath', None)
+        self._clntPriKeyFilePath = kw.pop('clntPriKeyFilePath', None)
+        
         _HTTPSConnection.__init__(self, *args, **kw)
+        
+        # load up certificate stuff
+        if self._clntCertFilePath is not None and \
+           self._clntPriKeyFilePath is not None:
+            self.ssl_ctx.load_cert(self._clntCertFilePath, 
+                                   self._clntPriKeyFilePath)
         
         
@@ -198 +205 @@
         '''Overload M2Crypto.httpslib.HTTPSConnection to enable
         custom post connection check of peer certificate and socket timeout'''
+
         self.sock = SSL.Connection(self.ssl_ctx)
         self.sock.set_post_connection_check_callback(