Changeset 2108


Ignore:
Timestamp:
05/02/07 17:40:29 (12 years ago)
Author:
pjkersha
Message:

Renamed output extAttCert -> extAttCertOut for getAttCertResponse for Session Manager
WSDL. Previously, there were input and output vars called extAttCert. This causes
problems for Java generated stubs.

Location:
TI12-security/trunk/python
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services.py

    r2107 r2108  
    100100        attCert = response._attCert 
    101101        msg = response._msg 
    102         extAttCert = response._extAttCert 
    103         return attCert,msg,extAttCert 
     102        extAttCertOut = response._extAttCertOut 
     103        return attCert,msg,extAttCertOut 
    104104 
    105105    # op: <ZSI.wstools.WSDLTools.Message instance at 0xb6d0868c> 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services_types.py

    r2085 r2108  
    179179        def __init__(self, **kw): 
    180180            ns = ns0.getAttCertResponse_Dec.schema 
    181             TClist = [ZSI.TC.String(pname="attCert", aname="_attCert", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="msg", aname="_msg", minOccurs=0, 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"))] 
     181            TClist = [ZSI.TC.String(pname="attCert", aname="_attCert", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="msg", aname="_msg", minOccurs=0, maxOccurs=1, nillable=False, typed=False, encoded=kw.get("encoded")), ZSI.TC.String(pname="extAttCertOut", aname="_extAttCertOut", minOccurs=0, maxOccurs="unbounded", nillable=False, typed=False, encoded=kw.get("encoded"))] 
    182182            kw["pname"] = ("urn:ndg:security:sessionMgr","getAttCertResponse") 
    183183            kw["aname"] = "_getAttCertResponse" 
     
    191191                    self._attCert = None 
    192192                    self._msg = None 
    193                     self._extAttCert = [] 
     193                    self._extAttCertOut = [] 
    194194                    return 
    195195            Holder.__name__ = "getAttCertResponse_Holder" 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/wsSecurity.py

    r2107 r2108  
    609609                                        context=ctxt)[0] 
    610610 
    611         #import pdb;pdb.set_trace() 
    612611        # Get algorithm used for canonicalization of the SignedInfo  
    613612        # element.  Nb. This is NOT necessarily the same as that used to 
     
    625624                signedInfoC14nKw['unsuppressedPrefixes'] = \ 
    626625                                            pfxListAttNode.value.split() 
     626                                                       
    627627            except Exception, e: 
    628628                raise VerifyError, \ 
     
    659659            pass  
    660660         
    661          
     661        import pdb;pdb.set_trace()         
    662662        if binSecTokNode: 
    663663            try: 
     
    673673                # P J Kershaw 05/02/07 
    674674                pass                  
    675 #                raise VerifyError, "Error extracting BinarySecurityToken " + \ 
    676 #                                   "from WSSE header: " + str(e) 
     675                raise VerifyError, "Error extracting BinarySecurityToken " + \ 
     676                                   "from WSSE header: " + str(e) 
    677677 
    678678        if self.__verifyingCert is None: 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/SessionMgr_services_server.py

    r2107 r2108  
    8787                <xsd:element maxOccurs=\"1\" minOccurs=\"0\" name=\"attCert\" type=\"xsd:string\"/> 
    8888                <xsd:element maxOccurs=\"1\" minOccurs=\"0\" name=\"msg\" type=\"xsd:string\"/> 
    89                         <xsd:element maxOccurs=\"unbounded\" minOccurs=\"0\" name=\"extAttCert\" type=\"xsd:string\"/> 
     89                        <xsd:element maxOccurs=\"unbounded\" minOccurs=\"0\" name=\"extAttCertOut\" type=\"xsd:string\"/> 
    9090              </xsd:sequence> 
    9191            </xsd:complexType> 
     
    313313            result._attCert = parameters[0] 
    314314            result._msg = parameters[1] 
    315             result._extAttCert = parameters[2] 
     315            result._extAttCertOut = parameters[2] 
    316316        return self.request, result 
    317317 
  • TI12-security/trunk/python/ndg.security.server/ndg/security/server/SessionMgr/server-config.tac

    r2107 r2108  
    8888                response.AttCert = result[0].toString()  
    8989                 
    90         response.Msg, response.ExtAttCert = result[1:] 
     90        response.Msg, response.ExtAttCertOut = result[1:] 
    9191         
    9292        return request, response 
  • TI12-security/trunk/python/www/html/sessionMgr.wsdl

    r2093 r2108  
    8383                <xsd:element name="attCert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
    8484                <xsd:element name="msg" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
    85                         <xsd:element name="extAttCert" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> 
     85                        <xsd:element name="extAttCertOut" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/> 
    8686              </xsd:sequence> 
    8787            </xsd:complexType> 
Note: See TracChangeset for help on using the changeset viewer.