Ignore:
Timestamp:
09/12/08 13:26:58 (11 years ago)
Author:
pjkersha
Message:
  • updated configfileparsers imports for new module name.
  • improved error reporting and logging in soap and wssecurity WSGIs
  • fixed settings in attributeauthorityclient unit test site-a and site-b PAste ini files
  • updated Attribute Authority Client unit test names
Location:
TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi
Files:
2 edited

Legend:

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

    r4521 r4573  
    4949                                        'wsseSignatureVerificationFilterID',  
    5050                                        None) 
    51           
     51        if self.wsseSignatureVerificationFilterID is None: 
     52            log.warning('No "wsseSignatureVerificationFilterID" option was ' 
     53                        'set in the input config') 
     54      
    5255        # Initialise Attribute Authority class - property file will be 
    5356        # picked up from default location under $NDG_DIR directory 
     
    7881            # Get certificate corresponding to private key that signed the 
    7982            # message - i.e. the user's proxy 
     83            log.debug("Reading holder certificate from WS-Security signature " 
     84                      "header") 
    8085            holderX509Cert = signatureFilter.signatureHandler.verifyingCert 
    8186        else: 
    8287            # No signature from client - they must instead provide the 
    8388            # designated holder cert via the UserX509Cert input 
     89            log.debug('Reading holder certificate from SOAP request ' 
     90                      '"userX509Cert" parameter') 
    8491            holderX509Cert = request.UserX509Cert 
    8592 
     
    209216         
    210217        return response 
    211  
    212  
    213     def soap_getX509Cert(self, ps, **kw): 
    214         '''Retrieve Attribute Authority's X.509 certificate 
    215          
    216         @type ps: ZSI ParsedSoap 
    217         @param ps: client SOAP message 
    218         @rtype: tuple 
    219         @return: response object''' 
    220         if self.__debug: 
    221             import pdb 
    222             pdb.set_trace() 
    223              
    224         response = _AttributeAuthorityService.soap_getX509Cert(self, ps) 
    225          
    226         x509Cert = X509CertRead(self.aa['signingCertFilePath']) 
    227         response.X509Cert = base64.encodestring(x509Cert.asDER()) 
    228         return response 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/sessionmanager/__init__.py

    r4521 r4573  
    4848        self.attributeAuthorityFilterID = kw.pop('attributeAuthorityFilterID',  
    4949                                                 None) 
     50        if self.attributeAuthorityFilterID is None: 
     51            log.warning('No "attributeAuthorityFilterID" option was ' 
     52                        'set in the input config: link to a local Attibute ' 
     53                        'Authority instance is disabled') 
    5054         
    5155        # ... and WS-Security signature verification filter 
     
    5357                                        'wsseSignatureVerificationFilterID',  
    5458                                        None) 
     59        if self.wsseSignatureVerificationFilterID is None: 
     60            log.warning('No "wsseSignatureVerificationFilterID" option was ' 
     61                        'set in the input config') 
    5562         
    5663        # Initialise Attribute Authority class - property file will be 
     
    111118            # Get certificate corresponding to private key that signed the 
    112119            # message - i.e. the user's certificate 
     120            log.debug("Reading holder certificate from WS-Security " 
     121                      "signature header") 
    113122            userX509Cert = signatureFilter.signatureHandler.verifyingCert 
    114123        else: 
    115124            # No signature from client - they must instead provide the 
    116125            # designated holder cert via the UserX509Cert input 
     126            log.debug('Reading holder certificate from SOAP "userX509Cert" ' 
     127                      'parameter') 
    117128            userX509Cert = request.UserX509Cert 
    118129             
     
    167178            # Get certificate corresponding to private key that signed the 
    168179            # message - i.e. the user's proxy 
     180            log.debug("Reading holder certificate from WS-Security " 
     181                      "signature header") 
    169182            userX509Cert = signatureFilter.signatureHandler.verifyingCert 
    170183        else: 
    171184            # No signature from client - they must instead provide the 
    172185            # designated holder cert via the UserX509Cert input 
     186            log.debug('Reading holder certificate from SOAP "userX509Cert" ' 
     187                      'parameter') 
    173188            userX509Cert = request.UserX509Cert 
    174189 
Note: See TracChangeset for help on using the changeset viewer.