From 0e59b9286e528bb3563a2c2e919084d04e321ec6 Mon Sep 17 00:00:00 2001 From: "Stefan E. Funk" <stefan.funk@daasi.de> Date: Tue, 17 Apr 2012 10:33:55 +0000 Subject: [PATCH] moved certificate things into tgextra-crud wsdl. git-svn-id: https://textgridlab.org/svn/textgrid/trunk/middleware/tgauth@12675 7c539038-3410-0410-b1ec-0f2a7bf1c452 --- .../rbacSoap/wsdl-tg2.0/tgextra-crud.wsdl | 140 ++++++++++++++++++ .../rbacSoap/wsdl-tg2.0/tgextra.wsdl | 124 ---------------- 2 files changed, 140 insertions(+), 124 deletions(-) diff --git a/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra-crud.wsdl b/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra-crud.wsdl index c1a2049..faa463f 100644 --- a/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra-crud.wsdl +++ b/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra-crud.wsdl @@ -118,6 +118,44 @@ </xsd:sequence> </xsd:complexType> </xsd:element> + <xsd:element name="getCSRRequest"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="auth" type="xsd:string" minOccurs="1" + maxOccurs="1" /> + <xsd:element name="log" type="xsd:string" minOccurs="0" + maxOccurs="1" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="getCSRResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="csr" type="xsd:base64Binary" + minOccurs="1" maxOccurs="1" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="putCRTRequest"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="auth" type="xsd:string" minOccurs="1" + maxOccurs="1" /> + <xsd:element name="log" type="xsd:string" minOccurs="0" + maxOccurs="1" /> + <xsd:element name="crt" type="xsd:string" minOccurs="1" + maxOccurs="1" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + <xsd:element name="putCRTResponse"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="success" type="xsd:boolean" + minOccurs="1" maxOccurs="1" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element name="getEPPNResponse"> <xsd:complexType> <xsd:sequence> @@ -246,6 +284,18 @@ <wsdl:message name="getSLCResponse"> <wsdl:part element="tns:getSLCResponse" name="getSLCOutput" /> </wsdl:message> + <wsdl:message name="getCSRRequest"> + <wsdl:part element="tns:getCSRRequest" name="getCSRInput" /> + </wsdl:message> + <wsdl:message name="getCSRResponse"> + <wsdl:part element="tns:getCSRResponse" name="getCSROutput" /> + </wsdl:message> + <wsdl:message name="putCRTRequest"> + <wsdl:part element="tns:putCRTRequest" name="putCRTInput" /> + </wsdl:message> + <wsdl:message name="putCRTResponse"> + <wsdl:part element="tns:putCRTResponse" name="putCRTOutput" /> + </wsdl:message> <wsdl:message name="getUUIDRequest"> <wsdl:part element="tns:getUUIDRequest" name="getUUIDInput" /> </wsdl:message> @@ -593,6 +643,64 @@ <wsdl:fault name="authenticationFault" message="tns:authenticationFault" /> <wsdl:fault name="unknownResourceFault" message="tns:unknownResourceFault" /> </wsdl:operation> + <wsdl:operation name="getCSR"> + <wsdl:documentation> + The Portal may use this to retrieve a Dummy Certificate Signing + Request (CSR) + in PEM format, for which the RBAC's accompanying daemon + will hold the real key. + <ul> + <li> + <b>Input Parameters</b> + getCSRRequest, with elements + <ul> + <li>auth - String, SessionID of user</li> + <li>log - String for log information, optional</li> + </ul> + </li> + <li> + <b>Output Parameters</b> + getCSRResponse, with element + <ul> + <li>csr - Base64binary String with the CSR. Contains only + printable ASCII Character.</li> + </ul> + </li> + </ul> + </wsdl:documentation> + <wsdl:input message="tns:getCSRRequest" /> + <wsdl:output message="tns:getCSRResponse" /> + <wsdl:fault name="authenticationFault" message="tns:authenticationFault" /> + <wsdl:fault name="unknownResourceFault" message="tns:unknownResourceFault" /> + </wsdl:operation> + <wsdl:operation name="putCRT"> + <wsdl:documentation> + Puts the signed Certificate into the RBAC's accompanying daemon that + holds the key. + <ul> + <li> + <b>Input Parameters</b> + putCRTRequest, with elements + <ul> + <li>auth - String, SessionID of user</li> + <li>log - String for log information, optional</li> + <li>crt - the Certificate as a String</li> + </ul> + </li> + <li> + <b>Output Parameters</b> + putCRTResponse, with element + <ul> + <li>success, Boolean.</li> + </ul> + </li> + </ul> + </wsdl:documentation> + <wsdl:input message="tns:putCRTRequest" /> + <wsdl:output message="tns:putCRTResponse" /> + <wsdl:fault name="authenticationFault" message="tns:authenticationFault" /> + <wsdl:fault name="unknownResourceFault" message="tns:unknownResourceFault" /> + </wsdl:operation> <wsdl:operation name="nearlyPublish"> <wsdl:documentation>++TODO++</wsdl:documentation> <wsdl:input message="tns:nearlyPublishRequest" /> @@ -725,6 +833,38 @@ <soap:fault use="literal" name="unknownResourceFault" /> </wsdl:fault> </wsdl:operation> + <wsdl:operation name="getCSR"> + <soap:operation + soapAction="http://textgrid.info/namespaces/middleware/tgauth-crud/getCSR" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="authenticationFault"> + <soap:fault use="literal" name="authenticationFault" /> + </wsdl:fault> + <wsdl:fault name="unknownResourceFault"> + <soap:fault use="literal" name="unknownResourceFault" /> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="putCRT"> + <soap:operation + soapAction="http://textgrid.info/namespaces/middleware/tgauth-crud/putCRT" /> + <wsdl:input> + <soap:body use="literal" /> + </wsdl:input> + <wsdl:output> + <soap:body use="literal" /> + </wsdl:output> + <wsdl:fault name="authenticationFault"> + <soap:fault use="literal" name="authenticationFault" /> + </wsdl:fault> + <wsdl:fault name="unknownResourceFault"> + <soap:fault use="literal" name="unknownResourceFault" /> + </wsdl:fault> + </wsdl:operation> </wsdl:binding> <!-- ################################################################### --> diff --git a/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra.wsdl b/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra.wsdl index 773583c..e19672e 100644 --- a/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra.wsdl +++ b/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-tg2.0/tgextra.wsdl @@ -56,24 +56,6 @@ </xsd:sequence> </xsd:complexType> </xsd:element> - <xsd:element name="getCSRRequest"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="auth" type="xsd:string" minOccurs="1" - maxOccurs="1" /> - <xsd:element name="log" type="xsd:string" minOccurs="0" - maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="getCSRResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="csr" type="xsd:base64Binary" - minOccurs="1" maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> <xsd:element name="getSupportedUserAttributesRequest"> <xsd:complexType> <xsd:sequence> @@ -582,26 +564,6 @@ </xsd:sequence> </xsd:complexType> </xsd:element> - <xsd:element name="putCRTRequest"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="auth" type="xsd:string" minOccurs="1" - maxOccurs="1" /> - <xsd:element name="log" type="xsd:string" minOccurs="0" - maxOccurs="1" /> - <xsd:element name="crt" type="xsd:string" minOccurs="1" - maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - <xsd:element name="putCRTResponse"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="success" type="xsd:boolean" - minOccurs="1" maxOccurs="1" /> - </xsd:sequence> - </xsd:complexType> - </xsd:element> <xsd:element name="setMyUserAttributesRequest"> <xsd:complexType> <xsd:sequence> @@ -991,12 +953,6 @@ <wsdl:message name="getProjectDescriptionResponse"> <wsdl:part element="tns:getProjectDescriptionResponse" name="getProjectDescriptionOutput" /> </wsdl:message> - <wsdl:message name="getCSRRequest"> - <wsdl:part element="tns:getCSRRequest" name="getCSRInput" /> - </wsdl:message> - <wsdl:message name="getCSRResponse"> - <wsdl:part element="tns:getCSRResponse" name="getCSROutput" /> - </wsdl:message> <wsdl:message name="getSidRequest"> <wsdl:part element="tns:getSidRequest" name="getSidInput" /> </wsdl:message> @@ -1097,12 +1053,6 @@ <wsdl:message name="setNameResponse"> <wsdl:part element="tns:booleanResponse" name="setNameOutput" /> </wsdl:message> - <wsdl:message name="putCRTRequest"> - <wsdl:part element="tns:putCRTRequest" name="putCRTInput" /> - </wsdl:message> - <wsdl:message name="putCRTResponse"> - <wsdl:part element="tns:putCRTResponse" name="putCRTOutput" /> - </wsdl:message> <wsdl:message name="deactivateProjectRequest"> <wsdl:part element="tns:deactivateProjectRequest" name="deactivateProjectInput" /> </wsdl:message> @@ -1897,36 +1847,6 @@ <wsdl:input message="tns:getProjectDescriptionRequest" /> <wsdl:output message="tns:getProjectDescriptionResponse" /> </wsdl:operation> - <wsdl:operation name="getCSR"> - <wsdl:documentation> - The Portal may use this to retrieve a Dummy Certificate Signing - Request (CSR) - in PEM format, for which the RBAC's accompanying daemon - will hold the real key. - <ul> - <li> - <b>Input Parameters</b> - getCSRRequest, with elements - <ul> - <li>auth - String, SessionID of user</li> - <li>log - String for log information, optional</li> - </ul> - </li> - <li> - <b>Output Parameters</b> - getCSRResponse, with element - <ul> - <li>csr - Base64binary String with the CSR. Contains only - printable ASCII Character.</li> - </ul> - </li> - </ul> - </wsdl:documentation> - <wsdl:input message="tns:getCSRRequest" /> - <wsdl:output message="tns:getCSRResponse" /> - <wsdl:fault name="authenticationFault" message="tns:authenticationFault" /> - <wsdl:fault name="unknownResourceFault" message="tns:unknownResourceFault" /> - </wsdl:operation> <wsdl:operation name="getSid"> <wsdl:documentation> Returns some random SessionID suitable for RBAC. @@ -2515,34 +2435,6 @@ <wsdl:fault name="authenticationFault" message="tns:authenticationFault" /> <wsdl:fault name="notEmptyFault" message="tns:notEmptyFault" /> </wsdl:operation> - <wsdl:operation name="putCRT"> - <wsdl:documentation> - Puts the signed Certificate into the RBAC's accompanying daemon that - holds the key. - <ul> - <li> - <b>Input Parameters</b> - putCRTRequest, with elements - <ul> - <li>auth - String, SessionID of user</li> - <li>log - String for log information, optional</li> - <li>crt - the Certificate as a String</li> - </ul> - </li> - <li> - <b>Output Parameters</b> - putCRTResponse, with element - <ul> - <li>success, Boolean.</li> - </ul> - </li> - </ul> - </wsdl:documentation> - <wsdl:input message="tns:putCRTRequest" /> - <wsdl:output message="tns:putCRTResponse" /> - <wsdl:fault name="authenticationFault" message="tns:authenticationFault" /> - <wsdl:fault name="unknownResourceFault" message="tns:unknownResourceFault" /> - </wsdl:operation> <wsdl:operation name="setMyUserAttributes"> <wsdl:documentation>TODO</wsdl:documentation> <wsdl:input message="tns:setMyUserAttributesRequest" /> @@ -2807,22 +2699,6 @@ <soap:body use="literal" /> </wsdl:output> </wsdl:operation> - <wsdl:operation name="getCSR"> - <soap:operation - soapAction="http://textgrid.info/namespaces/middleware/tgauth/getCSR" /> - <wsdl:input> - <soap:body use="literal" /> - </wsdl:input> - <wsdl:output> - <soap:body use="literal" /> - </wsdl:output> - <wsdl:fault name="authenticationFault"> - <soap:fault use="literal" name="authenticationFault" /> - </wsdl:fault> - <wsdl:fault name="unknownResourceFault"> - <soap:fault use="literal" name="unknownResourceFault" /> - </wsdl:fault> - </wsdl:operation> </wsdl:binding> <!-- ################################################################### --> -- GitLab