cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse JSSE14SocketFactory.java JSSEImplementation.java JSSESocketFactory.java
billbarker2003/03/14 22:55:21
Modified:util/java/org/apache/tomcat/util/net/jsse
JSSEImplementation.java JSSESocketFactory.java
Added: util/java/org/apache/tomcat/util/net/jsse
JSSE14SocketFactory.java
Log:
First part of refactoring for JSSE 1.1.x. There is still more to do, (especially
for Client-Auth), but now bug #17323 is a works-for-me.
Revision ChangesPath
1.2 +15 -1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java
Index: JSSEImplementation.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSEImplementation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSSEImplementation.java 4 Oct 2002 20:03:10 - 1.1
+++ JSSEImplementation.java 15 Mar 2003 06:55:21 - 1.2
@@ -59,6 +59,7 @@
package org.apache.tomcat.util.net.jsse;
+import org.apache.tomcat.util.compat.JdkCompat;
import org.apache.tomcat.util.net.SSLImplementation;
import org.apache.tomcat.util.net.SSLSupport;
import org.apache.tomcat.util.net.ServerSocketFactory;
@@ -75,6 +76,8 @@
public class JSSEImplementation extends SSLImplementation
{
+static final String JSSE14SocketFactory =
+ org.apache.tomcat.net.jsse.JSSE11SocketFactory;
public JSSEImplementation() throws ClassNotFoundException {
// Check to see if JSSE is floating around somewhere
Class.forName(javax.net.ssl.SSLServerSocketFactory);
@@ -87,7 +90,18 @@
public ServerSocketFactory getServerSocketFactory()
{
- return new JSSESocketFactory();
+ ServerSocketFactory ssf = null;
+ if( JdkCompat.isJava14() ) {
+ try {
+ Class ssfCl = Class.forName(JSSE14SocketFactory);
+ ssf =(ServerSocketFactory)ssfCl.newInstance();
+ } catch(Exception ex) {
+ ssf = new JSSESocketFactory();
+ }
+ } else {
+ ssf = new JSSESocketFactory();
+ }
+ return ssf;
}
public SSLSupport getSSLSupport(Socket s)
1.2 +6 -6
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
Index: JSSESocketFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSSESocketFactory.java4 Oct 2002 20:03:10 - 1.1
+++ JSSESocketFactory.java15 Mar 2003 06:55:21 - 1.2
@@ -92,15 +92,15 @@
public class JSSESocketFactory
extends org.apache.tomcat.util.net.ServerSocketFactory
{
-private String keystoreType;
+String keystoreType;
static String defaultKeystoreType = JKS;
static String defaultProtocol = TLS;
static String defaultAlgorithm = SunX509;
static boolean defaultClientAuth = false;
-private boolean clientAuth = false;
-private SSLServerSocketFactory sslProxy = null;
+boolean clientAuth = false;
+SSLServerSocketFactory sslProxy = null;
// defaults
static String defaultKeystoreFile=System.getProperty(user.home) +
@@ -146,7 +146,7 @@
// Internal methods
/** Read the keystore, init the SSL socket factory
*/
-private void initProxy() throws IOException {
+void initProxy() throws IOException {
try {
Security.addProvider (new sun.security.provider.Sun());
Security.addProvider (new com.sun.net.ssl.internal.ssl.Provider());
@@ -247,7 +247,7 @@
/** Set server socket properties ( accepted cipher suites, etc)
*/
-private void initServerSocket(ServerSocket ssocket) {
+void initServerSocket(ServerSocket ssocket) {
SSLServerSocket socket=(SSLServerSocket)ssocket;
// We enable all cipher suites when the socket is
@@ -260,7 +260,7 @@
socket.setNeedClientAuth(clientAuth);
}
-private KeyStore initKeyStore( String keystoreFile,
+KeyStore initKeyStore( String keystoreFile,
String keyPass)
throws IOException
{
1.1
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
Index: JSSE14SocketFactory.java
===
/*
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999 The Apache Software Foundation. All rights
* reserved.
*
*
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse JSSE14SocketFactory.java JSSEImplementation.java
billbarker2003/03/14 23:00:07
Modified:util/java/org/apache/tomcat/util/net/jsse
JSSE14SocketFactory.java JSSEImplementation.java
Log:
catch the tabs before the tab police nab me ;-).
Revision ChangesPath
1.2 +75 -75
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java
Index: JSSE14SocketFactory.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/jsse/JSSE14SocketFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JSSE14SocketFactory.java 15 Mar 2003 06:55:21 - 1.1
+++ JSSE14SocketFactory.java 15 Mar 2003 07:00:07 - 1.2
@@ -96,90 +96,90 @@
public class JSSE14SocketFactory extends JSSESocketFactory {
public JSSE14SocketFactory () {
- super();
+super();
}
// Internal methods
/** Read the keystore, init the SSL socket factory
*/
void initProxy() throws IOException {
- try {
+try {
- // Please don't change the name of the attribute - other
- // software may depend on it ( j2ee for sure )
- String keystoreFile=(String)attributes.get(keystore);
- if( keystoreFile==null) keystoreFile=defaultKeystoreFile;
-
- keystoreType=(String)attributes.get(keystoreType);
- if( keystoreType==null) keystoreType=defaultKeystoreType;
-
- //determine whether we want client authentication
- // the presence of the attribute enables client auth
- String clientAuthStr=(String)attributes.get(clientauth);
- if(clientAuthStr != null){
- if(clientAuthStr.equals(true)){
- clientAuth=true;
- } else if(clientAuthStr.equals(false)) {
- clientAuth=false;
- } else {
- throw new IOException(Invalid value ' +
- clientAuthStr +
- ' for 'clientauth' parameter:);
- }
- }
-
- String keyPass=(String)attributes.get(keypass);
- if( keyPass==null) keyPass=defaultKeyPass;
-
- String keystorePass=(String)attributes.get(keystorePass);
- if( keystorePass==null) keystorePass=keyPass;
-
- //protocol for the SSL ie - TLS, SSL v3 etc.
- String protocol = (String)attributes.get(protocol);
- if(protocol == null) protocol = defaultProtocol;
-
- //Algorithm used to encode the certificate ie - SunX509
- String algorithm = (String)attributes.get(algorithm);
- if(algorithm == null) algorithm = defaultAlgorithm;
-
- // You can't use ssl without a server certificate.
- // Create a KeyStore ( to get server certs )
- KeyStore kstore = initKeyStore( keystoreFile, keystorePass );
-
- SSLContext context = SSLContext.getInstance(protocol); //SSL
-
- // Key manager will extract the server key
- KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
- kmf.init( kstore, keyPass.toCharArray());
-
- // set up TrustManager
- TrustManager[] tm = null;
- String trustStoreFile = System.getProperty(javax.net.ssl.trustStore);
- String trustStorePassword =
- System.getProperty(javax.net.ssl.trustStorePassword);
- if ( trustStoreFile != null trustStorePassword != null ){
- KeyStore trustStore =
- initKeyStore( trustStoreFile, trustStorePassword);
+// Please don't change the name of the attribute - other
+// software may depend on it ( j2ee for sure )
+String keystoreFile=(String)attributes.get(keystore);
+if( keystoreFile==null) keystoreFile=defaultKeystoreFile;
+
+keystoreType=(String)attributes.get(keystoreType);
+if( keystoreType==null) keystoreType=defaultKeystoreType;
+
+//determine whether we want client authentication
+// the presence of the attribute enables client auth
+String clientAuthStr=(String)attributes.get(clientauth);
+if(clientAuthStr != null){
+if(clientAuthStr.equals(true)){
+clientAuth=true;
+} else if(clientAuthStr.equals(false)) {
+clientAuth=false;
+} else {
+throw new IOException(Invalid value ' +
+ clientAuthStr +
+ ' for 'clientauth' parameter:);
+}
+}
+
+String
