Skip to content

Commit

Permalink
- VZD: changes in admin interface\n
Browse files Browse the repository at this point in the history
- Konnektor: SignatureService hardening of attribute ShortText (C_10147)\n

- Konnektor: added old schema versions, which must be supported (C_10215)\n

- Konnektor (Fachmodul ePA): DocumentCategoryEnum improved\n

- Konnektor (Fachmodul ePA): operation RemoveDocuments removed\n

- Konnektor (Fachmodul ePA): operation DeleteDocumentSet added\n

- ePA: Policies for 4.0.1 improved\n

- ePA: Policy for eArztbrief added\n
  • Loading branch information
Gematik-Entwicklung committed Aug 17, 2020
1 parent 472c4b7 commit 3f55ac5
Show file tree
Hide file tree
Showing 44 changed files with 1,031 additions and 529 deletions.
29 changes: 29 additions & 0 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
Schnittstellendefinitionen im XSD- und WSDL-Format für alle im Release definierten Produkttypversionen

# Struktur

| Schemata / WSDL |Zuordnung
|--- |---
|cm\ | __Kartenmanagement__
|conn\ | __Konnektorschnittstellen__
|conn\amtss\ | AMTS
|conn\nfds\ | NFDM
|conn\phrs\ | ePA
|conn\tbauth\ | TBAuth
|conn\vsds\ | VSDM
|consumer\ | __Basis-/KTR-Consumer__
|ext\ |Schemadateien internationaler Standardisierungsgremien
|ext\\\*hardened* |Gehärtete Schemadateien, Bezeichner _XSD_HARDENED_
|fa\ |__Fachanwendungen__
|fa\amts\ |Fachdaten AMTS
|fa\nfds\ |Fachdaten NFDM
|fa\vsds\ |Fachdaten VSDM
|fd\ |__Fachdienste__
|fd\phr\ |ePA
|fd\phr\appc\ |Referenz-Policies
|fdv\ |ePA
|ksr\ |__Konfigurationsdienst__
|stoerungsampel\ |__Störungsampel__
|tel\ |__Architektur und übergreifende Dokumente__
|vpnzugd\ |__VPN-Zugangsdienst__
|vzd\ |__Verzeichnisdienst__
11 changes: 11 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# Release 4.0.1-Pre1
- VZD: changes in admin interface
- Konnektor: SignatureService hardening of attribute ShortText (C_10147)
- Konnektor: added old schema versions, which must be supported (C_10215)
- Konnektor (Fachmodul ePA): DocumentCategoryEnum improved
- Konnektor (Fachmodul ePA): operation RemoveDocuments removed
- Konnektor (Fachmodul ePA): operation DeleteDocumentSet added
- ePA: Policies for 4.0.1 improved
- ePA: Policy for eArztbrief added


