aboutsummaryrefslogtreecommitdiff
path: root/src/main/resources/mzs
diff options
context:
space:
mode:
authorChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-06-26 08:47:58 +0200
committerChristof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>2019-06-26 08:47:58 +0200
commite2e77ed55687cb92c6f5a273995daf64dedef848 (patch)
treec5955745715a513d2875fcd348a5d50d964c9b72 /src/main/resources/mzs
parent97aadc426ca2f61dccd58a05f37d065b2752ef6d (diff)
downloadmoa-zs-e2e77ed55687cb92c6f5a273995daf64dedef848.tar.gz
moa-zs-e2e77ed55687cb92c6f5a273995daf64dedef848.tar.bz2
moa-zs-e2e77ed55687cb92c6f5a273995daf64dedef848.zip
Protect MsgClient via SSL (ink Client Authentication)
- Add Component to create SSLContexts with own Key- and trust store. - Inject SSLContext into HTTP Client. - Add EAAF-Components Core Dependency, which is needed by SSLContextCreator (KeyStoreUtils). Schema Changes in mzs:DeliveryRequest/Config: - Got Rid of mzs:DeliveryRequest/Config/Server. In mzs 1.4.1, Server replaces the result of zkopf query person request. Since this zkopf interface does not exist anymore, Server was removed. - Add ClientType, which holds all parameters needed to connect to a service (Url, SSL params, a.o.). Configuration: - Add default parameters for SSL Clients in application.yaml. - Merge default parameters into incoming mzs:DeliveryRequests. MoaZSException Fixes: - Remove "Extends throwable" from Builder. - Add convenient shorthand init method (message, throwable). Refactor: - Put "determinePath" to FileUtils. - Put string related utility functions into StringUtils.
Diffstat (limited to 'src/main/resources/mzs')
-rw-r--r--src/main/resources/mzs/app2mzs.xsd34
1 files changed, 27 insertions, 7 deletions
diff --git a/src/main/resources/mzs/app2mzs.xsd b/src/main/resources/mzs/app2mzs.xsd
index 05a9ea4..956cd31 100644
--- a/src/main/resources/mzs/app2mzs.xsd
+++ b/src/main/resources/mzs/app2mzs.xsd
@@ -81,19 +81,39 @@
<xs:complexType name="ConfigType">
<xs:sequence>
<xs:element name="ProfileID" type="xs:token" minOccurs="0"></xs:element>
- <xs:element ref="Server" minOccurs="0"></xs:element>
<xs:element name="PerformQueryPersonRequest" type="xs:boolean" minOccurs="0" />
+ <xs:element ref="MSGClient" minOccurs="0" />
+ <xs:element ref="TNVZClient" minOccurs="0" />
</xs:sequence>
</xs:complexType>
- <xs:element name="Server" type="ServerType" />
- <xs:complexType name="ServerType">
+ <xs:element name="MSGClient" type="ClientType" />
+ <xs:element name="TNVZClient" type="ClientType" />
+ <xs:complexType name="ClientType">
<xs:sequence>
- <xs:element name="ZUSEUrlID" type="xs:anyURI" minOccurs="0"/>
- <xs:element name="X509" type="xs:base64Binary" minOccurs="0"/>
+ <xs:element name="URL" type="xs:anyURI" />
+ <xs:element ref="SSL" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="SSL" type="SSLType" />
+ <xs:complexType name="SSLType">
+ <xs:sequence>
+ <xs:element name="TrustAll" minOccurs="0" type="xs:boolean" />
+ <xs:element name="LaxHostNameVerification" minOccurs="0" type="xs:boolean" />
+ <xs:element ref="KeyStore" minOccurs="0" />
+ <xs:element ref="TrustStore" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:element name="TrustStore" type="KeyStoreType" />
+ <xs:element name="KeyStore" type="KeyStoreType" />
+ <xs:complexType name="KeyStoreType">
+ <xs:sequence>
+ <xs:element name="FileName" type="xs:string" minOccurs="0"/>
+ <xs:element name="Password" type="xs:string" minOccurs="0"/>
+ <xs:element name="FileType" type="xs:string" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
<xs:element name="DeliveryResponse" type="DeliveryResponseType"/>
- <xs:complexType name="DeliveryResponseType">
+ <xs:complexType name="DeliveryResponseType">
<xs:choice>
<xs:element ref="PartialSuccess"/>
<xs:element ref="Success"/>
@@ -179,7 +199,7 @@
<xs:element ref="msg:DeliverySystem"/>
<xs:element ref="msg:ZSDeliveryID" />
<xs:element ref="msg:GZ" minOccurs="0"/>
- <xs:element name="SignedDeliveryRequestStatus" type="xs:base64Binary" minOccurs="0"/>
+ <xs:element name="SignedDeliveryRequestStatus" type="xs:base64Binary" minOccurs="0"/>
</xs:sequence>
</xs:complexType>