You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2009/06/01 19:30:49 UTC
svn commit: r780738 - in /webservices/commons/trunk/modules/tcpmon/modules:
tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/
tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/
Author: veithen
Date: Mon Jun 1 17:30:49 2009
New Revision: 780738
URL: http://svn.apache.org/viewvc?rev=780738&view=rev
Log:
Moved the SSL support from the UI to the engine.
Added:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java (contents, props changed)
- copied, changed from r780733, webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/NoValidateCertTrustManager.java
Removed:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/NoValidateCertTrustManager.java
Modified:
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java
webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/AdminPane.java
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java?rev=780738&r1=780737&r2=780738&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/InterceptorConfigurationBuilder.java Mon Jun 1 17:30:49 2009
@@ -16,12 +16,15 @@
package org.apache.ws.commons.tcpmon.core.engine;
+import java.security.GeneralSecurityException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.net.ServerSocketFactory;
import javax.net.SocketFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
import org.apache.ws.commons.tcpmon.core.filter.StreamFilterFactory;
@@ -67,6 +70,18 @@
public void setSocketFactory(SocketFactory socketFactory) {
this.socketFactory = socketFactory;
}
+
+ /**
+ * Configure the interceptor to use SSL for outgoing connections.
+ *
+ * @param validateCerts whether server certificates should be validated
+ * @throws GeneralSecurityException
+ */
+ public void configureSSLSocketFactory(boolean validateCerts) throws GeneralSecurityException {
+ SSLContext ctx = SSLContext.getInstance("SSL");
+ ctx.init(null, validateCerts ? null : new TrustManager[] { new NoValidateCertTrustManager() }, null);
+ socketFactory = ctx.getSocketFactory();
+ }
public void setTargetHost(String targetHost) {
this.targetHost = targetHost;
Copied: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java (from r780733, webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/NoValidateCertTrustManager.java)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java?p2=webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java&p1=webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/NoValidateCertTrustManager.java&r1=780733&r2=780738&rev=780738&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/NoValidateCertTrustManager.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java Mon Jun 1 17:30:49 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ws.commons.tcpmon.swing;
+package org.apache.ws.commons.tcpmon.core.engine;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-core/src/main/java/org/apache/ws/commons/tcpmon/core/engine/NoValidateCertTrustManager.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/AdminPane.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/AdminPane.java?rev=780738&r1=780737&r2=780738&view=diff
==============================================================================
--- webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/AdminPane.java (original)
+++ webservices/commons/trunk/modules/tcpmon/modules/tcpmon-ui/src/main/java/org/apache/ws/commons/tcpmon/swing/AdminPane.java Mon Jun 1 17:30:49 2009
@@ -16,8 +16,6 @@
package org.apache.ws.commons.tcpmon.swing;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
import javax.swing.Box;
import javax.swing.ButtonGroup;
import javax.swing.JButton;
@@ -444,9 +442,7 @@
if (outgoingSSLBox.isSelected()) {
try {
- SSLContext ctx = SSLContext.getInstance("SSL");
- ctx.init(null, new TrustManager[] { new NoValidateCertTrustManager() }, null);
- configBuilder.setSocketFactory(ctx.getSocketFactory());
+ configBuilder.configureSSLSocketFactory(false);
} catch (GeneralSecurityException ex) {
throw new Error(ex);
}