Changeset 4139


Ignore:
Timestamp:
27/08/08 14:54:16 (11 years ago)
Author:
cbyrom
Message:

Further standardise property keywords - consolidating caCertFileList into
caCertFilePathList.

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

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/AttAuthority/__init__.py

    r4138 r4139  
    164164        # Check CA certificate 
    165165        log.debug("Reading and checking X.509 CA certificate ...") 
    166         for caCertFile in self.__prop['caCertFileList']: 
     166        for caCertFile in self.__prop['caCertFilePathList']: 
    167167            caCert = X509Cert(caCertFile) 
    168168            caCert.read() 
     
    461461        # First cert in list corresponds to the private key 
    462462        attCert.certFilePathList = [self.__prop['signingCertFilePath']] + \ 
    463                                     self.__prop['caCertFileList'] 
    464          
     463                                                                self.__prop['caCertFilePathList'] 
     464                                                                 
    465465        attCert.signingKeyFilePath = self.__prop['signingPriKeyFilePath'] 
    466466        attCert.signingKeyPwd = self.__prop['signingPriKeyPwd'] 
     
    565565            try: 
    566566                # Give path to CA cert to allow check 
    567                 userAttCert.certFilePathList = self.__prop['caCertFileList'] 
     567                userAttCert.certFilePathList = self.__prop['caCertFilePathList'] 
    568568                userAttCert.isValid(raiseExcep=True) 
    569569                 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/__init__.py

    r4138 r4139  
    901901            try:    
    902902                userSess = UserSession(credRepos=self.__credRepos,  
    903                              caCertFilePathList=self.__prop['caCertFileList'], 
     903                             caCertFilePathList=self.__prop['caCertFilePathList'], 
    904904                             wssSignatureHandlerKw=wssSignatureHandlerKw, 
    905905                             *creds)       
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/attAuthority.cfg

    r4138 r4139  
    3333sslCACertDir: $NDGSEC_DIR/conf/certs/ca 
    3434 
    35 # CA Certificates used to verify X.509 certs used in Attribute Certificates. 
    36 # The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    37 # values should be delimited by a space 
    38 caCertFileList: $NDGSEC_DIR/conf/certs/ca/cacert.pem   
    39  
    4035# Lifetime is measured in seconds 
    4136attCertLifetime: 86400  
     
    6560# SOAP Signature Handler settings 
    6661[WS-Security] 
     62# CA Certificates used to verify X.509 certs used in Attribute Certificates. 
     63# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
     64# values should be delimited by a space 
     65caCertFilePathList: $NDGSEC_DIR/conf/certs/ca/cacert.pem   
     66 
    6767# 
    6868# OUTBOUND MESSAGE CONFIG 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/attAuthority.tac

    r4138 r4139  
    257257                                        signingPriKeyFilePath=srv.aa['signingPriKeyFilePath'], 
    258258                                        signingPriKeyPwd=srv.aa['signingPriKeyPwd'], 
    259                                         caCertFilePathList=srv.aa.get('caCertFileList'), 
     259                                        caCertFilePathList=srv.aa.get('caCertFilePathList'), 
    260260                                        refC14nInclNS=refC14nInclNS, 
    261261                                        signedInfoC14nInclNS=signedInfoC14nInclNS, 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/attAuthorityProperties.xml

    r4138 r4139  
    3838            The CA certificates of other NDG trusted sites should go here. 
    3939        --> 
    40             <caCertFileList> 
     40            <caCertFilePathList> 
    4141            <caCertFile>$NDGSEC_DIR/conf/certs/ca/cacert.pem</caCertFile> 
    42             </caCertFileList> 
     42            </caCertFilePathList> 
    4343            <!-- Set the value type of the server cert --> 
    4444        <reqBinSecTokValType>X509v3</reqBinSecTokValType> 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/sessionMgr.cfg

    r4138 r4139  
    2626# useSSL is blank  
    2727sslCACertDir: $NDGSEC_DIR/conf/certs/ca 
    28  
    29 # CA Certificates used to verify X.509 certs used in Attribute Certificates. 
    30 # The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    31 # values should be delimited by a space 
    32 caCertFileList: $NDGSEC_DIR/conf/certs/ca/cacert.pem   
    3328  
    3429# Domain defaults to the server host - any more generic setting could be a  
     
    4338# 
    4439# OUTBOUND MESSAGE CONFIG 
     40 
     41# CA Certificates used to verify X.509 certs used in Attribute Certificates. 
     42# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
     43# values should be delimited by a space 
     44caCertFilePathList: $NDGSEC_DIR/conf/certs/ca/cacert.pem   
    4545 
    4646# Signature of an outbound message 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/sessionMgr.tac

    r4138 r4139  
    226226                            signingPriKeyFilePath=srv.sm['signingPriKeyFilePath'], 
    227227                            signingPriKeyPwd=srv.sm['signingPriKeyPwd'], 
    228                             caCertFilePathList=srv.sm.get('caCertFileList'), 
     228                            caCertFilePathList=srv.sm.get('caCertFilePathList'), 
    229229                                        refC14nInclNS=refC14nInclNS, 
    230230                                        signedInfoC14nInclNS=signedInfoC14nInclNS, 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/conf/sessionMgrProperties.xml

    r4138 r4139  
    3939            The CA certificates of other NDG trusted sites should go here. 
    4040            --> 
    41         <caCertFileList> 
     41        <caCertFilePathList> 
    4242                <caCertFile>$NDGSEC_DIR/conf/certs/ca/cacert.pem</caCertFile> 
    43         </caCertFileList> 
     43        </caCertFilePathList> 
    4444            <!--  
    4545        Set the certificate used to verify the signature of messages from the  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteAAttAuthority.cfg

    r4138 r4139  
    6666# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    6767# values should be delimited by a space 
    68 caCertFileList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
     68caCertFilePathList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
    6969 
    7070# Signature of an outbound message 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteAAttAuthorityProperties.xml

    r4138 r4139  
    1212    --> 
    1313    <sslCACertDir>$NDGSEC_AACLNT_UNITTEST_DIR/ca</sslCACertDir> 
     14        <!-- WS-Security settings --> 
    1415    <!--  NB, if no signature handling is required, do not include this element --> 
    15     <!--  
    16         WS-Security settings  
    17         --> 
    1816    <WS-Security> 
    1917        <signingCertFilePath>$NDGSEC_AACLNT_UNITTEST_DIR/siteA-aa.crt</signingCertFilePath> 
     
    2220                <refC14nInclNS></refC14nInclNS> 
    2321                <signedInfoC14nInclNS></signedInfoC14nInclNS> 
    24             <caCertFileList> 
     22            <caCertFilePathList> 
    2523            <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    2624                <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
     
    3129            <caCertFile>/etc/grid-security/certificates/abcdef01.0</caCertFile> 
    3230                --> 
    33             </caCertFileList> 
     31            </caCertFilePathList> 
    3432            <!-- Set the value type of the server cert --> 
    3533        <reqBinSecTokValType>X509v3</reqBinSecTokValType> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteBAttAuthority.cfg

    r4138 r4139  
    6666# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    6767# values should be delimited by a space 
    68 caCertFileList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
     68caCertFilePathList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
    6969 
    7070# Signature of an outbound message 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/attAuthority/siteBAttAuthorityProperties.xml

    r4138 r4139  
    1111    --> 
    1212    <sslCACertDir>$NDGSEC_AACLNT_UNITTEST_DIR/ca</sslCACertDir> 
     13        <!-- WS-Security settings --> 
    1314    <!--  NB, if no signature handling is required, do not include this element --> 
    1415    <WS-Security> 
    15                 <!-- WS-Security settings --> 
    1616        <signingCertFilePath>$NDGSEC_AACLNT_UNITTEST_DIR/siteB-aa.crt</signingCertFilePath> 
    17             <caCertFileList> 
     17        <signingPriKeyFilePath>$NDGSEC_AACLNT_UNITTEST_DIR/siteB-aa.key</signingPriKeyFilePath> 
     18            <signingPriKeyPwd></signingPriKeyPwd> 
     19                <refC14nInclNS></refC14nInclNS> 
     20                <signedInfoC14nInclNS></signedInfoC14nInclNS> 
     21            <caCertFilePathList> 
    1822            <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    1923                <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
     
    2428            <caCertFile>/etc/grid-security/certificates/abcdef01.0</caCertFile> 
    2529                --> 
    26             </caCertFileList> 
    27         <signingPriKeyFilePath>$NDGSEC_AACLNT_UNITTEST_DIR/siteB-aa.key</signingPriKeyFilePath> 
    28             <signingPriKeyPwd></signingPriKeyPwd> 
    29                 <refC14nInclNS></refC14nInclNS> 
    30                 <signedInfoC14nInclNS></signedInfoC14nInclNS> 
     30            </caCertFilePathList> 
     31            <!-- Set the value type of the server cert --> 
     32        <reqBinSecTokValType>X509v3</reqBinSecTokValType> 
     33            <!-- Set the response message header to include a SignatureConfirmation element --> 
     34            <applySignatureConfirmation>True</applySignatureConfirmation> 
    3135        <!--  
    3236            Set the certificate used to verify the signature of messages from the  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgr/README

    r4120 r4139  
    5151 In the above, it is "abcdef01.0".    
    5252  
    53  i) edit 'caCertFileList' element in  
     53 i) edit 'caCertFilePathList' element in  
    5454 ../attAuthority/siteAAttAuthorityProperties.xml and add a new entry for the  
    5555 MyProxy CA: 
    5656 
    5757 -8<--------------------------------------------------------------------------- 
    58     <caCertFileList> 
     58    <caCertFilePathList> 
    5959        <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    6060-->     <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/abcdef01.0</caCertFile> 
    61     </caCertFileList> 
     61    </caCertFilePathList> 
    6262 -8<--------------------------------------------------------------------------- 
    6363 The exact name of the CA certificate file will be unique to your installation. 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgr/sessionMgrProperties.xml

    r4138 r4139  
    2020            SSL connections and Attribute Certificates 
    2121        --> 
    22             <caCertFileList> 
     22            <caCertFilePathList> 
    2323            <caCertFile>$NDGSEC_SM_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    24         </caCertFileList> 
     24        </caCertFilePathList> 
    2525            <signingCertFilePath>$NDGSEC_SM_UNITTEST_DIR/sm.crt</signingCertFilePath> 
    2626        <signingPriKeyFilePath>$NDGSEC_SM_UNITTEST_DIR/sm.key</signingPriKeyFilePath> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/README

    r3199 r4139  
    6363 In the above, it is "abcdef01.0".    
    6464  
    65  ii) edit 'caCertFileList' element in sessionManagerProperties.xml and add a  
     65 ii) edit 'caCertFilePathList' element in sessionManagerProperties.xml and add a  
    6666 new entry for the MyProxy CA: 
    6767 
    6868 -8<--------------------------------------------------------------------------- 
    69     <caCertFileList> 
     69    <caCertFilePathList> 
    7070        <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    7171-->     <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/abcdef01.0</caCertFile> 
    72     </caCertFileList> 
     72    </caCertFilePathList> 
    7373 -8<--------------------------------------------------------------------------- 
    7474Ammend to the correct setting.  Edit  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/sessionMgrClient/sessionMgrProperties.xml

    r4138 r4139  
    2020        SSL connections and Attribute Certificates 
    2121        --> 
    22             <caCertFileList> 
     22            <caCertFilePathList> 
    2323            <caCertFile>$NDGSEC_SMCLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    2424                <!--  
     
    2828                <caCertFile>$NDGSEC_SMCLNT_UNITTEST_DIR/ca/abcdef01.0</caCertFile> 
    2929            --> 
    30             </caCertFileList> 
     30            </caCertFilePathList> 
    3131        <signingCertFilePath>$NDGSEC_SMCLNT_UNITTEST_DIR/sm.crt</signingCertFilePath> 
    3232            <signingPriKeyFilePath>$NDGSEC_SMCLNT_UNITTEST_DIR/sm.key</signingPriKeyFilePath> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/attAuthority.cfg

    r4138 r4139  
    6666# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    6767# values should be delimited by a space 
    68 caCertFileList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
     68caCertFilePathList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
    6969 
    7070# Signature of an outbound message 
     
    122122# message will be assigned to the verifyingCert attribute. 
    123123 
    124 # Provide the PEM encoded content here 
    125 verifyingCert= 
    126  
    127124# ... or provide file path PEM encode cert here 
    128125verifyingCertFilePath= 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/attAuthorityProperties.xml

    r4138 r4139  
    2222                <refC14nInclNS></refC14nInclNS> 
    2323                <signedInfoC14nInclNS></signedInfoC14nInclNS> 
    24             <caCertFileList> 
     24            <caCertFilePathList> 
    2525            <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    2626                <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
     
    3131            <caCertFile>/etc/grid-security/certificates/abcdef01.0</caCertFile> 
    3232                --> 
    33             </caCertFileList> 
     33            </caCertFilePathList> 
     34            <signingCertChain></signingCertChain> 
    3435            <!-- Set the value type of the server cert --> 
    3536        <reqBinSecTokValType>X509v3</reqBinSecTokValType> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/invalidAttAuthority.cfg

    r4138 r4139  
    2020        <refC14nInclNS></refC14nInclNS> 
    2121        <signedInfoC14nInclNS></signedInfoC14nInclNS> 
    22     <caCertFileList> 
     22    <caCertFilePathList> 
    2323        <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt</caCertFile> 
    2424        <caCertFile>$NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem</caCertFile> 
     
    2929        <caCertFile>/etc/grid-security/certificates/abcdef01.0</caCertFile> 
    3030        --> 
    31     </caCertFileList> 
     31    </caCertFilePathList> 
    3232    <!-- Set the value type of the server cert --> 
    3333    <reqBinSecTokValType>X509v3</reqBinSecTokValType> 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/invalidAttAuthorityProperties.xml

    r4138 r4139  
    3636# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    3737# values should be delimited by a space 
    38 caCertFileList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
     38caCertFilePathList: $NDGSEC_AACLNT_UNITTEST_DIR/ca/ndg-test-ca.crt $NDGSEC_AACLNT_UNITTEST_DIR/ca/cacert.pem 
    3939 
    4040# Set the certificate used to verify the signature of messages from the  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/sessionMgr.cfg

    r4138 r4139  
    4242# The CA certificates of other NDG trusted sites should go here.  NB, multiple 
    4343# values should be delimited by a space 
    44 caCertFileList: $NDGSEC_DIR/conf/certs/ca/cacert.pem   
     44caCertFilePathList: $NDGSEC_DIR/conf/certs/ca/cacert.pem   
    4545 
    4646# Signature of an outbound message 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/sessionMgrProperties.xml

    r4138 r4139  
    3939            The CA certificates of other NDG trusted sites should go here. 
    4040        --> 
    41             <caCertFileList> 
     41            <caCertFilePathList> 
    4242            <caCertFile>$NDGSEC_DIR/conf/certs/ca/cacert.pem</caCertFile> 
    43             </caCertFileList> 
     43            </caCertFilePathList> 
    4444            <!--  
    4545        Set the certificate used to verify the signature of messages from the  
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/utils/testConfigFileParsers.py

    r4136 r4139  
    6161        self.assertEqual(cfg['userRolesModName'], self.VALID_ROLES_MOD_NAME) 
    6262        self.assertEqual(type(cfg['WS-Security']), dict) 
    63         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 2) 
    64         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
     63        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 2) 
     64        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
    6565 
    6666 
     
    7474        self.assertEqual(cfg['userRolesModName'], self.VALID_ROLES_MOD_NAME) 
    7575        self.assertEqual(type(cfg['WS-Security']), dict) 
    76         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 2) 
    77         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
     76        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 2) 
     77        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
    7878 
    7979 
     
    9393        self.assertEqual(cfg['userRolesModName'], self.VALID_ROLES_MOD_NAME) 
    9494        self.assertEqual(type(cfg['WS-Security']), dict) 
    95         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 2) 
    96         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
     95        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 2) 
     96        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
    9797 
    9898 
     
    106106        self.assertEqual(cfg['userRolesModName'], self.VALID_ROLES_MOD_NAME) 
    107107        self.assertEqual(type(cfg['WS-Security']), dict) 
    108         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 2) 
    109         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
     108        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 2) 
     109        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
    110110         
    111111 
     
    118118        self.assertEqual(cfg['useSSL'], 'Yes') 
    119119        self.assertEqual(type(cfg['WS-Security']), dict) 
    120         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 1) 
    121         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.NDG_SEC_DIR + '/conf/certs/ca/cacert.pem') 
     120        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 1) 
     121        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.NDG_SEC_DIR + '/conf/certs/ca/cacert.pem') 
    122122 
    123123 
     
    130130        self.assertEqual(cfg['useSSL'], 'Yes') 
    131131        self.assertEqual(type(cfg['WS-Security']), dict) 
    132         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 1) 
    133         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.NDG_SEC_DIR + '/conf/certs/ca/cacert.pem') 
     132        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 1) 
     133        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.NDG_SEC_DIR + '/conf/certs/ca/cacert.pem') 
    134134                          
    135135         
     
    144144        self.assertEqual(cfg['userRolesModName'], self.VALID_ROLES_MOD_NAME) 
    145145        self.assertEqual(type(cfg['WS-Security']), dict) 
    146         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 2) 
    147         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
     146        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 2) 
     147        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
    148148 
    149149 
     
    157157        self.assertEqual(cfg['userRolesModName'], self.VALID_ROLES_MOD_NAME) 
    158158        self.assertEqual(type(cfg['WS-Security']), dict) 
    159         self.assertEqual(len(cfg['WS-Security']['caCertFileList']), 2) 
    160         self.assertEqual(cfg['WS-Security']['caCertFileList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
     159        self.assertEqual(len(cfg['WS-Security']['caCertFilePathList']), 2) 
     160        self.assertEqual(cfg['WS-Security']['caCertFilePathList'][0], self.BASE_DIR + '/ca/ndg-test-ca.crt') 
    161161         
    162162 
Note: See TracChangeset for help on using the changeset viewer.