Merge pull request #29 from gematik/publishInternalRelease-28

Veröffentlichung Consumer_24.4
gematik · Nov 27, 2024 · 1849327 · 1849327
2 parents d1ee6fc + 78507da
commit 1849327
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 14 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,6 +2,9 @@
 
 # Release Notes api-telematik
 
+## Release Consumer 1.2.0
+- C_12110: Enable Consumer to sign an access permission to the ePA 3.0 using plain ECDSA signatures
+
 ## Release 6.0.0-2
 - Fix of invalid Schema in CardService
 

diff --git a/consumer/CertificateService.wsdl b/consumer/CertificateService.wsdl
@@ -8,15 +8,17 @@
 			C_11647: change namespace CERT,CERTW
 		version: V3.0.0-1
 			fix: add missing SOAP operations for ReadCertificate
+		version: V3.0.1
+			change namespace CERT
 	 End of Version History-->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v3.0" xmlns:CERTW="http://ws.gematik.de/consumer/CertificateService/WSDL/v3.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/WSDL/v3.0">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v3.1" xmlns:CERTW="http://ws.gematik.de/consumer/CertificateService/WSDL/v3.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/WSDL/v3.0">
 	<documentation>
 		Copyright (c) 2019, gematik - Gesellschaft fÃ¼r Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
 		Beschreibung: Zertifikatsdienst des Basis-Consumer
 	</documentation>
 	<types>
 		<xs:schema>
-			<xs:import schemaLocation="CertificateService.xsd" namespace="http://ws.gematik.de/consumer/CertificateService/v3.0"/>
+			<xs:import schemaLocation="CertificateService.xsd" namespace="http://ws.gematik.de/consumer/CertificateService/v3.1"/>
 			<xs:import schemaLocation="../tel/error/TelematikError.xsd" namespace="http://ws.gematik.de/tel/error/v2.0"/>
 		</xs:schema>
 	</types>

diff --git a/consumer/CertificateService.xsd b/consumer/CertificateService.xsd
@@ -7,15 +7,17 @@
 			* changed namespace CONSUMER, CERT, targetNameSpace
 		version: V3.0.0
 			* C_11647: add operation ReadCertificate
+		version: V3.1.0
+				* update reference to new version of CERTCMN
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v3.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" xmlns:CCTX="http://ws.gematik.de/consumer/ConsumerContext/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/v3.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.0.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/consumer/CertificateService/v3.1" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.1" xmlns:CCTX="http://ws.gematik.de/consumer/ConsumerContext/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateService/v3.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1.0">
 	<annotation>
 		<documentation xml:lang="de">Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
 		Beschreibung: Schema für den Zertifikatsdienst des Basis-Consumer</documentation>
 	</annotation>
 	<import namespace="http://ws.gematik.de/tel/error/v2.0" schemaLocation="../tel/error/TelematikError.xsd"/>
 	<import namespace="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" schemaLocation="ConsumerCommon.xsd"/>
-	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" schemaLocation="CertificateServiceCommon.xsd"/>
+	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.1" schemaLocation="CertificateServiceCommon.xsd"/>
 	<!-- ================== Datentyp für krypt.Algorithmus    ===================== -->
 	<simpleType name="CryptType">
 		<restriction base="token">

diff --git a/consumer/CertificateServiceCommon.xsd b/consumer/CertificateServiceCommon.xsd
@@ -5,8 +5,10 @@
 			version: V2.0.0
 				* add types for ReadCardCertificate Operation
 				* fix character encoding
+			version: V2.1.0
+				* add option in CertRefEnum
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" targetNamespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.0.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.1" targetNamespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.1.0">
 	<annotation>
 		<documentation xml:lang="de">
 			Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH.
@@ -18,6 +20,7 @@
 	<simpleType name="CertRefEnum">
 		<restriction base="token">
 			<enumeration value="C.AUT"/>
+			<enumeration value="C.OSIG"/>
 		</restriction>
 	</simpleType>
 	<element name="X509DataInfoList" type="CERTCMN:X509DataInfoListType"/>

diff --git a/consumer/SignatureService.wsdl b/consumer/SignatureService.wsdl
@@ -12,15 +12,18 @@
 			fix character encoding
 		version: V3.1.0
 			change namespace SIG
