Changeset 2739


Ignore:
Timestamp:
20/07/07 16:43:09 (14 years ago)
Author:
pjkersha
Message:

ndg.security.test/ndg/security/test/AttAuthority/siteAMapConfig.xml: altered
in conjunction with integration testing

ndg.security.common/ndg/security/common/SessionMgr/init.py:

  • fix to setSSLCACertFilePathList call and to body - return if not https

rather than raising an exception. This agrees with AttAuthorityClient?
implementation.

Location:
TI12-security/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk

    • Property svn:ignore set to
      .metadata
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttAuthority/__init__.py

    r2685 r2739  
    183183        if self._transdict.get('postConnectionCheck'): 
    184184            self._transdict['postConnectionCheck'].caCertFilePathList = \ 
    185                                             caCertFilePathList 
     185                                                            caCertFilePathList 
    186186        else: 
    187187            self._transdict['postConnectionCheck'] = \ 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/__init__.py

    r2685 r2739  
    6464        @type sslCACertList: list 
    6565        @keyword sslCACertList: This keyword is for use with SSL connections  
    66         only.  Set a list of one ore more CA certificates.  The peer cert. 
     66        only.  Set a list of one or more CA certificates.  The peer cert. 
    6767        must verify against at least one of these otherwise the connection 
    6868        is dropped. 
     
    9696            self.__setSSLCACertList(sslCACertList) 
    9797        elif sslCACertFilePathList: 
    98             self.__setCACertFilePathList(sslCACertFilePathList) 
     98            self.__setSSLCACertFilePathList(sslCACertFilePathList) 
    9999 
    100100        # WS-Security Signature handler - set only if any of the keywords were 
     
    180180        which the peer cert must verify its signature against""" 
    181181        if self._transport != HTTPSConnection: 
    182             raise AttAuthorityClientError, \ 
    183             "Setting SSL check CA cert list - transport type must be HTTPS" 
     182            return 
    184183         
    185184        if self._transdict.get('postConnectionCheck'): 
     
    188187        else: 
    189188            self._transdict['postConnectionCheck'] = \ 
    190                                             HostCheck(caCertList=caCertList) 
     189                            HostCheck(caCertFilePathList=caCertFilePathList) 
    191190 
    192191    sslCACertFilePathList = property(fset=__setSSLCACertFilePathList,  
    193 doc="for https connections, set list of CA cert files from which to verify peer cert") 
     192                                     doc=\ 
     193"for https connections, set list of CA cert files from which to verify peer cert") 
    194194 
    195195 
     
    199199        digital signature and verification""" 
    200200        if signatureHandler is not None and \ 
    201            not isinstance(signatureHandler, signatureHandler): 
     201           not isinstance(signatureHandler, SignatureHandler): 
    202202            raise AttributeError, \ 
    203203    "Signature Handler must be %s type or None for no message security" % \ 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/AttAuthority/siteAMapConfig.xml

    r2350 r2739  
    33        <thisHost name="Site A"> 
    44            <aaURI>thisHostAttAuthorityURI</aaURI> 
    5             <loginURI>thisHostLoginPageURI</loginURI> 
     5            <loginURI>login</loginURI> 
    66        </thisHost> 
    77    <trusted name="Site C"> 
    88            <aaURI>attAuthorityURI</aaURI> 
    9             <loginURI>loginPageURI</loginURI> 
     9            <loginURI>http://www.sitec.blah/loginPageURI</loginURI> 
    1010                <role remote="StaffMember" local="staff"/> 
    1111    </trusted> 
Note: See TracChangeset for help on using the changeset viewer.