From e2e77ed55687cb92c6f5a273995daf64dedef848 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Wed, 26 Jun 2019 08:47:58 +0200
Subject: 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.
---
 src/test/java/at/gv/egiz/moazs/MsgClientTest.java | 33 +++++++----------------
 1 file changed, 9 insertions(+), 24 deletions(-)

(limited to 'src/test/java/at/gv/egiz/moazs/MsgClientTest.java')

diff --git a/src/test/java/at/gv/egiz/moazs/MsgClientTest.java b/src/test/java/at/gv/egiz/moazs/MsgClientTest.java
index 8cebf06..62df52d 100644
--- a/src/test/java/at/gv/egiz/moazs/MsgClientTest.java
+++ b/src/test/java/at/gv/egiz/moazs/MsgClientTest.java
@@ -4,24 +4,18 @@ import at.gv.egiz.moazs.msg.MsgClient;
 import at.gv.egiz.moazs.msg.MsgClientFactory;
 import at.gv.egiz.moazs.msg.StoreSOAPBodyBinaryInRepositoryInterceptor;
 import at.gv.egiz.moazs.scheme.Marshaller;
-import at.gv.zustellung.app2mzs.xsd.ConfigType;
+import at.gv.zustellung.app2mzs.xsd.ClientType;
 import at.gv.zustellung.msg.xsd.DeliveryRequestType;
 import at.gv.zustellung.msg.xsd.ObjectFactory;
-import org.junit.runner.RunWith;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.xml.bind.JAXBElement;
 import java.io.BufferedInputStream;
 import java.io.FileInputStream;
 import java.io.IOException;
 
-import static at.gv.zustellung.app2mzs.xsd.ConfigType.configTypeBuilder;
-import static at.gv.zustellung.app2mzs.xsd.ServerType.serverTypeBuilder;
-
 
 // @RunWith(SpringRunner.class)
 // @SpringBootTest
@@ -52,11 +46,11 @@ public class MsgClientTest {
     public void sendValidMessage() throws IOException {
 
         var request = loadFromFile("validDeliveryRequest.xml");
-        var config = generateConfig(httpServiceUri);
-        var client = factory.create(request, config, interceptor);
+        var clientParams = generateClientParams(httpServiceUri);
+        var client = factory.create(clientParams);
 
         try{
-            var status = client.send();
+            var status = client.send(request);
             logger.info("status: " + msgMarshaller.marshallXml(OF.createDeliveryResponse(status)));
         } catch (Exception ex) {
             System.out.println(ex.getMessage());
@@ -67,10 +61,10 @@ public class MsgClientTest {
     public void sendValidMessageToSSL() throws IOException {
 
         var request = loadFromFile("validDeliveryRequest.xml");
-        var config = generateConfig(sslServiceUri);
-        var client = factory.create(request, config, interceptor);
+        var clientParams = generateClientParams(sslServiceUri);
+        var client = factory.create(clientParams);
 
-        var status = client.send();
+        var status = client.send(request);
 
         logger.info("status: " + msgMarshaller.marshallXml(OF.createDeliveryRequestStatus(status)));
     }
@@ -82,17 +76,8 @@ public class MsgClientTest {
         }
     }
 
-    private ConfigType generateConfig(String zuseUrl) {
-
-        var server = serverTypeBuilder()
-                .withZUSEUrlID(zuseUrl)
-                .build();
-
-        return configTypeBuilder()
-                .withServer(server)
-                .withPerformQueryPersonRequest(false)
-                .build();
-
+    private ClientType generateClientParams(String url) {
+        return ClientType.clientTypeBuilder().withURL(url).build();
     }
 
 }
-- 
cgit v1.2.3