Author: fmui
Date: Fri Aug 15 15:30:57 2014
New Revision: 1618210
URL: http://svn.apache.org/r1618210
Log:
Workbench: disabled hostname checks when the acceptSelfSignedCertificates is set
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
Modified:
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
URL:
http://svn.apache.org/viewvc/chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java?rev=1618210&r1=1618209&r2=1618210&view=diff
==============================================================================
---
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
(original)
+++
chemistry/opencmis/trunk/chemistry-opencmis-workbench/chemistry-opencmis-workbench/src/main/java/org/apache/chemistry/opencmis/workbench/model/ClientSession.java
Fri Aug 15 15:30:57 2014
@@ -27,8 +27,10 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
+import javax.net.ssl.HostnameVerifier;
import javax.net.ssl.HttpsURLConnection;
import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
@@ -325,7 +327,7 @@ public class ClientSession {
private void acceptSelfSignedCertificates() {
TrustManager[] trustAllCerts = new TrustManager[] { new
X509TrustManager() {
public X509Certificate[] getAcceptedIssuers() {
- return null;
+ return new X509Certificate[0];
}
public void checkClientTrusted(X509Certificate[] certs, String
authType) {
@@ -335,10 +337,18 @@ public class ClientSession {
}
} };
+ HostnameVerifier accepctAllHostnames = new HostnameVerifier() {
+ @Override
+ public boolean verify(String hostname, SSLSession session) {
+ return true;
+ }
+ };
+
try {
SSLContext sc = SSLContext.getInstance("SSL");
sc.init(null, trustAllCerts, new java.security.SecureRandom());
HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+ HttpsURLConnection.setDefaultHostnameVerifier(accepctAllHostnames);
} catch (Exception e) {
LOG.error(e.getMessage(), e);
}