Changeset 4052 for TI12-security/trunk

Timestamp:

18/07/08 16:00:44 (11 years ago)

Author:

pjkersha

Message:

Successfully tested echo client (ndg.security.test.wsSecurity.client) with DOM based C14N vs. echo server running ElementTree C14N (security/python/Tests/etreewss/server)

• fixed _verifyTimestamp in ndg.security.common.wsSecurity.SignatureHandler?
• Fixed logging for ndg.security.test.wsSecurity.client.echoClientTest

Location:

TI12-security/trunk/python

Files:

• Tests/etreewss/server/echoServer.cfg (modified) (1 diff)
• ndg.security.common/ndg/security/common/wsSecurity.py (modified) (3 diffs)
• ndg.security.common/ndg/security/common/wssecurity/etree.py (modified) (1 diff)
• ndg.security.test/ndg/security/test/wsSecurity/client/echoClientTest.py (modified) (1 diff)

TI12-security/trunk/python/Tests/etreewss/server/echoServer.cfg

@@ -9 +9 @@
 [setUp]
 hostname = localhost
-#port = 7000
-port = 7100
+port = 7000
+#port = 7100
 path = /Echo
 wsseCfgFilePath = $NDGSEC_WSSESRV_UNITTEST_DIR/wssecurity.cfg

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

@@ -758 +758 @@
         
 
-    def _verifyTimeStamp(self, parsedSOAP, ctxt):
+    def _verifyTimeStamp(self, parsedSOAP, ctxt, timestampMustBeSet=False):
         """Call from verify to check timestamp if found.  
         
@@ -770 +770 @@
 
         try:
-            timestampNode = xpath.Evaluate('//wsse:Timestamp',
+            timestampNode = xpath.Evaluate('//wsu:Timestamp',
                                            contextNode=parsedSOAP.dom,
                                            context=ctxt)[0]
         except:
-            log.warning("Verifying message - No timestamp element found")
-            return
+            msg = "Verifying message - No timestamp element found"
+            if timestampMustBeSet:
+                raise TimestampError(msg)
+            else:
+                log.warning(msg)
+                return
         
         # Time now 
         dtNow = datetime.utcnow()
-        
-        createdNode = timestampNode.getElementsByTagName("Created")
-        
+        import pdb;pdb.set_trace()
+        try:
+            createdNodeText = getElements(timestampNode, "Created")[0].\
+                                    childNodes[0].nodeValue
+        except IndexError:
+            raise TimestampError("Verifying message - No Created timestamp "
+                                 "sub-element found")
+            
         # Workaround for fractions of second
         try:
-            [createdDateTime, createdSecFraction]=createdNode.nodeValue.split()
+            createdDateTime, strCreatedSecFraction = createdNodeText.split('.')
+                                            
+            strCreatedSecFraction = strCreatedSecFraction.split('Z')[0]
+            createdExp = -int(len(strCreatedSecFraction))
+            createdSecFraction = int(strCreatedSecFraction) * 10 ** createdExp
+
         except ValueError, e:
             raise ValueError("Parsing timestamp Created element: %s" % e)
         
         dtCreated = datetime.strptime(createdDateTime, '%Y-%m-%dT%H:%M:%S')
-        dtCreated += timedelta(seconds=int(createdSecFraction))
+        dtCreated += timedelta(seconds=createdSecFraction)
         if dtCreated >= dtNow:
             raise TimestampError(\
@@ -795 +809 @@
                 (dtCreated, dtNow))
         
-        expiresNode = timestampNode.getElementsByTagName("Expires")
-        if expiresNode is None:
-            log.warning(\
-                "Verifying message - No Expires element found in Timestamp")
-            return
-
         try:
-            [expiresDateTime, expiresSecFraction]=expiresNode.nodeValue.split()
+            expiresNodeText = getElements(timestampNode, "Expires")[0].\
+                                    childNodes[0].nodeValue
+        except IndexError:
+            raise TimestampError("Verifying message - No Expires element "
+                                 "found in Timestamp")
+
+        try:
+            expiryDateTime, strExpirySecFraction = expiresNodeText.split('.')
+            
+            strExpirySecFraction = strExpirySecFraction.split('Z')[0]
+            expiryExp = -int(len(strExpirySecFraction))
+            expirySecFraction = int(strExpirySecFraction) * 10 ** expiryExp
+
         except ValueError, e:
             raise ValueError("Parsing timestamp Expires element: %s" % e)
         
-        dtCreated = datetime.strptime(expiresDateTime, '%Y-%m-%dT%H:%M:%S')
-        dtCreated += timedelta(seconds=int(createdSecFraction))
-        if dtExpiry > dtNow:
+        dtExpiry = datetime.strptime(expiryDateTime, '%Y-%m-%dT%H:%M:%S')
+        dtExpiry += timedelta(seconds=expirySecFraction)
+        if dtExpiry < dtNow:
             raise TimestampError(\
                 "Timestamp expiry time %s is after the current time %s" % \

TI12-security/trunk/python/ndg.security.common/ndg/security/common/wssecurity/etree.py

@@ -836 +836 @@
                                          namespaces=self._processorNSs)
         if expiresElem is None:
-            raise TimestampError(\
-                "Verifying message - No Expires element found in Timestamp")
-            return
+            raise TimestampError("Verifying message - No Expires element "
+                                 "found in Timestamp")
 
         try:

TI12-security/trunk/python/ndg.security.test/ndg/security/test/wsSecurity/client/echoClientTest.py

@@ -18 +18 @@
 from os.path import join as jnPath
 mkPath = lambda file: jnPath(os.environ['NDGSEC_WSSECLNT_UNITTEST_DIR'], file)
+
+import logging
+logging.basicConfig(level=logging.DEBUG)
 
 class EchoClientTestCase(unittest.TestCase):