Changeset 4692 for TI12-security/trunk/python/ndg.security.common/ndg
- Timestamp:
- 19/12/08 16:39:57 (12 years ago)
- 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 406 406 try: 407 407 # Make request for attribute certificate 408 attCert = self.smClnt.getAttCert(att AuthorityURI=aaURI,408 attCert = self.smClnt.getAttCert(attributeAuthorityURI=aaURI, 409 409 sessID=self.userSessID, 410 410 reqRole=role) -
TI12-security/trunk/python/ndg.security.common/ndg/security/common/authz/pdp/proftp.py
r4680 r4692 303 303 try: 304 304 # Make request for attribute certificate 305 attCert = self.smClnt.getAttCert(att AuthorityURI=self.aaURI,305 attCert = self.smClnt.getAttCert(attributeAuthorityURI=self.aaURI, 306 306 sessID=self.userSessID) 307 307 return attCert -
TI12-security/trunk/python/ndg.security.common/ndg/security/common/sessionmanager.py
r4680 r4692 454 454 userX509Cert=None, 455 455 sessID=None, 456 att AuthorityURI=None,456 attributeAuthorityURI=None, 457 457 reqRole=None, 458 458 mapFromTrustedHosts=True, … … 483 483 userX509Cert in the case of a browser client. 484 484 485 @type att AuthorityURI: string486 @param att AuthorityURI: URI for Attribute Authority WS.485 @type attributeAuthorityURI: string 486 @param attributeAuthorityURI: URI for Attribute Authority WS. 487 487 488 488 @type reqRole: string … … 520 520 attCert, msg, extAttCertList = self.__srv.getAttCert(userX509Cert, 521 521 sessID, 522 att AuthorityURI,522 attributeAuthorityURI, 523 523 reqRole, 524 524 mapFromTrustedHosts, -
TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/attributeauthority/AttributeAuthority_services.py
r4521 r4692 29 29 # no ws-addressing 30 30 31 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84 fc98c>31 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c746c> 32 32 def getAttCert(self, userId,userX509Cert,userAttCert): 33 33 … … 46 46 return attCert,msg 47 47 48 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84 fccac>48 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c778c> 49 49 def getHostInfo(self): 50 50 … … 64 64 return hostname,aaURI,aaDN,loginURI,loginServerDN,loginRequestServerDN 65 65 66 # op: <ZSI.wstools.WSDLTools.Message instance at 0x8 5037ec>66 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cf2cc> 67 67 def getTrustedHostInfo(self, role): 68 68 … … 78 78 return trustedHosts 79 79 80 # op: <ZSI.wstools.WSDLTools.Message instance at 0x8 50396c>80 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cf44c> 81 81 def getAllHostsInfo(self): 82 82 -
TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/sessionmanager/SessionManager_services.py
r4513 r4692 29 29 # no ws-addressing 30 30 31 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84 fad6c>31 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c784c> 32 32 def getSessionStatus(self, userDN,sessID): 33 33 … … 44 44 return isAlive 45 45 46 # op: <ZSI.wstools.WSDLTools.Message instance at 0x8 50208c>46 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84c7b4c> 47 47 def connect(self, username,passphrase,createServerSess): 48 48 … … 63 63 return userX509Cert,userPriKey,issuingCert,sessID 64 64 65 # op: <ZSI.wstools.WSDLTools.Message instance at 0x8 502c0c>65 # op: <ZSI.wstools.WSDLTools.Message instance at 0x84cd6ec> 66 66 def disconnect(self, userX509Cert,sessID): 67 67 … … 77 77 return 78 78 79 # op: <ZSI.wstools.WSDLTools.Message instance at 0x8 502dac>80 def getAttCert(self, userX509Cert,sessID,att AuthorityURI,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): 81 81 82 82 request = getAttCertInputMsg() 83 83 request._userX509Cert = userX509Cert 84 84 request._sessID = sessID 85 request._att AuthorityURI = attAuthorityURI85 request._attributeAuthorityURI = attributeAuthorityURI 86 86 request._reqRole = reqRole 87 87 request._mapFromTrustedHosts = mapFromTrustedHosts -
TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/sessionmanager/SessionManager_services_types.py
r4480 r4692 149 149 def __init__(self, **kw): 150 150 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="att AuthorityURI", 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"))] 152 152 kw["pname"] = ("urn:ndg:security:SessionManager","getAttCert") 153 153 kw["aname"] = "_getAttCert" … … 161 161 self._userX509Cert = None 162 162 self._sessID = None 163 self._att AuthorityURI = None163 self._attributeAuthorityURI = None 164 164 self._reqRole = None 165 165 self._mapFromTrustedHosts = None -
TI12-security/trunk/python/ndg.security.common/ndg/security/common/zsi/sessionmanager/sessionmanager.wsdl
r4480 r4692 68 68 <xsd:element name="userX509Cert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 69 69 <xsd:element name="sessID" type="xsd:string" minOccurs="0" maxOccurs="1"/> 70 <xsd:element name="att AuthorityURI" type="xsd:string" minOccurs="0" maxOccurs="1"/>70 <xsd:element name="attributeAuthorityURI" type="xsd:string" minOccurs="0" maxOccurs="1"/> 71 71 <xsd:element name="reqRole" type="xsd:string" minOccurs="0" maxOccurs="1"/> 72 72 <xsd:element name="mapFromTrustedHosts" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
Note: See TracChangeset
for help on using the changeset viewer.