Ignore:
Timestamp:
28/11/08 12:22:42 (12 years ago)
Author:
pjkersha
Message:

Added local Session Manager call test to combined services unit tests.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/zsi/twisted/sessionmanager/sessionmanager.tac

    r4404 r4513  
    9393                                                                 createServerSess=request.CreateServerSess) 
    9494                                         
    95         response.UserCert, response.UserPriKey, response.issuingCert, \ 
     95        response.UserX509Cert, response.UserPriKey, response.issuingCert, \ 
    9696                response.SessID = result 
    9797                          
     
    119119            # Get certificate corresponding to private key that signed the 
    120120            # message - i.e. the user's proxy 
    121             userCert = WSSecurityHandler.signatureHandler.verifyingCert 
     121            userX509Cert = WSSecurityHandler.signatureHandler.verifyingCert 
    122122        else: 
    123             userCert = request.UserCert 
    124  
    125         self.sm.deleteUserSession(sessID=sessID, userCert=userCert) 
     123            userX509Cert = request.UserX509Cert 
     124 
     125        self.sm.deleteUserSession(sessID=sessID, userX509Cert=UserX509Cert) 
    126126        return request, response 
    127127 
     
    167167            # Get certificate corresponding to private key that signed the 
    168168            # message - i.e. the user's proxy 
    169             userCert = WSSecurityHandler.signatureHandler.verifyingCert 
     169            userX509Cert = WSSecurityHandler.signatureHandler.verifyingCert 
    170170        else: 
    171             userCert = None 
    172          
    173                 # Cert used in signature is prefered over userCert input element -  
    174                 # userCert may have been omitted. 
     171            userX509Cert = None 
     172         
     173                # Cert used in signature is prefered over userX509Cert input element -  
     174                # userX509Cert may have been omitted. 
    175175        result = self.sm.getAttCert(\ 
    176                                             userCert=userCert or request.UserCert, 
     176                                            userX509Cert=userX509Cert or request.UserX509Cert, 
    177177                                                sessID=request.SessID, 
    178178                                                aaURI=request.AttAuthorityURI, 
Note: See TracChangeset for help on using the changeset viewer.