# Release 4.0.0
- ePA: Fehlerkorrektur im PHRManagement- und PHRService
- ePA: APPC-Policies für das kommende Release (neues Berechtigungssystem) angepasst.
Expand Down
2 changes: 1 addition & 1 deletion conn/CertificateService.wsdl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<documentation>
Copyright (c) 2012, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
Beschreibung: Zertifikatsdienst
version=6.0.1
version=6.0.0
</documentation>
<types>
<xs:schema>
Expand Down
13 changes: 1 addition & 12 deletions conn/CertificateService.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<!-- gematik revision="\main\rel_online\rel_ors1\rel_opb1\1" -->
<!-- edited with XMLSpy v2010 (http://www.altova.com) by n.n. (gematik) -->
<!-- Version History
version: V6.0.2
* Umsetzung C_8883: neuer optionaler Parameter crypt.
version: V6.0.1
* Umsetzung C_5036: Im Element <element name="CtlD" type="string"/> wird der 3. Buchstabe von CtID durch ein großes i statt eines kleinen L ersetzt.
End of Version History-->
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/conn/CertificateService/v6.0" xmlns:CONN="http://ws.gematik.de/conn/ConnectorCommon/v5.0" xmlns:CERTCMN="http://ws.gematik.de/conn/CertificateServiceCommon/v2.0" xmlns:CCTX="http://ws.gematik.de/conn/ConnectorContext/v2.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/conn/CertificateService/v6.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.0.2">
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/conn/CertificateService/v6.0" xmlns:CONN="http://ws.gematik.de/conn/ConnectorCommon/v5.0" xmlns:CERTCMN="http://ws.gematik.de/conn/CertificateServiceCommon/v2.0" xmlns:CCTX="http://ws.gematik.de/conn/ConnectorContext/v2.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/conn/CertificateService/v6.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.0.1">
<annotation>
<documentation xml:lang="de">Copyright (c) 2012, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
Beschreibung: Schema für den Zertifikatsdienst</documentation>
Expand All @@ -27,13 +25,6 @@
<element name="validity" type="date"/>
</sequence>
</complexType>
<!-- ================== Datentyp für krypt.Algorithmus ===================== -->
<simpleType name="CryptType">
<restriction base="token">
<enumeration value="RSA"/>
<enumeration value="ECC"/>
</restriction>
</simpleType>
<!-- ================== Operation CheckCertificateExpiration ===================== -->
<element name="CheckCertificateExpiration">
<annotation>
Expand All @@ -43,7 +34,6 @@
<sequence>
<element ref="CONN:CardHandle" minOccurs="0"/>
<element ref="CCTX:Context"/>
<element name="Crypt" type="CERT:CryptType" minOccurs="0"/>
</sequence>
</complexType>
</element>
Expand Down Expand Up @@ -78,7 +68,6 @@
</sequence>
</complexType>
</element>
<element name="Crypt" type="CERT:CryptType" minOccurs="0"/>
</sequence>
</complexType>
</element>
Expand Down
98 changes: 98 additions & 0 deletions conn/CertificateService_v6_0_1.wsdl
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- gematik revision="\main\rel_online\rel_ors1\3" -->
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:CERT="http://ws.gematik.de/conn/CertificateService/v6.0" xmlns:CERTW="http://ws.gematik.de/conn/CertificateService/WSDL/v6.0" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:CCTX="http://ws.gematik.de/conn/ConnectorContext/v2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/conn/CertificateService/WSDL/v6.0">
<documentation>
Copyright (c) 2012, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
Beschreibung: Zertifikatsdienst
version=6.0.1
</documentation>
<types>
<xs:schema>
<xs:import schemaLocation="CertificateService_v6_0_2.xsd" namespace="http://ws.gematik.de/conn/CertificateService/v6.0"/>
<xs:import schemaLocation="ConnectorContext.xsd" namespace="http://ws.gematik.de/conn/ConnectorContext/v2.0"/>
<xs:import schemaLocation="../tel/error/TelematikError.xsd" namespace="http://ws.gematik.de/tel/error/v2.0"/>
</xs:schema>
</types>
<message name="CheckCertificateExpirationRequestMessage">
<part name="parameter" element="CERT:CheckCertificateExpiration"/>
</message>
<message name="CheckCertificateExpirationResponseMessage">
<part name="parameter" element="CERT:CheckCertificateExpirationResponse"/>
</message>
<message name="ReadCardCertificateRequestMessage">
<part name="parameter" element="CERT:ReadCardCertificate"/>
</message>
<message name="ReadCardCertificateResponseMessage">
<part name="parameter" element="CERT:ReadCardCertificateResponse"/>
</message>
<message name="VerifyCertificateRequestMessage">
<part name="parameter" element="CERT:VerifyCertificate"/>
</message>
<message name="VerifyCertificateResponseMessage">
<part name="parameter" element="CERT:VerifyCertificateResponse"/>
</message>
<message name="FaultMessage">
<part name="parameter" element="GERROR:Error"/>
</message>
<portType name="CertificateServicePortType">
<operation name="CheckCertificateExpiration">
<input message="CERTW:CheckCertificateExpirationRequestMessage"/>
<output message="CERTW:CheckCertificateExpirationResponseMessage"/>
<fault name="FaultMessage" message="CERTW:FaultMessage"/>
</operation>
<operation name="ReadCardCertificate">
<input message="CERTW:ReadCardCertificateRequestMessage"/>
<output message="CERTW:ReadCardCertificateResponseMessage"/>
<fault name="FaultMessage" message="CERTW:FaultMessage"/>
</operation>
<operation name="VerifyCertificate">
<input message="CERTW:VerifyCertificateRequestMessage"/>
<output message="CERTW:VerifyCertificateResponseMessage"/>
<fault name="FaultMessage" message="CERTW:FaultMessage"/>
</operation>
</portType>
<binding name="CertificateServiceBinding" type="CERTW:CertificateServicePortType">
<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="CheckCertificateExpiration">
<soap:operation soapAction="http://ws.gematik.de/conn/CertificateService/v6.0#CheckCertificateExpiration" style="document"/>
<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="ReadCardCertificate">
<soap:operation soapAction="http://ws.gematik.de/conn/CertificateService/v6.0#ReadCardCertificate" style="document"/>
<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="VerifyCertificate">
<soap:operation soapAction="http://ws.gematik.de/conn/CertificateService/v6.0#VerifyCertificate" style="document"/>
<input>
<soap:body use="literal"/>
</input>
<output>
<soap:body use="literal"/>
</output>
<fault name="FaultMessage">
<soap:fault name="FaultMessage" use="literal"/>
</fault>
</operation>
</binding>
<service name="CertificateService">
<port name="CertificateServicePort" binding="CERTW:CertificateServiceBinding">
<soap:address location="http://ti-konnektor/certificateservice"/>
</port>
</service>
</definitions>
154 changes: 154 additions & 0 deletions conn/CertificateService_v6_0_2.xsd
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- gematik revision="\main\rel_online\rel_ors1\rel_opb1\1" -->
<!-- edited with XMLSpy v2010 (http://www.altova.com) by n.n. (gematik) -->
<!-- Version History
version: V6.0.2
* Umsetzung C_8883: neuer optionaler Parameter crypt.
version: V6.0.1
* Umsetzung C_5036: Im Element <element name="CtlD" type="string"/> wird der 3. Buchstabe von CtID durch ein großes i statt eines kleinen L ersetzt.
End of Version History-->
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:CERT="http://ws.gematik.de/conn/CertificateService/v6.0" xmlns:CONN="http://ws.gematik.de/conn/ConnectorCommon/v5.0" xmlns:CERTCMN="http://ws.gematik.de/conn/CertificateServiceCommon/v2.0" xmlns:CCTX="http://ws.gematik.de/conn/ConnectorContext/v2.0" xmlns:GERROR="http://ws.gematik.de/tel/error/v2.0" targetNamespace="http://ws.gematik.de/conn/CertificateService/v6.0" elementFormDefault="qualified" attributeFormDefault="unqualified" version="6.0.2">
<annotation>
<documentation xml:lang="de">Copyright (c) 2012, gematik - Gesellschaft für Telematikanwendungen der Gesundheitskarte mbH. Alle Rechte vorbehalten.
Beschreibung: Schema für den Zertifikatsdienst</documentation>
</annotation>
<import namespace="http://ws.gematik.de/tel/error/v2.0" schemaLocation="../tel/error/TelematikError.xsd"/>
<import namespace="http://ws.gematik.de/conn/ConnectorCommon/v5.0" schemaLocation="ConnectorCommon.xsd"/>
<import namespace="http://ws.gematik.de/conn/CertificateServiceCommon/v2.0" schemaLocation="CertificateServiceCommon.xsd"/>
<import namespace="http://ws.gematik.de/conn/ConnectorContext/v2.0" schemaLocation="ConnectorContext.xsd"/>
<!-- ====== Definiert den Typ Tupel Zertifikatsablauf ========= -->
<complexType name="CertificateExpirationType">
<sequence>
<element name="CtID" type="string"/>
<element ref="CONN:CardHandle"/>
<element name="ICCSN" type="string"/>
<element name="subject_commonName" type="string"/>
<element name="serialNumber" type="string"/>
<element name="validity" type="date"/>
</sequence>
</complexType>
<!-- ================== Datentyp für krypt.Algorithmus ===================== -->
<simpleType name="CryptType">
<restriction base="token">
<enumeration value="RSA"/>
<enumeration value="ECC"/>
</restriction>
</simpleType>
<!-- ================== Operation CheckCertificateExpiration ===================== -->
<element name="CheckCertificateExpiration">
<annotation>
<documentation>Gibt das Datum des Ablaufs eines bestimmten Zertifikats oder gesammelt des Zertifikats der SMC-K sowie aller gesteckten HBAx und SM-B des Mandanten zurück.</documentation>
</annotation>
<complexType>
<sequence>
<element ref="CONN:CardHandle" minOccurs="0"/>
<element ref="CCTX:Context"/>
<element name="Crypt" type="CERT:CryptType" minOccurs="0"/>
</sequence>
</complexType>
</element>
<element name="CheckCertificateExpirationResponse">
<annotation>
<documentation>Antwort der Operation CheckCertificateExpiration</documentation>
</annotation>
<complexType>
<sequence>
<element ref="CONN:Status"/>
<element name="CertificateExpiration" type="CERT:CertificateExpirationType" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
</complexType>
</element>
<!-- ================== Operation ReadCardCertificate ===================== -->
<element name="ReadCardCertificate">
<annotation>
<documentation>Liest ein X.509-Zertifikat von einer Karte</documentation>
</annotation>
<complexType>
<sequence>
<element ref="CONN:CardHandle"/>
<element ref="CCTX:Context"/>
<element name="CertRefList">
<complexType>
<sequence>
<element name="CertRef" maxOccurs="unbounded">
<simpleType>
<restriction base="CERTCMN:CertRefEnum"/>
</simpleType>
</element>
</sequence>
</complexType>
</element>
<element name="Crypt" type="CERT:CryptType" minOccurs="0"/>
</sequence>
</complexType>
</element>
<element name="ReadCardCertificateResponse">
<annotation>
<documentation>Antwort der Operation ReadCardCertificate. Enthält das gelesene Zertifikat.</documentation>
</annotation>
<complexType>
<sequence>
<element ref="CONN:Status"/>
<element ref="CERTCMN:X509DataInfoList"/>
</sequence>
</complexType>
</element>
<!-- ================== Operation VerifyCertificate ===================== -->
<element name="VerifyCertificate">
<annotation>
<documentation>Prüft den Status eines X.509-Zertifikats</documentation>
</annotation>
<complexType>
<sequence>
<element ref="CCTX:Context"/>
<element ref="CERTCMN:X509Certificate"/>
<element name="VerificationTime" type="dateTime" minOccurs="0"/>
</sequence>
</complexType>
</element>
<simpleType name="VerificationResultType">
<restriction base="token">
<enumeration value="VALID"/>
<enumeration value="INCONCLUSIVE"/>
<enumeration value="INVALID"/>
</restriction>
</simpleType>
<element name="VerifyCertificateResponse">
<annotation>
<documentation>Antwort der Operation VerifyCertificate. Enthält die Statusinformation.</documentation>
</annotation>
<complexType>
<sequence>
<element ref="CONN:Status"/>
<element name="VerificationStatus">
<complexType>
<sequence>
<element name="VerificationResult" type="CERT:VerificationResultType"/>
<element ref="GERROR:Error" minOccurs="0">
<annotation>
<documentation>
Beschreibt für den Fall Result == "ERROR"
den Fehler für die gesamte Operation.
</documentation>
</annotation>
</element>
</sequence>
</complexType>
</element>
<element name="RoleList">
<complexType>
<sequence>
<element name="Role" maxOccurs="unbounded">
<simpleType>
<restriction base="string">
<maxLength value="100"/>
</restriction>
</simpleType>
</element>
</sequence>
</complexType>
</element>
</sequence>
</complexType>
</element>
</schema>
Loading

0 comments on commit 3f55ac5

Please sign in to comment.