[CXF-7889]fix wsdl_first_https example

apache · Nov 5, 2018 · ae5625e · ae5625e
1 parent 0f6490c
commit ae5625e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/config/clientKeystore.jks b/distribution/src/main/release/samples/wsdl_first_https/src/main/config/clientKeystore.jks
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/config/serviceKeystore.jks b/distribution/src/main/release/samples/wsdl_first_https/src/main/config/serviceKeystore.jks
diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/config/stsstore.jks b/distribution/src/main/release/samples/wsdl_first_https/src/main/config/stsstore.jks
diff --git a/.../release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java b/.../release/samples/wsdl_first_https/src/main/java/demo/hw_https/client/ClientNonSpring.java
@@ -111,7 +111,7 @@ private static void setupTLS(Greeter port)
         trustStore.load(new FileInputStream(keyStoreLoc), "cspass".toCharArray());
         TrustManager[] myTrustStoreKeyManagers = getTrustManagers(trustStore);
         tlsCP.setTrustManagers(myTrustStoreKeyManagers);
-
+        tlsCP.setDisableCNCheck(true);
         httpConduit.setTlsClientParameters(tlsCP);
     }
 

diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/SecureClient.xml
@@ -22,7 +22,7 @@
   -->
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xsi:schemaLocation="            http://cxf.apache.org/configuration/security            http://cxf.apache.org/schemas/configuration/security.xsd            http://cxf.apache.org/transports/http/configuration            http://cxf.apache.org/schemas/configuration/http-conf.xsd            http://www.springframework.org/schema/beans            http://www.springframework.org/schema/beans/spring-beans.xsd">
     <http:conduit name="{http://apache.org/hello_world_soap_http}SoapPort.http-conduit">
-        <http:tlsClientParameters>
+        <http:tlsClientParameters disableCNCheck="true">
             <sec:keyManagers keyPassword="ckpass">
                 <sec:keyStore file="src/main/config/clientKeystore.jks" password="cspass" type="JKS"/>
             </sec:keyManagers>

diff --git a/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml b/distribution/src/main/release/samples/wsdl_first_https/src/main/resources/ServerConfig.xml
@@ -30,7 +30,7 @@
                     <sec:keyStore file="src/main/config/serviceKeystore.jks" password="sspass" type="JKS"/>
                 </sec:keyManagers>
                 <sec:trustManagers>
-                    <sec:keyStore file="src/main/config/serviceKeystore.jks" password="sspass" type="JKS"/>
+                    <sec:keyStore file="src/main/config/stsstore.jks" password="stsspass" type="JKS"/>
                 </sec:trustManagers>
                 <sec:clientAuthentication want="true" required="true"/>
             </httpj:tlsServerParameters>