Changeset 1772


Ignore:
Timestamp:
27/11/06 16:59:04 (13 years ago)
Author:
pjkersha
Message:

simpleCA.wsdl: updated doc/lit style
Tests/MyProxyClient?/m2CryptoMyPxClnt.py: fix to logon call. Still requires
refactoring to remove pyOpenSSL calls to read returned ASN1 format proxy cert
and private key.

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

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/Tests/MyProxyClient/m2CryptoMyPxClnt.py

    r1691 r1772  
    1616from OpenSSL import crypto, SSL 
    1717import re 
     18import base64 
     19 
    1820 
    1921class GetException(Exception): pass 
     
    116118        dat = inp_dat 
    117119         
    118         import base64 
    119120        while dat: 
    120121     
     
    156157        # http://grid.ncsa.uiuc.edu/myproxy/protocol/ 
    157158        context = Context(protocol='sslv3') 
    158         context.load_cert('../hostcert.pem',  
    159                           keyfile='../hostkey.pem',  
     159        context.load_cert(certFile,#'../hostcert.pem',  
     160                          keyfile=keyFile,#'../hostkey.pem',  
    160161                          callback=lambda *ar, **kw: None) 
    161162     
     
    302303        if debuglevel(1):   print "debug: get server response" 
    303304        resp = conn.recv(8192) 
    304         response, errorTxt = self._deserializeCerts(resp) 
     305        response, errorTxt = self._deserializeResponse(resp) 
    305306        if response: 
    306307            raise RetrieveProxyException(errorTxt) 
  • TI12-security/trunk/python/Tests/SimpleCA/simpleCA.wsdl

    r1542 r1772  
    1313  <wsdl:types> 
    1414    <xsd:schema> 
    15       <xsd:element name="certReq"> 
     15      <xsd:element name="signCertReq"> 
    1616        <xsd:complexType> 
    1717          <xsd:sequence> 
    18             <xsd:element name="x509CertReq" type="xsd:string"/> 
    19             <xsd:attribute name="wsu:id" type="xsd:string"/> 
     18            <xsd:element name="x509CertReq" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
    2019          </xsd:sequence> 
    2120        </xsd:complexType> 
    2221      </xsd:element> 
    23       <xsd:element name="certReqResponse"> 
     22      <xsd:element name="signCertReqResponse"> 
    2423        <xsd:complexType> 
    25           <xsd:sequence> 
    26             <xsd:element name="x509Cert" type="xsd:string"/> 
    27             <xsd:element name="errMsg" type="xsd:string"/> 
    28           </xsd:sequence> 
    29         </xsd:complexType> 
     24                  <xsd:sequence> 
     25                <xsd:element name="x509Cert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     26                  </xsd:sequence> 
     27                </xsd:complexType> 
    3028      </xsd:element> 
    3129    </xsd:schema> 
    3230  </wsdl:types> 
    3331 
    34   <wsdl:message name="certRequest"> 
    35     <wsdl:part name="parameters" element="certReq"/> 
     32  <wsdl:message name="signCertReq"> 
     33    <wsdl:part name="parameters" element="signCertReq"/> 
    3634  </wsdl:message> 
    3735 
    38   <wsdl:message name="certResponse"> 
    39     <wsdl:part name="parameters" element="certReqResponse"/> 
     36  <wsdl:message name="signCertReqResponse"> 
     37    <wsdl:part name="parameters" element="signCertReqResponse"/> 
    4038  </wsdl:message> 
    4139 
    4240  <wsdl:portType name="SimpleCA"> 
    43     <wsdl:operation name="reqCert"> 
    44       <wsdl:input message="tns:certRequest"/> 
    45       <wsdl:output message="tns:certResponse"/> 
     41    <wsdl:operation name="signCertReq"> 
     42      <wsdl:input message="tns:signCertReqInputMsg"/> 
     43      <wsdl:output message="tns:signCertReqOutputMsg"/> 
    4644    </wsdl:operation> 
    4745  </wsdl:portType> 
     
    5149     style="document" 
    5250     transport="http://schemas.xmlsoap.org/soap/http"/> 
    53     <wsdl:operation name="reqCert"> 
    54       <soap:operation soapAction="reqCert"/> 
     51    <wsdl:operation name="signCertReq"> 
     52      <soap:operation soapAction="signCertReq"/> 
    5553      <wsdl:input> 
    5654        <soap:body use="literal"/> 
  • TI12-security/trunk/python/www/html/simpleCA.wsdl

    r689 r1772  
    11<?xml version="1.0" encoding="utf-8"?> 
     2<wsdl:definitions name="SimpleCA" 
     3 xmlns="http://schemas.xmlsoap.org/wsdl/" 
     4 xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     5 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
     6 xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
     7 xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" 
     8 xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
     9 xmlns:tns="urn:ndg:security" 
     10 xmlns:wsu="http://schemas.xmlsoap.org/ws/2002/07/utility" 
     11 targetNamespace="urn:ndg:security"> 
    212 
     13  <wsdl:types> 
     14    <xsd:schema> 
     15      <xsd:element name="signCertReq"> 
     16        <xsd:complexType> 
     17          <xsd:sequence> 
     18            <xsd:element name="x509CertReq" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     19          </xsd:sequence> 
     20        </xsd:complexType> 
     21      </xsd:element> 
     22      <xsd:element name="signCertReqResponse"> 
     23        <xsd:complexType> 
     24                  <xsd:sequence> 
     25                <xsd:element name="x509Cert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     26                  </xsd:sequence> 
     27                </xsd:complexType> 
     28      </xsd:element> 
     29    </xsd:schema> 
     30  </wsdl:types> 
    331 
    4 <definitions name="simpleCA" 
    5   targetNamespace="http://wsdl2py.client.pycon.org/" 
    6   xmlns="http://schemas.xmlsoap.org/wsdl/" 
    7   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
    8   xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" 
    9   xmlns:tns="http://wsdl2py.client.pycon.org/" 
    10   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
    11   xmlns:xsd="http://www.w3.org/2001/XMLSchema"> 
     32  <wsdl:message name="signCertReq"> 
     33    <wsdl:part name="parameters" element="signCertReq"/> 
     34  </wsdl:message> 
    1235 
    13   <message name="reqCertRequest"> 
    14     <part name="usrCertReq" type="xsd:string"/> 
    15   </message> 
     36  <wsdl:message name="signCertReqResponse"> 
     37    <wsdl:part name="parameters" element="signCertReqResponse"/> 
     38  </wsdl:message> 
    1639 
    17   <message name="reqCertResponse"> 
    18     <part name="usrCert" type="xsd:string"/> 
    19     <part name="errMsg" type="xsd:string"/> 
    20   </message> 
     40  <wsdl:portType name="SimpleCA"> 
     41    <wsdl:operation name="signCertReq"> 
     42      <wsdl:input message="tns:signCertReqInputMsg"/> 
     43      <wsdl:output message="tns:signCertReqOutputMsg"/> 
     44    </wsdl:operation> 
     45  </wsdl:portType> 
    2146 
    22    
    23   <portType name="simpleCA"> 
    24     <operation name="reqCert"> 
    25       <input message="tns:reqCertRequest"/> 
    26       <output message="tns:reqCertResponse"/> 
    27     </operation> 
    28   </portType> 
     47  <wsdl:binding name="SimpleCABinding" type="tns:SimpleCA"> 
     48    <soap:binding 
     49     style="document" 
     50     transport="http://schemas.xmlsoap.org/soap/http"/> 
     51    <wsdl:operation name="signCertReq"> 
     52      <soap:operation soapAction="signCertReq"/> 
     53      <wsdl:input> 
     54        <soap:body use="literal"/> 
     55      </wsdl:input> 
     56      <wsdl:output> 
     57        <soap:body use="literal"/> 
     58      </wsdl:output> 
     59    </wsdl:operation> 
     60  </wsdl:binding> 
    2961 
    30   <binding name="simpleCABinding" type="tns:simpleCA"> 
    31     <soap:binding style="rpc"  
    32                       transport="http://schemas.xmlsoap.org/soap/http"/> 
    33     <operation name="reqCert"> 
    34       <soap:operation soapAction="urn:simpleCA#reqCert"/> 
    35       <input> 
    36         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    37                     namespace="urn:simpleCA" use="encoded"/> 
    38       </input> 
    39       <output> 
    40         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    41                     namespace="urn:simpleCA" use="encoded"/> 
    42       </output>  
    43     </operation> 
    44   </binding> 
    45  
    46   <service name="simpleCAService"> 
    47     <documentation>simpleCA web service</documentation> 
    48     <port name="simpleCA" binding="tns:simpleCABinding"> 
    49       <soap:address location=""/> 
    50     </port> 
    51   </service> 
    52 </definitions> 
     62  <wsdl:service name="SimpleCAService"> 
     63    <wsdl:documentation>SimpleCA web service</wsdl:documentation> 
     64    <wsdl:port name="SimpleCA" binding="tns:SimpleCABinding"> 
     65      <soap:address location="http://localhost:5001"/> 
     66    </wsdl:port> 
     67  </wsdl:service> 
     68</wsdl:definitions> 
Note: See TracChangeset for help on using the changeset viewer.