Changeset 5705


Ignore:
Timestamp:
09/09/09 17:12:57 (10 years ago)
Author:
pjkersha
Message:

Updated Session Manager service test configuration and nosetests.

Location:
TI12-security/trunk/python
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg_security_server/ndg/security/server/wsgi/openid/relyingparty/validation.py

    r5499 r5705  
    1919 
    2020from elementtree import ElementTree 
    21 from ndg.security.common.utils import getLocalName 
     21from ndg.security.common.utils.etree import QName 
    2222from ndg.security.common.utils.classfactory import instantiateClass 
    2323     
     
    115115         
    116116        for elem in root: 
    117             if getLocalName(elem).lower() == "validator":     
     117            if QName.getLocalPart(elem.tag).lower() == "validator":     
    118118                validatorConfig = IdPValidatorConfig() 
    119119                validatorConfig.className = elem.attrib["name"] 
     
    121121                parameters = {} 
    122122                for el in elem: 
    123                     if getLocalName(el).lower() == "parameter": 
     123                    if QName.getLocalPart(el.tag).lower() == "parameter": 
    124124                        if el.attrib["name"] in parameters: 
    125125                            raise XmlConfigReaderError('Duplicate parameter ' 
     
    141141 
    142142        for elem in root: 
    143             if getLocalName(elem).lower() == "attributeprovider": 
     143            if QName.getLocalPart(elem.tag).lower() == "attributeprovider": 
    144144                if validatorConfig is not None: 
    145145                    validatorConfig.parameters = parameters 
     
    149149                validatorConfig.className(elem.attrib("name")) 
    150150             
    151             elif getLocalName(elem).lower() == "parameter": 
     151            elif QName.getLocalPart(elem.tag).lower() == "parameter": 
    152152                if elem.attrib["name"] in parameters: 
    153153                    raise XmlConfigReaderError('Duplicate parameter name "%s" ' 
  • TI12-security/trunk/python/ndg_security_server/ndg/security/server/wsgi/zsi.py

    r5678 r5705  
    488488            SOAPBindingMiddleware.SERVICE_SOAP_BINDING_CLASSNAME_OPTNAME 
    489489                             
    490         if serviceSOAPBindingEnvironKeyNameOptName and \ 
     490        if serviceSOAPBindingEnvironKeyNameOptName in app_conf and \ 
    491491           serviceSOAPBindingClassNameOptName in app_conf: 
    492492            raise ZSIMiddlewareConfigError('Only "%s" or "%s" may be set; not ' 
  • TI12-security/trunk/python/ndg_security_test/ndg/security/test/config/sessionmanager/session-manager.ini

    r5648 r5705  
    131131 
    132132[filter:SessionManagerFilter] 
    133 paste.filter_app_factory = ndg.security.server.wsgi.zsi:SOAPBindingMiddleware 
    134 ServiceSOAPBindingClass = ndg.security.server.zsi.sessionmanager.SessionManagerWS 
    135 ServiceSOAPBindingPropPrefix = SessionManager 
    136 SessionManager.propPrefix = sessionManager 
    137 SessionManager.propFilePath = %(here)s/session-manager.ini 
    138 SessionManager.wsseSignatureVerificationFilterID = wsseSignatureVerificationFilter01 
     133paste.filter_app_factory = ndg.security.server.wsgi.zsi:SOAPBindingMiddleware.filter_app_factory 
     134serviceSOAPBindingClass = ndg.security.server.zsi.sessionmanager.SessionManagerWS 
     135serviceSOAPBindingPropPrefix = sessionmanager.service.soap.binding. 
     136sessionmanager.service.soap.binding.propPrefix = sessionManager 
     137sessionmanager.service.soap.binding.propFilePath = %(here)s/session-manager.ini 
     138sessionmanager.service.soap.binding.wsseSignatureVerificationFilterID = wsseSignatureVerificationFilter01 
    139139referencedFilters = wsseSignatureVerificationFilter01 
    140140path = /SessionManager 
     
    142142charset = utf-8 
    143143 
     144 
    144145[filter:wsseSignatureVerificationFilter] 
    145 paste.filter_app_factory = ndg.security.server.wsgi.wssecurity:SignatureVerificationFilter 
     146paste.filter_app_factory = ndg.security.server.wsgi.wssecurity:SignatureVerificationFilter.filter_app_factory 
    146147filterID = wsseSignatureVerificationFilter01 
    147148 
     149# Settings for WS-Security SignatureHandler class used by this filter 
     150wsseCfgFilePrefix = wssecurity 
     151 
     152# Verify against known CAs - Provide a space separated list of file paths 
     153wssecurity.caCertFilePathList=$NDGSEC_TEST_CONFIG_DIR/ca/ndg-test-ca.crt 
     154 
    148155[filter:wsseSignatureFilter] 
    149 paste.filter_app_factory = ndg.security.server.wsgi.wssecurity:ApplySignatureFilter 
     156paste.filter_app_factory = ndg.security.server.wsgi.wssecurity:ApplySignatureFilter.filter_app_factory 
    150157 
    151158# Reference the verification filter in order to be able to apply signature 
     
    157164writeResponse = True 
    158165 
    159  
    160 [WS-Security] 
    161 # 
    162 # OUTBOUND MESSAGE CONFIG 
    163  
    164 # Signature of an outbound message 
     166# Settings for WS-Security SignatureHandler class used by this filter 
     167wsseCfgFilePrefix = wssecurity 
    165168 
    166169# Certificate associated with private key used to sign a message.  The sign  
    167170# method will add this to the BinarySecurityToken element of the WSSE header.   
    168 signingCertFilePath=%(here)s/sm.crt 
    169 #signingCertFilePath=%(here)s/java-ca-server.crt 
     171wssecurity.signingCertFilePath=%(here)s/sm.crt 
    170172 
    171173# PEM encoded private key file 
    172 signingPriKeyFilePath=%(here)s/sm.key 
    173 #signingPriKeyFilePath=%(here)s/java-ca-server.key 
     174wssecurity.signingPriKeyFilePath=%(here)s/sm.key 
    174175 
    175176# Set the ValueType for the BinarySecurityToken added to the WSSE header for a 
     
    181182# binSecTokValType determines whether signingCert or signingCertChain  
    182183# attributes will be used. 
    183 reqBinSecTokValType=X509v3 
     184wssecurity.reqBinSecTokValType=X509v3 
    184185 
    185186# Add a timestamp element to an outbound message 
    186 addTimestamp=True 
     187wssecurity.addTimestamp=True 
    187188 
    188189# For WSSE 1.1 - service returns signature confirmation containing signature  
    189190# value sent by client 
    190 applySignatureConfirmation=True 
    191  
    192 # 
    193 # INBOUND MESSAGE CONFIG 
    194  
    195 # Provide a space separated list of file paths 
    196 caCertFilePathList=$NDGSEC_TEST_CONFIG_DIR/ca/ndg-test-ca.crt  
    197 #caCertFilePathList=$NDGSEC_TEST_CONFIG_DIR/ca/ndg-test-ca.crt $NDGSEC_TEST_CONFIG_DIR/ca/java-ca.crt 
    198  
     191wssecurity.applySignatureConfirmation=True 
    199192 
    200193# Logging configuration 
  • TI12-security/trunk/python/ndg_security_test/ndg/security/test/unit/nosetests.ini

    r5648 r5705  
    1313# 
    1414[nosetests] 
    15 tests: ./x509/test_x509.py, 
    16         ./x509/test_x509.py, 
    17         ./soap/test_soap.py, 
    18         ./configfileparsers/test_configfileparsers.py, 
    19         ./credentialwallet/test_credentialwallet.py, 
    20         ./xacml/test_xacml.py, 
    21         ./attributeauthorityclient/test_attributeauthorityclient.py, 
    22         ./sessionmanager/test_sessionmanager.py, 
    23         ./authz/pdp/test_proftp_pdp.py, 
     15verbosity: 3 
     16tests: ndg.security.test.unit.x509.test_x509, 
     17        ndg.security.test.unit.soap.test_soap, 
     18        ndg.security.test.unit.configfileparsers.test_configfileparsers, 
     19        ndg.security.test.unit.credentialwallet.test_credentialwallet, 
     20#       ndg.security.test.unit.xacml.test_xacml.py, 
     21        ndg.security.test.unit.attributeauthorityclient.test_attributeauthorityclient, 
     22        ndg.security.test.unit.sessionmanager.test_sessionmanager, 
     23        ndg.security.test.unit.authz.pdp.test_proftp_pdp, 
    2424#       ./sslclientauthnmiddleware/test_sslclientauthn.py, 
    25         ./openid/relyingparty/validation/test_validation.py, 
    26         ./xmlsec/etree/test_etree.py, 
     25        ndg.security.test.unit.openid.relyingparty.validation.test_validation, 
     26        ndg.security.test.unit.xmlsec.etree.test_etree 
    2727#       ./wsgi/authn/test_authn.py, 
    2828#       ./wsgi/ssl/test_ssl.py, 
    29         ./wsgi/authz/test_authz.py, 
    30         ./sessionmanagerclient/test_sessionmanagerclient.py, 
    31         ./saml/test_saml.py, 
    32         ./attributeauthority/test_attributeauthority.py, 
    33         ./attributeauthority/saml/test_samlinterface.py, 
    34         ./wssecurity/foursuite/client/test_echoclient.py, 
    35         ./wssecurity/dom/client/test_echoclient.py 
     29        ndg.security.test.unit.wsgi.authz.test_authz, 
     30        ndg.security.test.unit.sessionmanagerclient.test_sessionmanagerclient, 
     31        ndg.security.test.unit.saml.test_saml.py, 
     32        ndg.security.test.unit.attributeauthority.test_attributeauthority, 
     33        ndg.security.test.unit.attributeauthority.saml.test_samlinterface 
     34#       ./wssecurity/foursuite/client/test_echoclient.py, 
     35#       ./wssecurity/dom/client/test_echoclient.py 
    3636 
Note: See TracChangeset for help on using the changeset viewer.