Changeset 1510

Timestamp:

12/09/06 12:02:22 (13 years ago)

Author:

pjkersha

Message:

Working encryption handler. Note:

• SignatureHandler? code commented out for the moment - combine signature and encryption together later
• Needs validation against e.g. pyXMLSec

Location:

TI12-security/trunk/python/Tests/xmlsec/WS-Security

Files:

• wsSecurity.py (modified) (5 diffs)
• wsServer.py (modified) (1 diff)

TI12-security/trunk/python/Tests/xmlsec/WS-Security/wsSecurity.py

@@ -28 +28 @@
 import ZSI
 from ZSI.wstools.Namespaces import DSIG, ENCRYPTION, OASIS, WSU, WSA200403, \
-                                   SOAP
+                                   SOAP, SCHEMA # last included for xsi
                                    
 from ZSI.TC import ElementDeclaration,TypeDefinition
@@ -510 +510 @@
         # Encrypt required elements
         sharedKey = os.urandom(32)
-        print "Shared key = %s" % sharedKey
         encryptedData = AES.new(sharedKey, AES.MODE_ECB).encrypt(data)
         dataCiphValue = base64.encodestring(encryptedData).strip()
@@ -628 +627 @@
 
             # XPath reference - need to check for wsu namespace qualified?
-            #uriXPath = '//*[@wsu:Id="%s"]' % dataRefURI[1:]
-            uriXPath = '//*[@Id="%s"]' % dataRefURI[1:]
-            uriNode = xpath.Evaluate(uriXPath, 
-                                     contextNode=parsedSOAP.dom, 
-                                     context=ctxt)[0]
+            #encrNodeXPath = '//*[@wsu:Id="%s"]' % dataRefURI[1:]
+            encrNodeXPath = '//*[@Id="%s"]' % dataRefURI[1:]
+            encrNode = xpath.Evaluate(encrNodeXPath, 
+                                      contextNode=parsedSOAP.dom, 
+                                      context=ctxt)[0]
                 
-            dataEncrMethodNode = getElements(uriNode, 'EncryptionMethod')[0]     
+            dataEncrMethodNode = getElements(encrNode, 'EncryptionMethod')[0]     
             dataAlgorithm = dataEncrMethodNode.getAttributeNodeNS(None, 
                                                             "Algorithm").value
@@ -643 +642 @@
 
             # Get Data
-            dataCiphDataNode = getElements(uriNode, 'CipherData')[0]
+            dataCiphDataNode = getElements(encrNode, 'CipherData')[0]
             dataCiphValNode = getElements(dataCiphDataNode, 'CipherValue')[0]
         
@@ -652 +651 @@
             decryptedData = aes.decrypt(encryptedData)
             
-            # Parse the data and add to the EncryptedData parent
-            
-            # Remove the EncryptedData Element
-            
-            
+            # Parse the encrypted data - inherit from Reader as a fudge to 
+            # enable relevant namespaces to be added prior to parse
+            processorNss.update({'xsi': SCHEMA.XSI3})
+            class _Reader(Reader):
+                def initState(self, ownerDoc=None):
+                    Reader.initState(self, ownerDoc=ownerDoc)
+                    self._namespaces.update(processorNss)
+                    
+            rdr = _Reader()
+            dataNode = rdr.fromString(decryptedData, ownerDoc=parsedSOAP.dom)
+            
+            # Add decrypted element to parent and remove encrypted one
+            parentNode = encrNode._get_parentNode()
+            parentNode.appendChild(dataNode)
+            parentNode.removeChild(encrNode)
+            
+            from xml.dom.ext import ReleaseNode
+            ReleaseNode(encrNode)
+            
+            # Ensure body_root attribute is up to date in case it was
+            # previously encrypted
+            parsedSOAP.body_root = parsedSOAP.body.childNodes[0]
+            print decryptedData
             import pdb;pdb.set_trace()
-            print decryptedData
-        
-            
+           
 
 

TI12-security/trunk/python/Tests/xmlsec/WS-Security/wsServer.py

@@ -129 +129 @@
         
         sw.serialize(result, tc, rpc=rpc)
-                
-        signatureHandler = SignatureHandler(\
+         
+        # Test encryption handler independently of signature       
+#        signatureHandler = SignatureHandler(\
+#                                certFilePath='../../Junk-cert.pem',
+#                                priKeyFilePath='../../Junk-key.pem',
+#                                priKeyPwd=open('../../tmp2').read().strip())
+#        signatureHandler.sign(sw)
+        encryptionHandler = EncryptionHandler(\
                                 certFilePath='../../Junk-cert.pem',
                                 priKeyFilePath='../../Junk-key.pem',
                                 priKeyPwd=open('../../tmp2').read().strip())
-        signatureHandler.sign(sw)
+        encryptionHandler.encrypt(sw)
         
         return SendResponse(str(sw), **kw)