Changeset 1743


Ignore:
Timestamp:
23/11/06 10:22:04 (13 years ago)
Author:
pjkersha
Message:

server/AttAuthority/AttAuthorityServer.py: Don't need ZSI.ServiceContainer? based code - using Twisted instead.
server/SessionMgr/server-config.tac, server/SessionMgr/start-container.sh, server/SessionMgr/README,
www/html/sessionMgr.wsdl: started port of Session Manager to doc/lit style WSDL, ZSI 2.0 and Twisted.
www/html/attAuthority.wsdl: fixed typo - ref to 'SimpleCA'.

Location:
TI12-security/trunk/python
Files:
2 deleted
2 edited
3 copied

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/www/html/attAuthority.wsdl

    r1730 r1743  
    173173  <wsdl:service name="AttAuthorityService"> 
    174174    <wsdl:documentation>NERC Data Grid Attribute Authority web service</wsdl:documentation> 
    175     <wsdl:port name="SimpleCA" binding="tns:AttAuthorityBinding"> 
     175    <wsdl:port name="AttAuthority" binding="tns:AttAuthorityBinding"> 
    176176      <soap:address location="http://localhost:5700"/> 
    177177    </wsdl:port> 
  • TI12-security/trunk/python/www/html/sessionMgr.wsdl

    r739 r1743  
    11<?xml version="1.0" encoding="utf-8"?> 
     2<wsdl:definitions name="SessionMgr" 
     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="connect"> 
     16        <xsd:complexType> 
     17          <xsd:sequence> 
     18            <xsd:element name="username" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     19            <xsd:element name="passPhrase" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     20          </xsd:sequence> 
     21        </xsd:complexType> 
     22      </xsd:element> 
     23       
     24      <xsd:element name="connectResponse"> 
     25        <xsd:complexType> 
     26                  <xsd:sequence> 
     27                    <xsd:element name="cookie" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     28                    <xsd:element name="proxyCert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     29                  </xsd:sequence> 
     30                </xsd:complexType> 
     31      </xsd:element> 
    332 
    4 <definitions name="sessionMgr" 
    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"> 
     33      <xsd:element name="disconnect"> 
     34        <xsd:complexType> 
     35                  <xsd:sequence> 
     36                    <xsd:element name="cookie" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     37                    <xsd:element name="proxyCert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     38                  </xsd:sequence> 
     39                </xsd:complexType> 
     40      </xsd:element> 
    1241 
    13   <message name="addUserRequest"> 
    14     <part name="addUserReq" type="xsd:string"/> 
     42      <xsd:element name="disconnectResponse"> 
     43        <xsd:complexType/> 
     44      </xsd:element> 
     45 
     46      <xsd:element name="reqAuthorisation"> 
     47        <xsd:complexType> 
     48                  <xsd:sequence> 
     49                    <xsd:element name="cookie" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     50                    <xsd:element name="proxyCert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     51                  </xsd:sequence> 
     52                </xsd:complexType> 
     53      </xsd:element> 
     54       
     55      <xsd:element name="reqAuthorisationResponse"> 
     56        <xsd:complexType> 
     57              <xsd:sequence> 
     58                <xsd:element name="attCert" type="xsd:string" minOccurs="0" maxOccurs="1"/> 
     59              </xsd:sequence> 
     60            </xsd:complexType> 
     61      </xsd:element> 
     62 
     63      <xsd:element name="getPubKey"> 
     64        <xsd:complexType/> 
     65      </xsd:element> 
     66      <xsd:element name="getPubKeyResponse"> 
     67        <xsd:complexType> 
     68                  <xsd:sequence> 
     69                    <xsd:element name="x509Cert" type="xsd:string" minOccurs="1" maxOccurs="1"/> 
     70                  </xsd:sequence> 
     71                </xsd:complexType> 
     72      </xsd:element> 
     73 
     74    </xsd:schema> 
     75  </wsdl:types> 
     76  
     77  <message name="connectInputMsg"> 
     78    <part name="parameters" element="tns:connect"/> 
    1579  </message> 
    1680 
    17   <message name="addUserResponse"> 
    18     <part name="addUserResp" type="xsd:string"/> 
     81  <message name="connectOutputMsg"> 
     82    <part name="parameters" element="tns:connectResponse"/> 
     83  </message> 
     84   
     85  <message name="disconnectInputMsg"> 
     86    <part name="parameters" element="tns:disconnect"/> 
    1987  </message> 
    2088 
    21   <message name="connectRequest"> 
    22     <part name="connectReq" type="xsd:string"/> 
     89  <message name="disconnectOutputMsg"> 
     90    <part name="parameters" element="tns:disconnectResponse"/> 
    2391  </message> 
    2492 
    25   <message name="connectResponse"> 
    26     <part name="connectResp" type="xsd:string"/> 
     93  <message name="reqAuthorisationInputMsg"> 
     94    <part name="parameters" element="tns:reqAuthorisation"/> 
    2795  </message> 
    2896 
    29   <message name="authorisationRequest"> 
    30     <part name="authorisationReq" type="xsd:string"/> 
     97  <message name="reqAuthorisationOutputMsg"> 
     98    <part name="parameters" element="tns:reqAuthorisationResponse"/> 
    3199  </message> 
    32100 
    33   <message name="authorisationResponse"> 
    34     <part name="authorisationResp" type="xsd:string"/> 
     101  <message name="getPubKeyInputMsg"> 
     102    <part name="parameters" element="tns:getPubKey"/> 
    35103  </message> 
    36104 
    37   <message name="pubKeyRequest"> 
    38     <part name="pubKeyReq" type="xsd:string"/> 
     105  <message name="getPubKeyOutputMsg"> 
     106    <part name="parameters" element="tns:getPubKeyResponse"/> 
    39107  </message> 
    40108 
    41   <message name="pubKeyResponse"> 
    42     <part name="pubKeyResp" type="xsd:string"/> 
    43   </message> 
     109  <wsdl:portType name="SessionMgr"> 
     110    <wsdl:operation name="addUser"> 
     111      <wsdl:input message="tns:addUserInputMsg"/> 
     112      <wsdl:output message="tns:addUserOutputMsg"/> 
     113    </wsdl:operation> 
    44114 
     115    <operation name="connect"> 
     116      <wsdl:input message="tns:connectInputMsg"/> 
     117      <wsdl:output message="tns:connectOutputMsg"/> 
     118    </operation> 
     119 
     120    <operation name="disconnect"> 
     121      <wsdl:input message="tns:disconnectInputMsg"/> 
     122      <wsdl:output message="tns:disconnectOutputMsg"/> 
     123    </operation> 
     124 
     125    <operation name="reqAuthorisation"> 
     126      <wsdl:input message="tns:reqAuthorisationInputMsg"/> 
     127      <wsdl:output message="tns:reqAuthorisationOutputMsg"/> 
     128    </operation> 
     129 
     130    <operation name="getPubKey"> 
     131      <wsdl:input message="tns:getPubKeyInputMsg"/> 
     132      <wsdl:output message="tns:getPubKeyOutputMsg"/> 
     133    </operation> 
     134  </wsdl:portType>   
    45135   
    46   <portType name="sessionMgr"> 
     136  <wsdl:binding name="SessionMgrBinding" type="tns:SessionMgr"> 
     137    <soap:binding 
     138     style="document" 
     139     transport="http://schemas.xmlsoap.org/soap/http"/> 
     140 
    47141    <operation name="addUser"> 
    48       <input message="tns:addUserRequest"/> 
    49       <output message="tns:addUserResponse"/> 
     142      <soap:operation soapAction="addUser"/> 
     143      <wsdl:input> 
     144        <soap:body use="literal"/> 
     145      </wsdl:input> 
     146      <wsdl:output> 
     147        <soap:body use="literal"/> 
     148      </wsdl:output>  
    50149    </operation> 
    51150     
    52151    <operation name="connect"> 
    53       <input message="tns:connectRequest"/> 
    54       <output message="tns:connectResponse"/> 
     152      <soap:operation soapAction="connect"/> 
     153      <wsdl:input> 
     154        <soap:body use="literal"/> 
     155      </wsdl:input> 
     156      <wsdl:output> 
     157        <soap:body use="literal"/> 
     158      </wsdl:output>  
    55159    </operation> 
    56  
     160     
     161    <operation name="disconnect"> 
     162      <soap:operation soapAction="disconnect"/> 
     163      <wsdl:input> 
     164        <soap:body use="literal"/> 
     165      </wsdl:input> 
     166      <wsdl:output> 
     167        <soap:body use="literal"/> 
     168      </wsdl:output>  
     169    </operation> 
     170     
    57171    <operation name="reqAuthorisation"> 
    58       <input message="tns:authorisationRequest"/> 
    59       <output message="tns:authorisationResponse"/> 
     172      <soap:operation soapAction="reqAuthorisation"/> 
     173      <wsdl:input> 
     174        <soap:body use="literal"/> 
     175      </wsdl:input> 
     176      <wsdl:output> 
     177        <soap:body use="literal"/> 
     178      </wsdl:output>  
    60179    </operation> 
    61180 
    62181    <operation name="getPubKey"> 
    63       <input message="tns:pubKeyRequest"/> 
    64       <output message="tns:pubKeyResponse"/> 
    65     </operation> 
    66   </portType> 
     182      <soap:operation soapAction="getPubKey"/> 
     183      <wsdl:input> 
     184        <soap:body use="literal"/> 
     185      </wsdl:input> 
     186      <wsdl:output> 
     187        <soap:body use="literal"/> 
     188      </wsdl:output>  
     189    </operation>     
     190   
     191  </wsdl:binding> 
    67192 
    68   <binding name="sessionMgrBinding" type="tns:sessionMgr"> 
    69     <soap:binding style="rpc"  
    70                       transport="http://schemas.xmlsoap.org/soap/http"/> 
    71     <operation name="addUser"> 
    72       <soap:operation soapAction="urn:sessionMgr#addUser"/> 
    73       <input> 
    74         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    75                     namespace="urn:sessionMgr" use="encoded"/> 
    76       </input> 
    77       <output> 
    78         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    79                     namespace="urn:sessionMgr" use="encoded"/> 
    80       </output>  
    81     </operation> 
    82     <operation name="connect"> 
    83       <soap:operation soapAction="urn:sessionMgr#connect"/> 
    84       <input> 
    85         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    86                     namespace="urn:sessionMgr" use="encoded"/> 
    87       </input> 
    88       <output> 
    89         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    90                     namespace="urn:sessionMgr" use="encoded"/> 
    91       </output>  
    92     </operation> 
    93     <operation name="reqAuthorisation"> 
    94       <soap:operation soapAction="urn:sessionMgr#reqAuthorisation"/> 
    95       <input> 
    96         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    97                     namespace="urn:sessionMgr" use="encoded"/> 
    98       </input> 
    99       <output> 
    100         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    101                     namespace="urn:sessionMgr" use="encoded"/> 
    102       </output> 
    103     </operation> 
    104     <operation name="getPubKey"> 
    105       <soap:operation soapAction="urn:sessionMgr#getPubKey"/> 
    106       <input> 
    107         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    108                     namespace="urn:sessionMgr" use="encoded"/> 
    109       </input> 
    110       <output> 
    111         <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" 
    112                     namespace="urn:sessionMgr" use="encoded"/> 
    113       </output> 
    114     </operation> 
    115   </binding> 
    116  
    117   <service name="sessionMgrService"> 
    118     <documentation>NDG BADC Session Manager Web Service</documentation> 
    119     <port name="sessionMgr" binding="tns:sessionMgrBinding"> 
    120       <soap:address location=""/> 
    121     </port> 
    122   </service> 
    123 </definitions> 
     193  <wsdl:service name="SessionMgrService"> 
     194    <wsdl:documentation>NERC Data Grid Session Manager web service</wsdl:documentation> 
     195    <wsdl:port name="SessionMgr" binding="tns:SessionMgrBinding"> 
     196      <soap:address location="http://localhost:5000"/> 
     197    </wsdl:port> 
     198  </wsdl:service> 
     199</wsdl:definitions> 
Note: See TracChangeset for help on using the changeset viewer.