+		version: V3.2.0
+			add SignPlain operation
+			change namespace SIG
 	 End of Version History-->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v3.1" xmlns:SIGW="http://ws.gematik.de/consumer/SignatureService/WSDL/v3.1" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/WSDL/v3.1">
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v3.2" xmlns:SIGW="http://ws.gematik.de/consumer/SignatureService/WSDL/v3.2" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/WSDL/v3.2">
 	<documentation>
 		Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
 		Beschreibung: Basis-Consumer Signatur Basisanwendung
 	</documentation>
 	<types>
 		<xs:schema>
-			<xs:import schemaLocation="SignatureService.xsd" namespace="http://ws.gematik.de/consumer/SignatureService/v3.1"/>
+			<xs:import schemaLocation="SignatureService.xsd" namespace="http://ws.gematik.de/consumer/SignatureService/v3.2"/>
 			<xs:import schemaLocation="../tel/error/TelematikError.xsd" namespace="http://ws.gematik.de/tel/error/v2.0"/>
 		</xs:schema>
 	</types>
@@ -36,6 +39,12 @@
 	<message name="SignDocumentResponseMessage">
 		<part name="parameter" element="SIG:SignDocumentResponse"/>
 	</message>
+	<message name="SignPlainRequestMessage">
+		<part name="parameter" element="SIG:SignPlain"/>
+	</message>
+	<message name="SignPlainResponseMessage">
+		<part name="parameter" element="SIG:SignPlainResponse"/>
+	</message>
 	<message name="ExternalAuthenticateRequestMessage">
 		<part name="parameter" element="SIG:ExternalAuthenticate"/>
 	</message>
@@ -56,6 +65,11 @@
 			<output message="SIGW:SignDocumentResponseMessage"/>
 			<fault name="FaultMessage" message="SIGW:FaultMessage"/>
 		</operation>
+		<operation name="SignPlain">
+			<input message="SIGW:SignPlainRequestMessage"/>
+			<output message="SIGW:SignPlainResponseMessage"/>
+			<fault name="FaultMessage" message="SIGW:FaultMessage"/>
+		</operation>
 		<operation name="ExternalAuthenticate">
 			<input message="SIGW:ExternalAuthenticateRequestMessage"/>
 			<output message="SIGW:ExternalAuthenticateResponseMessage"/>
@@ -65,7 +79,7 @@
 	<binding name="SignatureServiceBinding" type="SIGW:SignatureServicePortType">
 		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
 		<operation name="VerifyDocument">
-			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.1#VerifyDocument"/>
+			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.2#VerifyDocument"/>
 			<input>
 				<soap:body use="literal"/>
 			</input>
@@ -77,7 +91,7 @@
 			</fault>
 		</operation>
 		<operation name="SignDocument">
-			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.1#SignDocument"/>
+			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.2#SignDocument"/>
 			<input>
 				<soap:body use="literal"/>
 			</input>
@@ -89,7 +103,19 @@
 			</fault>
 		</operation>
 		<operation name="ExternalAuthenticate">
-			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.1#ExternalAuthenticate"/>
+			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.2#ExternalAuthenticate"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="FaultMessage">
+				<soap:fault name="FaultMessage" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="SignPlain">
+			<soap:operation soapAction="http://ws.gematik.de/consumer/SignatureService/v3.2#SignPlain"/>
 			<input>
 				<soap:body use="literal"/>
 			</input>

diff --git a/consumer/SignatureService.xsd b/consumer/SignatureService.xsd
@@ -20,8 +20,13 @@
 				* fix character encoding
 			version: V3.1.0
 				* Remove OptionalInputs from ExternalAuthenticate
