Ignore:
Timestamp:
20/08/08 14:03:20 (11 years ago)
Author:
cbyrom
Message:

General refactoring and updating of code, including:

Removal of refC14nKw and singnedInfoC14nKw keywords in wsssecurity session manager config
(the refC14nInclNS and signedInfoC14nInclNS keywords are sufficient);
Creation of new DOM signature handler class, dom.py, based on the wsSecurity
class;
Abstraction of common code between dom.py and etree.py into new parent
class, BaseSignatureHandler?.py.
Fixing and extending use of properties in the SignatureHandler? code.
Fixing a few bugs with the original SignatureHandler? code.
Updating of test cases to new code/code structure.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/SessionMgrClientTest.py

    r4120 r4129  
    2323     
    2424from ndg.security.common.X509 import X509CertParse, X509CertRead 
    25 from ndg.security.common.wsSecurity import SignatureHandler as SigHdlr 
     25from ndg.security.common.wssecurity.dom import SignatureHandler as SigHdlr 
    2626 
    2727from os.path import expandvars as xpdVars 
     
    113113        # Inclusive namespace prefixes for Exclusive C14N 
    114114        try: 
    115             refC14nKw = {'unsuppressedPrefixes': 
    116                          self.cfg['setUp']['wssrefinclns'].split()}            
     115            refC14nInclNS = self.cfg['setUp']['wssrefinclns'].split()            
    117116        except KeyError: 
    118             refC14nKw = {'unsuppressedPrefixes':[]} 
    119  
    120         try: 
    121             signedInfoC14nKw = {'unsuppressedPrefixes': 
    122                             self.cfg['setUp']['wsssignedinfoinclns'].split()}           
     117            refC14nInclNS = [] 
     118 
     119        try: 
     120            signedInfoC14nInclNS = self.cfg['setUp']['wsssignedinfoinclns'].split()           
    123121        except KeyError: 
    124             signedInfoC14nKw = {'unsuppressedPrefixes':[]} 
     122            signedInfoC14nInclNS = [] 
    125123                 
    126124        setSignatureHandler = eval(self.cfg['setUp']['setsignaturehandler']) 
     
    138136                        signingPriKeyPwd=clntPriKeyPwd, 
    139137                        caCertFilePathList=caCertFilePathList, 
    140                         refC14nKw=refC14nKw, 
    141                         signedInfoC14nKw=signedInfoC14nKw, 
     138                        refC14nInclNS=refC14nInclNS, 
     139                        signedInfoC14nInclNS=signedInfoC14nInclNS, 
    142140                        tracefile=sys.stderr)  
    143141         
Note: See TracChangeset for help on using the changeset viewer.