source: TI12-security/trunk/python/www/html/sessionMgr.wsdl @ 2620

Subversion URL: http://proj.badc.rl.ac.uk/svn/ndg/TI12-security/trunk/python/www/html/sessionMgr.wsdl@2620
Revision 2620, 7.8 KB checked in by pjkersha, 13 years ago (diff)

ndg.security.server/ndg/security/server/SessionMgr/server-config.tac:

  • added X509CertRead import
  • removed getCookie keyword from connect call - no longer needed
  • changed connect response to return sessID instead of cookie
  • soap_disconnect - pick up userCert arg if message wasn't signed
  • soap_getAttCert - remove refs to encrSessMgrURI - no longer needed

ndg.security.server/ndg/security/server/SessionMgr/init.py:

  • include X509Cert import
  • SessionMgr?.connect: removed getCookie keyword no longer needed. Put in

explicit keyword args rather than kw; return sessID instead of cookie

  • SessionMgr?.connect2UserSession: allow X509Cert type input for cert.

www/html/sessionMgr.wsdl,
ndg.security.server/ndg/security/server/SessionMgr/SessionMgr_services_server.py,
ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services.py,
ndg.security.common/ndg/security/common/SessionMgr/SessionMgr_services_types.py:

  • get rid of getCookie input to connect
  • change sessCookie to sessID in connect response
  • get rid of encrSessMgrURI inputs

ndg.security.test/ndg/security/test/SessionMgr/SessionMgrClientTest.py:

  • swapped sessCookie for sessID vars
  • commented out test1AddUser - this method is likely to go from Session

Manager

  • test2CookieConnect and test3ProxyCertConnect replaced with test2Connect

as SessionMgr?.connect effectively behaces the same in both cases, a proxy
cert and sess id are returned.

  • test3ConnectNoCreateServerSess: new test returns proxy cert from Session

Manager but doesn't create a session - effectively MyProxy? get delegation over
SOAP

  • test4CookieDisconnect -> test4DisconnectUsingSessID because sess id is used

instead of cookies for SM interface

  • test5ProxyCertDisconnect -> test5DisconnectUsingProxyCert - more clear

naming

  • likewise, test6CookieGetAttCert -> test6GetAttCertUsingSessID ... and

other test method names ...

  • test7ProxyCertGetAttCert: important change - use proxy cert returned from

test2Connect in order to authenticate in this request

ndg.security.test/ndg/security/test/SessionMgr/sessionMgrClientTest.cfg:

  • updated test section names
  • use server cert settings for initial connection to SM. Once connect has

been called, client can use proxy cert.

ndg.security.test/ndg/security/test/SessionCookie/SessionCookieTest.py:
fixes for complete working version

ndg.security.common/ndg/security/common/SessionMgr/init.py:

  • remove getCookie keyword for connect method. connect now returns sessID

instead of complete cookie

  • remove encrSessionMgrURI and sessCookie keywords from disconnect and

getAttCert calls - no longer needed.

ndg.security.common/ndg/security/common/X509.py:

  • enable X509Stack.push to take a cert in string format as input.

ndg.security.common/ndg/security/common/SessionCookie.py:

  • include timedelta import - enables specification of lifetime from now

for cookie

  • fix signingPriKey -> priKey

ndg.security.common/ndg/security/common/wsSecurity.py: make Crypto import
conditional as users of SignatureHandler? only don't need it

  • Property svn:eol-style set to native
  • Property svn:keywords set to Author Date Id Revision