+			version: V3.2.0
+				* Add plain ECDSA signature as new SignPlain operation
+				* Fixes in SignDocument operation
+			version: V3.2.1
+				* update reference to new version of CERTCMN
 	 End of Version History-->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:vr="urn:oasis:names:tc:dss-x:1.0:profiles:verificationreport:schema#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dss="urn:oasis:names:tc:dss:1.0:core:schema" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v3.1" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v3.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:sp="urn:oasis:names:tc:dss-x:1.0:profiles:SignaturePolicy:schema#" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v1.0" xmlns:CCTX="http://ws.gematik.de/consumer/ConsumerContext/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/v3.1" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.1.0">
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:vr="urn:oasis:names:tc:dss-x:1.0:profiles:verificationreport:schema#" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:dss="urn:oasis:names:tc:dss:1.0:core:schema" xmlns:SIG="http://ws.gematik.de/consumer/SignatureService/v3.2" xmlns:CRYPT="http://ws.gematik.de/consumer/EncryptionService/v3.0" xmlns:CONSUMER="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" xmlns:sp="urn:oasis:names:tc:dss-x:1.0:profiles:SignaturePolicy:schema#" xmlns:CERTCMN="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.1" xmlns:CCTX="http://ws.gematik.de/consumer/ConsumerContext/v1.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/consumer/SignatureService/v3.2" elementFormDefault="qualified" attributeFormDefault="unqualified" version="3.2.1">
 	<annotation>
 		<documentation xml:lang="de">
 			Copyright (c) 2019, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten. 
@@ -32,14 +37,13 @@
 	<import namespace="urn:oasis:names:tc:dss-x:1.0:profiles:SignaturePolicy:schema#" schemaLocation="../ext/oasis-dssx-1.0-profiles-sigpolicy-schema-cd01.xsd"/>
 	<import namespace="urn:oasis:names:tc:dss-x:1.0:profiles:verificationreport:schema#" schemaLocation="../ext/oasis-dssx-1.0-profiles-vr-cd1.xsd"/>
 	<import namespace="urn:oasis:names:tc:dss:1.0:core:schema" schemaLocation="../ext/oasis-dss-core-schema-v1.0-os.xsd"/>
-	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.0" schemaLocation="CertificateServiceCommon.xsd"/>
+	<import namespace="http://ws.gematik.de/consumer/CertificateServiceCommon/v2.1" schemaLocation="CertificateServiceCommon.xsd"/>
 	<import namespace="http://ws.gematik.de/consumer/EncryptionService/v3.0" schemaLocation="EncryptionService.xsd"/>
 	<import namespace="http://ws.gematik.de/consumer/ConsumerCommon/v2.0" schemaLocation="ConsumerCommon.xsd"/>
 	<import namespace="http://ws.gematik.de/tel/error/v2.0" schemaLocation="../tel/error/TelematikError.xsd"/>
 	<element name="SignDocument">
 		<complexType>
 			<sequence>
-				<!--				<element ref="CONSUMER:CardHandle"/> -->
 				<element ref="CRYPT:PrivateKeyOnCard"/>
 				<element ref="SIG:SignRequest" maxOccurs="unbounded"/>
 			</sequence>
@@ -51,7 +55,13 @@
 				<element name="OptionalInputs" minOccurs="0">
 					<complexType>
 						<all>
-							<element ref="dss:SignatureType" minOccurs="0"/>
+							<element name="SignatureType" minOccurs="0">
+								<simpleType>
+									<restriction base="anyURI">
+										<enumeration value="urn:ietf:rfc:5652"/>
+									</restriction>
+								</simpleType>
+							</element>
 							<element ref="dss:Properties" minOccurs="0"/>
 							<element ref="SIG:IncludeEContent" minOccurs="0"/>
 						</all>
@@ -131,6 +141,38 @@
 			</sequence>
 		</complexType>
 	</element>
+	<element name="SignPlain">
+		<complexType>
+			<sequence>
+				<element ref="CONSUMER:CardHandle"/>
+				<element ref="SIG:PlainSignRequest" maxOccurs="unbounded"/>
+			</sequence>
+		</complexType>
+	</element>
+	<element name="SignPlainResponse">
+		<complexType>
+			<sequence>
+				<element ref="SIG:PlainSignResponse" maxOccurs="unbounded"/>
+			</sequence>
+		</complexType>
+	</element>
+	<element name="PlainSignRequest">
+		<complexType>
+			<sequence>
+				<element ref="SIG:BinaryString"/>
+			</sequence>
+			<attribute name="RequestID" type="string" use="required"/>
+		</complexType>
+	</element>
+	<element name="PlainSignResponse">
+		<complexType>
+			<sequence>
+				<element ref="CONSUMER:Status"/>
+				<element ref="dss:SignatureObject" minOccurs="0"/>
+			</sequence>
+			<attribute name="RequestID" type="string" use="required"/>
+		</complexType>
+	</element>
 	<element name="ExternalAuthenticate">
 		<complexType>
 			<sequence>