From 030488bb7ff9572f35032d80d4101c06cfc98bf5 Mon Sep 17 00:00:00 2001
From: Christof Rabensteiner <christof.rabensteiner@iaik.tugraz.at>
Date: Tue, 2 Jul 2019 14:19:41 +0200
Subject: Implement And Integrate tnvz:QueryPersonRequest.

- Merge TnvzClient and TnvzResultVerifier to TnvzHelper; TnvzHelper
  now builds the QueryPersonRequest, sends it to the tnvz port and
  evaluates the result.
- Publish some interfaces in Mzs2MsgConverter because they are needed
  by TnvzHelper.
- Generalize MsgClientFactory to ClientFactory such that it can be
  used to generate arbitrary SOAP clients (e.g. also for tnvz!).

Schema Changes to accomodate Tnvz's QueryPersonRequest:
- Add optional tnvz:AustrianAddressesOnly and optional TnvzMetaData to
  mzs:mzs:DeliveryRequest.

Removed Unit Tests:
- Remove subset of SameThreadDeliveryPipeline testcases (mimetype
  related) because its logic moved to TnvzHelper.
---
 .../at/gv/egiz/moazs/msg/MsgClientFactory.java     | 108 ---------------------
 1 file changed, 108 deletions(-)
 delete mode 100644 src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java

(limited to 'src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java')

diff --git a/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java b/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java
deleted file mode 100644
index e55debc..0000000
--- a/src/main/java/at/gv/egiz/moazs/msg/MsgClientFactory.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package at.gv.egiz.moazs.msg;
-
-import at.gv.egiz.moazs.util.FileUtils;
-import at.gv.egiz.moazs.util.SSLContextCreator;
-import at.gv.zustellung.app2mzs.xsd.ClientType;
-import at.gv.zustellung.app2mzs.xsd.KeyStoreType;
-import at.gv.zustellung.app2mzs.xsd.SSLType;
-import at.gv.zustellung.msg.xsd.App2ZusePort;
-import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.jaxws.JaxWsClientFactoryBean;
-import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Nullable;
-import javax.net.ssl.SSLContext;
-
-import static at.gv.zustellung.app2mzs.xsd.KeyStoreType.keyStoreTypeBuilder;
-
-@Component
-public class MsgClientFactory {
-
-    private static final Logger log = LoggerFactory.getLogger(MsgClientFactory.class);
-
-    private final StoreSOAPBodyBinaryInRepositoryInterceptor storeResponseInterceptor;
-    private final SSLContextCreator sslContextCreator;
-    private final FileUtils fileUtils;
-
-    @Autowired
-    public MsgClientFactory(StoreSOAPBodyBinaryInRepositoryInterceptor storeResponseInterceptor,
-                            SSLContextCreator creator,
-                            FileUtils fileUtils) {
-        this.storeResponseInterceptor = storeResponseInterceptor;
-        this.sslContextCreator = creator;
-        this.fileUtils = fileUtils;
-    }
-
-    /**
-     * Creates a client that communicates with a msg service.
-     *
-     * @param params for the client, such as service url and ssl parameters.
-     * @return the msg client
-     */
-    public App2ZusePort create(ClientType params) {
-
-        var factory = new JaxWsClientFactoryBean();
-        factory.setServiceClass(App2ZusePort.class);
-        factory.setAddress(params.getURL());
-        factory.getInInterceptors().add(storeResponseInterceptor);
-
-        var proxy = new JaxWsProxyFactoryBean(factory).create();
-        Client client = ClientProxy.getClient(proxy);
-        HTTPConduit http = (HTTPConduit) client.getConduit();
-
-        var httpClientPolicy = new HTTPClientPolicy();
-        httpClientPolicy.setConnectionTimeout(params.getConnectionTimeout().longValueExact());
-        httpClientPolicy.setReceiveTimeout(params.getReceiveTimeout().longValueExact());
-        http.setClient(httpClientPolicy);
-
-        if (params.getURL().startsWith("https")) {
-            TLSClientParameters tlsParams = setupTLSParams(params.getSSL());
-            http.setTlsClientParameters(tlsParams);
-            log.info("SSLContext initialized. ");
-        }
-
-        return ((App2ZusePort)proxy);
-    }
-
-    private TLSClientParameters setupTLSParams(SSLType ssl) {
-
-        var tlsParams = new TLSClientParameters();
-        var keystore = resolveKeyStorePath(ssl.getKeyStore());
-
-        SSLContext sslContext;
-        if (ssl.isTrustAll()) {
-            sslContext = sslContextCreator.createUnsafeSSLContext(keystore);
-        } else {
-            var truststore = resolveKeyStorePath(ssl.getTrustStore());
-            sslContext = sslContextCreator.createSSLContext(keystore, truststore);
-        }
-        tlsParams.setSSLSocketFactory(sslContext.getSocketFactory());
-
-        if (ssl.isLaxHostNameVerification()) {
-            tlsParams.setDisableCNCheck(true);
-        }
-
-        return tlsParams;
-    }
-
-    private KeyStoreType resolveKeyStorePath(@Nullable KeyStoreType store) {
-
-        if (store == null) return null;
-
-        var resolvedURI = "file:" + fileUtils.determinePath(store.getFileName());
-        log.trace("Resolved key store path from {} to {}.", store.getFileName(), resolvedURI);
-
-        return keyStoreTypeBuilder(store)
-                .withFileName(resolvedURI)
-                .build();
-    }
-
-}
-- 
cgit v1.2.3