You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/02/18 19:43:14 UTC
svn commit: r745604 - in /cxf/branches/2.1.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/https/
rt/transports/http/src/test/java/org/apache/cxf/transport/http/
Author: dkulp
Date: Wed Feb 18 18:43:13 2009
New Revision: 745604
URL: http://svn.apache.org/viewvc?rev=745604&view=rev
Log:
Merged revisions 745560 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r745560 | seanoc | 2009-02-18 11:28:31 -0500 (Wed, 18 Feb 2009) | 1 line
Fix fox CXF-2048 (patch provided by Ron Gavlin)
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
cxf/branches/2.1.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 18 18:43:13 2009
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708410,708417,708550,708554,709353-709354,709425,710076,710150,71015
4,711193,711388,711410,711490,711635,711949,711975,712194,712198,712238,712272,712299,712312,712670,712893,713082,713095-713096,713099,713584,713597,713737,713804,713899,714167-714168,714245,714255,717937-717961,718281-718448,718565,718620,718640,718665,718970,719017,719210,719215-719218,719222-719273,719305,719327-719680,720053,720119-720218,720238,720293-720316,720497,721221,721241,721501,722117,722129,722412,722988,723024,723338,723378,723716-723791,724333-724372,724433-724438,724449,724481,724485,724668,724780,724782,724785,724793,724795,724940,725071,725316,725332,725335,725348,725364,725418,725425-725426,725455,725506,725554,725562,725651,725671,725688,725754,725773,725799,725839,726342,726524,726631,726634,726637,726639,726692,726724,726769,726992,727096,727445,727521,727568,727692,727754,727781,727792,728070,728087,728696,728897,729051,729430,729449,729460,729863,730082,730139,730889,730891,731598,731604,731615,731631,731635,732036,732050,732320,732363,732411,732450,
732710,732773,732827,732829,733512,733582,733901,734367,734462,734666,734762,734772,734812,734836,734965,735113,735252,735722-735723,735729,735734,735751,735782,735787,735987,736332,736343,736352,736358-736362,736408,736423,736448,736491,736621,736726,736736,736738-736739,736766,736825,736852,737032,737046,737061,737069,737124,737237,737246,737299,737356,737494,737498,737761,737817,737849,737855,737994,738166,738178,738201,738210,738242,738244,738265,738516,738583,738863,738937,738983,739366-739367,739451-739452,739799-739800,739867,739876-739877,739922,739937,739990,740045,740108,740154,740186,740197,740255,740706,740730,740810,740844,740886,740902,740923,740994,741058,741124,741152,741188,741521,741529,741879,742914,743087,743439,743441,743459,743469,743965,743967,744175,744195,744237,744756,745214,745243,745560
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java?rev=745604&r1=745603&r2=745604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionFactory.java Wed Feb 18 18:43:13 2009
@@ -20,6 +20,8 @@
package org.apache.cxf.transport.https;
import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
import java.net.HttpURLConnection;
import java.net.Proxy;
import java.net.URL;
@@ -57,7 +59,7 @@
private static final long serialVersionUID = 1L;
private static final Logger LOG =
LogUtils.getL7dLogger(HttpsURLConnectionFactory.class);
-
+
/*
* For development and testing only
*/
@@ -88,6 +90,10 @@
*/
SSLSocketFactory socketFactory;
+ private Class deprecatedSunHttpsURLConnectionClass;
+
+ private Class deprecatedSunHostnameVerifierClass;
+
/**
* This constructor initialized the factory with the configured TLS
* Client Parameters for the HTTPConduit for which this factory is used.
@@ -122,8 +128,8 @@
+ " for HTTPS URLConnection Factory.");
}
- HttpsURLConnection connection =
- (HttpsURLConnection) (proxy != null
+ HttpURLConnection connection =
+ (HttpURLConnection) (proxy != null
? url.openConnection(proxy)
: url.openConnection());
@@ -150,9 +156,11 @@
/**
* This method assigns the various TLS parameters on the HttpsURLConnection
- * from the TLS Client Parameters.
+ * from the TLS Client Parameters. Connection parameter is of supertype HttpURLConnection,
+ * which allows internal cast to potentially divergent subtype (https) implementations.
*/
- protected synchronized void decorateWithTLS(HttpsURLConnection connection)
+ @SuppressWarnings("deprecation")
+ protected synchronized void decorateWithTLS(HttpURLConnection connection)
throws NoSuchAlgorithmException,
NoSuchProviderException,
KeyManagementException {
@@ -197,12 +205,55 @@
cipherSuites,
tlsClientParameters.getSecureSocketProtocol());
}
- if (tlsClientParameters.isDisableCNCheck()) {
- connection.setHostnameVerifier(CertificateHostnameVerifier.ALLOW_ALL);
+
+ if (connection instanceof HttpsURLConnection) {
+ // handle the expected case (javax.net.ssl)
+ HttpsURLConnection conn = (HttpsURLConnection) connection;
+ if (tlsClientParameters.isDisableCNCheck()) {
+ conn.setHostnameVerifier(CertificateHostnameVerifier.ALLOW_ALL);
+ } else {
+ conn.setHostnameVerifier(CertificateHostnameVerifier.DEFAULT);
+ }
+ conn.setSSLSocketFactory(socketFactory);
} else {
- connection.setHostnameVerifier(CertificateHostnameVerifier.DEFAULT);
+ // handle the deprecated sun case
+ try {
+ Class connectionClass = getDeprecatedSunHttpsURLConnectionClass();
+ Class verifierClass = getDeprecatedSunHostnameVerifierClass();
+ Method setHostnameVerifier = connectionClass.getMethod("setHostnameVerifier", verifierClass);
+ InvocationHandler handler = new InvocationHandler() {
+ public Object invoke(Object proxy,
+ Method method,
+ Object[] args) throws Throwable {
+ return true;
+ }
+ };
+ Object proxy = java.lang.reflect.Proxy.newProxyInstance(this.getClass().getClassLoader(),
+ new Class[] {verifierClass},
+ handler);
+ setHostnameVerifier.invoke(connectionClass.cast(connection), verifierClass.cast(proxy));
+ Method setSSLSocketFactory = connectionClass.getMethod("setSSLSocketFactory",
+ SSLSocketFactory.class);
+ setSSLSocketFactory.invoke(connectionClass.cast(connection), socketFactory);
+ } catch (Exception ex) {
+ throw new IllegalArgumentException("Error decorating connection class "
+ + connection.getClass().getName(), ex);
+ }
+ }
+ }
+
+ private Class getDeprecatedSunHttpsURLConnectionClass() throws ClassNotFoundException {
+ if (deprecatedSunHttpsURLConnectionClass == null) {
+ deprecatedSunHttpsURLConnectionClass = Class.forName("com.sun.net.ssl.HttpsURLConnection");
}
- connection.setSSLSocketFactory(socketFactory);
+ return deprecatedSunHttpsURLConnectionClass;
+ }
+
+ private Class getDeprecatedSunHostnameVerifierClass() throws ClassNotFoundException {
+ if (deprecatedSunHostnameVerifierClass == null) {
+ deprecatedSunHostnameVerifierClass = Class.forName("com.sun.net.ssl.HostnameVerifier");
+ }
+ return deprecatedSunHostnameVerifierClass;
}
/*
@@ -228,12 +279,13 @@
* @return The HttpsURLConnectionInfo object for the given
* HttpsURLConnection.
* @throws IOException Normal IO Exceptions.
- * @throws ClassCastException If "connection" is not an HttpsURLConnection.
+ * @throws ClassCastException If "connection" is not an HttpsURLConnection
+ * (or a supported subtype of HttpURLConnection)
*/
public HttpURLConnectionInfo getConnectionInfo(
HttpURLConnection connection
) throws IOException {
- return new HttpsURLConnectionInfo((HttpsURLConnection)connection);
+ return new HttpsURLConnectionInfo(connection);
}
public String getProtocol() {
@@ -243,3 +295,4 @@
}
+
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java?rev=745604&r1=745603&r2=745604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/https/HttpsURLConnectionInfo.java Wed Feb 18 18:43:13 2009
@@ -20,9 +20,12 @@
package org.apache.cxf.transport.https;
import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.HttpURLConnection;
import java.security.Principal;
import java.security.cert.Certificate;
+import javax.imageio.IIOException;
import javax.net.ssl.HttpsURLConnection;
import org.apache.cxf.transport.http.HttpURLConnectionInfo;
@@ -37,47 +40,85 @@
* This field contains the cipherSuite enabled in the
* HTTPS URLconnection.
*/
- protected final String enabledCipherSuite;
+ protected String enabledCipherSuite;
/**
* This field contains the certificates that were used to
* authenticate the connection to the peer.
*/
- protected final Certificate[] localCertificates;
+ protected Certificate[] localCertificates;
/**
* This field contains the Principal that authenticated to the
* peer.
*/
- protected final Principal localPrincipal;
+ protected Principal localPrincipal;
/**
* This field contains the certificates the server presented
* to authenticate.
*/
- protected final Certificate[] serverCertificates;
+ protected Certificate[] serverCertificates;
/**
* This field contains the Principal that represents the
* authenticated peer.
*/
- protected final Principal peerPrincipal;
+ protected Principal peerPrincipal;
+
+ private Class deprecatedSunHttpsURLConnectionOldImplClass;
/**
* This constructor is used to create the info object
- * representing the this HttpsURLConnection.
+ * representing the this HttpsURLConnection. Connection parameter is
+ * of supertype HttpURLConnection, which allows internal cast to
+ * potentially divergent subtype (Https) implementations.
*/
- HttpsURLConnectionInfo(HttpsURLConnection connection)
+ HttpsURLConnectionInfo(HttpURLConnection connection)
throws IOException {
super(connection);
-
- enabledCipherSuite = connection.getCipherSuite();
- localCertificates = connection.getLocalCertificates();
- localPrincipal = connection.getLocalPrincipal();
- serverCertificates = connection.getServerCertificates();
- peerPrincipal = connection.getPeerPrincipal();
+ if (connection instanceof HttpsURLConnection) {
+ HttpsURLConnection conn = (HttpsURLConnection) connection;
+ enabledCipherSuite = conn.getCipherSuite();
+ localCertificates = conn.getLocalCertificates();
+ localPrincipal = conn.getLocalPrincipal();
+ serverCertificates = conn.getServerCertificates();
+ peerPrincipal = conn.getPeerPrincipal();
+ } else {
+ Exception ex = null;
+ try {
+ Class deprecatedSunClass = getDeprecatedSunHttpsURLConnectionOldImplClass();
+ Method method = null;
+ method = deprecatedSunClass.getMethod("getCipherSuite", (Class[]) null);
+ enabledCipherSuite = (String) method.invoke(connection, (Object[]) null);
+ method = deprecatedSunClass.getMethod("getLocalCertificates", (Class[]) null);
+ localCertificates = (Certificate[]) method.invoke(connection, (Object[]) null);
+ method = deprecatedSunClass.getMethod("getServerCertificates", (Class[]) null);
+ serverCertificates = (Certificate[]) method.invoke(connection, (Object[]) null);
+
+ //TODO Obtain localPrincipal and peerPrincipal using the com.sun.net.ssl api
+ } catch (Exception e) {
+ ex = e;
+ } finally {
+ if (ex != null) {
+ if (ex instanceof IOException) {
+ throw (IOException) ex;
+ }
+ throw new IIOException("Error constructing HttpsURLConnectionInfo for connection class "
+ + connection.getClass().getName(), ex);
+ }
+ }
+ }
+ }
+
+ private Class getDeprecatedSunHttpsURLConnectionOldImplClass() throws ClassNotFoundException {
+ if (deprecatedSunHttpsURLConnectionOldImplClass == null) {
+ deprecatedSunHttpsURLConnectionOldImplClass =
+ Class.forName("com.sun.net.ssl.internal.www.protocol.https.HttpsURLConnectionOldImpl");
+ }
+ return deprecatedSunHttpsURLConnectionOldImplClass;
}
-
+
/**
* This method returns the cipher suite employed in this
* HttpsURLConnection.
Modified: cxf/branches/2.1.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java?rev=745604&r1=745603&r2=745604&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java (original)
+++ cxf/branches/2.1.x-fixes/rt/transports/http/src/test/java/org/apache/cxf/transport/http/HTTPConduitURLConnectionTest.java Wed Feb 18 18:43:13 2009
@@ -122,6 +122,36 @@
*/
@Test
public void testTLSServerParameters() throws Exception {
+ Object connection = doTestTLSServerParameters();
+ assertTrue("TLS Client Parameters should generate an HttpsURLConnection",
+ HttpsURLConnection.class.isInstance(connection));
+ }
+
+ /**
+ * This verifys that the underlying connection is an HttpsURLConnection.
+ */
+ @Test
+ public void testTLSServerParametersWithDeprecatedSunSSLProtocol() throws Exception {
+ if (!System.getProperty("java.vm.vendor").toLowerCase().contains("sun")) {
+ return;
+ }
+ String javaProtocolHandlerPkgsKey = "java.protocol.handler.pkgs";
+ String javaProtocolHandlerPkgsValue = System.getProperty(javaProtocolHandlerPkgsKey);
+ try {
+ System.setProperty(javaProtocolHandlerPkgsKey, "com.sun.net.ssl.internal.www.protocol");
+ Object connection = doTestTLSServerParameters();
+ assertTrue("TLS Client Parameters should generate an HttpsURLConnection",
+ connection.getClass().getName().contains("HttpsURLConnection"));
+ } finally {
+ if (javaProtocolHandlerPkgsValue == null) {
+ System.clearProperty(javaProtocolHandlerPkgsKey);
+ } else {
+ System.setProperty(javaProtocolHandlerPkgsKey, javaProtocolHandlerPkgsValue);
+ }
+ }
+ }
+
+ private Object doTestTLSServerParameters() throws Exception {
Bus bus = new CXFBusImpl();
EndpointInfo ei = new EndpointInfo();
ei.setAddress("https://secure.nowhere.null/" + "bar/foo");
@@ -135,9 +165,7 @@
// Test call
conduit.prepare(message);
- assertTrue("TLS Client Parameters should generate an HttpsURLConnection",
- HttpsURLConnection.class.isInstance(
- message.get("http.connection")));
+ return message.get("http.connection");
}