Ignore:
Timestamp:
19/12/08 16:39:57 (11 years ago)
Author:
pjkersha
Message:

Refactoring of SSO service to enable use of local AA and SM instances via keys to environ.

Location:
TI12-security/trunk/python/ndg.security.common/ndg/security/common
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/authz/pdp/browse.py

    r4680 r4692  
    406406        try: 
    407407            # Make request for attribute certificate 
    408             attCert = self.smClnt.getAttCert(attAuthorityURI=aaURI, 
     408            attCert = self.smClnt.getAttCert(attributeAuthorityURI=aaURI, 
    409409                                             sessID=self.userSessID, 
    410410                                             reqRole=role) 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/authz/pdp/proftp.py

    r4680 r4692  
    303303        try: 
    304304            # Make request for attribute certificate 
    305             attCert = self.smClnt.getAttCert(attAuthorityURI=self.aaURI, 
     305            attCert = self.smClnt.getAttCert(attributeAuthorityURI=self.aaURI, 
    306306                                             sessID=self.userSessID) 
    307307            return attCert 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/sessionmanager.py

    r4680 r4692  
    454454                   userX509Cert=None, 
    455455                   sessID=None, 
    456                    attAuthorityURI=None, 
     456                   attributeAuthorityURI=None, 
    457457                   reqRole=None, 
    458458                   mapFromTrustedHosts=True, 
    … …  
    483483        userX509Cert in the case of a browser client. 
    484484         
    485         @type attAuthorityURI: string 
    486         @param attAuthorityURI: URI for Attribute Authority WS. 
     485        @type attributeAuthorityURI: string 
     486        @param attributeAuthorityURI: URI for Attribute Authority WS. 
    487487         
    488488        @type reqRole: string 
    … …  
    520520            attCert, msg, extAttCertList = self.__srv.getAttCert(userX509Cert, 
    521521                                                           sessID,  
    522                                                            attAuthorityURI, 
     522                                                           attributeAuthorityURI, 
    523523                                                           reqRole, 
    524524                                                           mapFromTrustedHosts, 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/attributeauthority/AttributeAuthority_services.py

    r4521 r4692  
    2929        # no ws-addressing 
    3030 
    31     # op: <ZSI.wstools.WSDLTools.Message instance at 0x84fc98c> 
     31    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c746c> 
    3232    def getAttCert(self, userId,userX509Cert,userAttCert): 
    3333 
    … …  
    4646        return attCert,msg 
    4747 
    48     # op: <ZSI.wstools.WSDLTools.Message instance at 0x84fccac> 
     48    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c778c> 
    4949    def getHostInfo(self): 
    5050 
    … …  
    6464        return hostname,aaURI,aaDN,loginURI,loginServerDN,loginRequestServerDN 
    6565 
    66     # op: <ZSI.wstools.WSDLTools.Message instance at 0x85037ec> 
     66    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cf2cc> 
    6767    def getTrustedHostInfo(self, role): 
    6868 
    … …  
    7878        return trustedHosts 
    7979 
    80     # op: <ZSI.wstools.WSDLTools.Message instance at 0x850396c> 
     80    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cf44c> 
    8181    def getAllHostsInfo(self): 
    8282 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/sessionmanager/SessionManager_services.py

    r4513 r4692  
    2929        # no ws-addressing 
    3030 
    31     # op: <ZSI.wstools.WSDLTools.Message instance at 0x84fad6c> 
     31    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c784c> 
    3232    def getSessionStatus(self, userDN,sessID): 
    3333 
    … …  
    4444        return isAlive 
    4545 
    46     # op: <ZSI.wstools.WSDLTools.Message instance at 0x850208c> 
     46    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c7b4c> 
    4747    def connect(self, username,passphrase,createServerSess): 
    4848 
    … …  
    6363        return userX509Cert,userPriKey,issuingCert,sessID 
    6464 
    65     # op: <ZSI.wstools.WSDLTools.Message instance at 0x8502c0c> 
     65    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cd6ec> 
    6666    def disconnect(self, userX509Cert,sessID): 
    6767 
    … …  
    7777        return  
    7878 
    79     # op: <ZSI.wstools.WSDLTools.Message instance at 0x8502dac> 
    80     def getAttCert(self, userX509Cert,sessID,attAuthorityURI,reqRole,mapFromTrustedHosts,rtnExtAttCertList,extAttCert,extTrustedHost): 
     79    # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cd88c> 
     80    def getAttCert(self, userX509Cert,sessID,attributeAuthorityURI,reqRole,mapFromTrustedHosts,rtnExtAttCertList,extAttCert,extTrustedHost): 
    8181 
    8282        request = getAttCertInputMsg() 
    8383        request._userX509Cert = userX509Cert 
    8484        request._sessID = sessID 
    85         request._attAuthorityURI = attAuthorityURI 
     85        request._attributeAuthorityURI = attributeAuthorityURI 
    8686        request._reqRole = reqRole 
    8787        request._mapFromTrustedHosts = mapFromTrustedHosts 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/sessionmanager/SessionManager_services_types.py

    r4480 r4692  
    149149        def __init__(self, **kw): 
    150150            ns = ns0.getAttCert_Dec.schema 
    151             TClist = [ZSI.TC.String(pname="userX509Cert", aname="_userX509Cert", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="sessID", aname="_sessID", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="attAuthorityURI", aname="_attAuthorityURI", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="reqRole", aname="_reqRole", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.Boolean(pname="mapFromTrustedHosts", aname="_mapFromTrustedHosts", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.Boolean(pname="rtnExtAttCertList", aname="_rtnExtAttCertList", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="extAttCert", aname="_extAttCert", minOccurs=0, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="extTrustedHost", aname="_extTrustedHost", minOccurs=0, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded"))] 
     151            TClist = [ZSI.TC.String(pname="userX509Cert", aname="_userX509Cert", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="sessID", aname="_sessID", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="attributeAuthorityURI", aname="_attributeAuthorityURI", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="reqRole", aname="_reqRole", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.Boolean(pname="mapFromTrustedHosts", aname="_mapFromTrustedHosts", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.Boolean(pname="rtnExtAttCertList", aname="_rtnExtAttCertList", minOccurs=1, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="extAttCert", aname="_extAttCert", minOccurs=0, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="extTrustedHost", aname="_extTrustedHost", minOccurs=0, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded"))] 
    152152            kw["pname"] = ("urn:ndg:security:SessionManager","getAttCert") 
    153153            kw["aname"] = "_getAttCert" 
    … …  
    161161                    self._userX509Cert = None 
    162162                    self._sessID = None 
    163                     self._attAuthorityURI = None 
     163                    self._attributeAuthorityURI = None 
    164164                    self._reqRole = None 
    165165                    self._mapFromTrustedHosts = None 

  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/sessionmanager/sessionmanager.wsdl

    r4480 r4692  
    6868                    <xsd:element name="userX509Cert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
    6969                    <xsd:element name="sessID" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
    70                     <xsd:element name="attAuthorityURI" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     70                    <xsd:element name="attributeAuthorityURI" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
    7171                    <xsd:element name="reqRole" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
    7272                    <xsd:element name="mapFromTrustedHosts" type="xsd:boolean" minOccurs="1" maxOccurs="1"/> 
Note: See TracChangeset for help on using the changeset viewer.