You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2013/05/13 22:05:34 UTC

svn commit: r1482064 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java

Author: doogie
Date: Mon May 13 20:05:33 2013
New Revision: 1482064

URL: http://svn.apache.org/r1482064
Log:
FEATURE: Add ability to disable client and server side certificate
checking.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java?rev=1482064&r1=1482063&r2=1482064&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/MultiTrustManager.java Mon May 13 20:05:33 2013
@@ -60,13 +60,19 @@ public class MultiTrustManager implement
     }
 
     public void checkClientTrusted(X509Certificate[] certs, String alg) throws CertificateException {
-        if (!isTrusted(certs)) {
+        if (isTrusted(certs)) {
+            return;
+        }
+        if (!"true".equals(UtilProperties.getPropertyValue("certificate.properties", "client.all-trusted", "true"))) {
             throw new CertificateException("No trusted certificate found");
         }
     }
 
     public void checkServerTrusted(X509Certificate[] certs, String alg) throws CertificateException {
-        if (!isTrusted(certs)) {
+        if (isTrusted(certs)) {
+            return;
+        }
+        if (!"true".equals(UtilProperties.getPropertyValue("certificate.properties", "server.all-trusted", "true"))) {
             throw new CertificateException("No trusted certificate found");
         }
     }