Line 
1<?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:sessionMgr"
10 targetNamespace="urn:ndg:security:sessionMgr">
11
12  <wsdl:types>
13    <xsd:schema targetNamespace="urn:ndg:security:sessionMgr">
14      <xsd:element name="addUser">
15        <xsd:complexType>
16          <xsd:sequence>
17            <xsd:element name="username" type="xsd:string" minOccurs="1" maxOccurs="1"/>
18            <xsd:element name="passphrase" type="xsd:string" minOccurs="1" maxOccurs="1"/>
19          </xsd:sequence>
20        </xsd:complexType>
21      </xsd:element>
22     
23      <xsd:element name="addUserResponse">
24        <xsd:complexType/>
25      </xsd:element>
26
27      <xsd:element name="connect">
28        <xsd:complexType>
29          <xsd:sequence>
30            <xsd:element name="username" type="xsd:string" minOccurs="1" maxOccurs="1"/>
31            <xsd:element name="passphrase" type="xsd:string" minOccurs="1" maxOccurs="1"/>
32                    <xsd:element name="createServerSess" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
33          </xsd:sequence>
34        </xsd:complexType>
35      </xsd:element>
36     
37      <xsd:element name="connectResponse">
38        <xsd:complexType>
39                  <xsd:sequence>
40                    <xsd:element name="proxyCert" type="xsd:string" minOccurs="1" maxOccurs="1"/>
41                    <xsd:element name="proxyPriKey" type="xsd:string" minOccurs="1" maxOccurs="1"/>
42                    <xsd:element name="userCert" type="xsd:string" minOccurs="1" maxOccurs="1"/>
43                    <xsd:element name="sessID" type="xsd:string" minOccurs="0" maxOccurs="1"/>
44                  </xsd:sequence>
45                </xsd:complexType>
46      </xsd:element>
47
48      <xsd:element name="disconnect">
49        <xsd:complexType>
50                  <xsd:sequence>
51                    <xsd:element name="userCert" type="xsd:string" minOccurs="0" maxOccurs="1"/>
52                    <xsd:element name="sessID" type="xsd:string" minOccurs="0" maxOccurs="1"/>
53                  </xsd:sequence>
54                </xsd:complexType>
55      </xsd:element>
56
57      <xsd:element name="disconnectResponse">
58        <xsd:complexType/>
59      </xsd:element>
60           
61      <xsd:element name="getAttCert">
62        <xsd:complexType>
63                  <xsd:sequence>
64                    <xsd:element name="userCert" type="xsd:string" minOccurs="0" maxOccurs="1"/>
65                    <xsd:element name="sessID" type="xsd:string" minOccurs="0" maxOccurs="1"/>
66                    <xsd:element name="attAuthorityURI" type="xsd:string" minOccurs="1" maxOccurs="1"/>
67                    <xsd:element name="attAuthorityCert" type="xsd:string" minOccurs="0" maxOccurs="1"/>
68                    <xsd:element name="reqRole" type="xsd:string" minOccurs="0" maxOccurs="1"/>
69                    <xsd:element name="mapFromTrustedHosts" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
70                    <xsd:element name="rtnExtAttCertList" type="xsd:boolean" minOccurs="1" maxOccurs="1"/>
71                        <xsd:element name="extAttCert" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
72                        <xsd:element name="extTrustedHost" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
73                  </xsd:sequence>
74                </xsd:complexType>
75      </xsd:element>
76     
77      <xsd:element name="getAttCertResponse">
78        <xsd:complexType>
79              <xsd:sequence>
80                <xsd:element name="attCert" type="xsd:string" minOccurs="0" maxOccurs="1"/>
81                <xsd:element name="msg" type="xsd:string" minOccurs="0" maxOccurs="1"/>
82                        <xsd:element name="extAttCertOut" type="xsd:string" minOccurs="0" maxOccurs="unbounded"/>
83              </xsd:sequence>
84            </xsd:complexType>
85      </xsd:element>
86
87      <xsd:element name="getX509Cert">
88        <xsd:complexType/>
89      </xsd:element>
90     
91      <xsd:element name="getX509CertResponse">
92        <xsd:complexType>
93                  <xsd:sequence>
94                    <xsd:element name="x509Cert" type="xsd:string" minOccurs="1" maxOccurs="1"/>
95                  </xsd:sequence>
96                </xsd:complexType>
97      </xsd:element>
98
99    </xsd:schema>
100  </wsdl:types>
101 
102  <wsdl:message name="addUserInputMsg">
103    <wsdl:part name="parameters" element="tns:addUser"/>
104  </wsdl:message>
105
106  <wsdl:message name="addUserOutputMsg">
107    <wsdl:part name="parameters" element="tns:addUserResponse"/>
108  </wsdl:message>
109 
110  <wsdl:message name="connectInputMsg">
111    <wsdl:part name="parameters" element="tns:connect"/>
112  </wsdl:message>
113
114  <wsdl:message name="connectOutputMsg">
115    <wsdl:part name="parameters" element="tns:connectResponse"/>
116  </wsdl:message>
117 
118  <wsdl:message name="disconnectInputMsg">
119    <wsdl:part name="parameters" element="tns:disconnect"/>
120  </wsdl:message>
121
122  <wsdl:message name="disconnectOutputMsg">
123    <wsdl:part name="parameters" element="tns:disconnectResponse"/>
124  </wsdl:message>
125
126  <wsdl:message name="getAttCertInputMsg">
127    <wsdl:part name="parameters" element="tns:getAttCert"/>
128  </wsdl:message>
129
130  <wsdl:message name="getAttCertOutputMsg">
131    <wsdl:part name="parameters" element="tns:getAttCertResponse"/>
132  </wsdl:message>
133
134  <wsdl:message name="getX509CertInputMsg">
135    <wsdl:part name="parameters" element="tns:getX509Cert"/>
136  </wsdl:message>
137
138  <wsdl:message name="getX509CertOutputMsg">
139    <wsdl:part name="parameters" element="tns:getX509CertResponse"/>
140  </wsdl:message>
141
142  <wsdl:portType name="SessionMgr">
143    <wsdl:operation name="addUser">
144      <wsdl:input message="tns:addUserInputMsg"/>
145      <wsdl:output message="tns:addUserOutputMsg"/>
146    </wsdl:operation>
147
148    <wsdl:operation name="connect">
149      <wsdl:input message="tns:connectInputMsg"/>
150      <wsdl:output message="tns:connectOutputMsg"/>
151    </wsdl:operation>
152
153    <wsdl:operation name="disconnect">
154      <wsdl:input message="tns:disconnectInputMsg"/>
155      <wsdl:output message="tns:disconnectOutputMsg"/>
156    </wsdl:operation>
157
158    <wsdl:operation name="getAttCert">
159      <wsdl:input message="tns:getAttCertInputMsg"/>
160      <wsdl:output message="tns:getAttCertOutputMsg"/>
161    </wsdl:operation>
162
163    <wsdl:operation name="getX509Cert">
164      <wsdl:input message="tns:getX509CertInputMsg"/>
165      <wsdl:output message="tns:getX509CertOutputMsg"/>
166    </wsdl:operation>
167  </wsdl:portType> 
168 
169  <wsdl:binding name="SessionMgrBinding" type="tns:SessionMgr">
170    <soap:binding
171     style="document"
172     transport="http://schemas.xmlsoap.org/soap/http"/>
173
174    <wsdl:operation name="addUser">
175      <soap:operation soapAction="addUser"/>
176      <wsdl:input>
177        <soap:body use="literal"/>
178      </wsdl:input>
179      <wsdl:output>
180        <soap:body use="literal"/>
181      </wsdl:output>
182    </wsdl:operation>
183   
184    <wsdl:operation name="connect">
185      <soap:operation soapAction="connect"/>
186      <wsdl:input>
187        <soap:body use="literal"/>
188      </wsdl:input>
189      <wsdl:output>
190        <soap:body use="literal"/>
191      </wsdl:output>
192    </wsdl:operation>
193   
194    <wsdl:operation name="disconnect">
195      <soap:operation soapAction="disconnect"/>
196      <wsdl:input>
197        <soap:body use="literal"/>
198      </wsdl:input>
199      <wsdl:output>
200        <soap:body use="literal"/>
201      </wsdl:output>
202    </wsdl:operation>
203   
204    <wsdl:operation name="getAttCert">
205      <soap:operation soapAction="getAttCert"/>
206      <wsdl:input>
207        <soap:body use="literal"/>
208      </wsdl:input>
209      <wsdl:output>
210        <soap:body use="literal"/>
211      </wsdl:output>
212    </wsdl:operation>
213
214    <wsdl:operation name="getX509Cert">
215      <soap:operation soapAction="getX509Cert"/>
216      <wsdl:input>
217        <soap:body use="literal"/>
218      </wsdl:input>
219      <wsdl:output>
220        <soap:body use="literal"/>
221      </wsdl:output>
222    </wsdl:operation>   
223 
224  </wsdl:binding>
225
226  <wsdl:service name="SessionMgrService">
227    <wsdl:documentation>NERC Data Grid Session Manager web service</wsdl:documentation>
228    <wsdl:port name="SessionMgr" binding="tns:SessionMgrBinding">
229      <soap:address location="http://localhost:5000"/>
230    </wsdl:port>
231  </wsdl:service>
232</wsdl:definitions>
Note: See TracBrowser for help on using the repository browser.