Changeset 2092 for TI12-security

Timestamp:

01/02/07 14:01:56 (13 years ago)

Author:

pjkersha

Message:

python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py:
uncommented disconnect call arguments

python/ndg.security.common/ndg/security/common/wsSecurity.py:
Added 'ec' into prefix list for exclusive canonicalization of the SignedInfo? section. This
fixes bug with signature for test3ProxyCertConnect test. TODO: fix test4CookieDisconnect
'block type is not 01' verify error.

Location:

TI12-security/trunk/python

Files:

• ndg.security.common/ndg/security/common/wsSecurity.py (modified) (3 diffs)
• ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py (modified) (1 diff)

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

@@ -353 +353 @@
         
         # Signed Info - Canonicalization method
+        #
+        # Added 'ec' to list P J Kershaw 01/02/07
         signedInfoC14nKw = {}
-        signedInfoC14nKw['unsuppressedPrefixes'] = ['xsi', 'xsd', 'SOAP-ENV', 'ds', 'wsse']
+        signedInfoC14nKw['unsuppressedPrefixes'] = \
+            ['xsi', 'xsd', 'SOAP-ENV', 'ds', 'wsse', 'ec']
         c14nMethodElem = signedInfoElem.createAppendElement(DSIG.BASE,
                                                     'CanonicalizationMethod')
@@ -653 +656 @@
             # which case the verifying cert will need to have been set 
             # elsewhere
+            binSecTokNode = None
             pass 
         
         
-        try:
-            b64EncX509Cert = self.__class__.__beginCert + \
+        if binSecTokNode:
+            try:
+                b64EncX509Cert = self.__class__.__beginCert + \
                          str(binSecTokNode.childNodes[0]._get_nodeValue()) + \
                          self.__class__.__endCert
-                         
-            self.__setVerifyingCert(b64EncX509Cert)
-        except Exception, e:
-            raise VerifyError, "Error extracting BinarySecurityToken from " +\
-                                "WSSE header: " + str(e)
+                             
+                self.__setVerifyingCert(b64EncX509Cert)
+            except Exception, e:
+                raise VerifyError, "Error extracting BinarySecurityToken " + \
+                                   "from WSSE header: " + str(e)
         
         if self.__verifyingCert is None:
@@ -670 +675 @@
                 "of the signature"
         
-        
+        import pdb;pdb.set_trace()
         # Extract RSA public key from the cert
         rsaPubKey = self.__verifyingCert.m2CryptoX509.get_pubkey().get_rsa()

TI12-security/trunk/python/ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py

@@ -125 +125 @@
         self.clnt.signatureHandler.signingCertPriKey = self.proxyPriKey
         
-        self.clnt.disconnect(#userCert=self.userCert,
-                             #sessCookie=str(self.sessCookie)
-                             #sessID="A",
-                             #encrSessionMgrURI="B"
-                             )
+        self.clnt.disconnect(userCert=self.userCert,
+                             sessCookie=str(self.sessCookie))
         
         print "User disconnected from Session Manager:\n%s" % self.sessCookie