ekr 02/05/28 07:24:32
Modified: coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
CoyoteConnector.java CoyoteRequest.java
CoyoteServerSocketFactory.java
Log:
CoyoteConnector.java: pass through the configuration directives that PureTLS
needs.
CoyoteServerSocket: more passthrough for the configuration directives PureTLS
needs
CoyoteAdapter.java: call the action to set the SSL attributes
CoyoteRequest.java: get attributes from the coyoteRequest if they're not
available locally. The coyoteRequest is where the SSL attributes all get set.
Revision Changes Path
1.7 +7 -5
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
Index: CoyoteAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CoyoteAdapter.java 18 Apr 2002 18:12:46 -0000 1.6
+++ CoyoteAdapter.java 28 May 2002 14:24:31 -0000 1.7
@@ -1,6 +1,6 @@
-/* * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
1.6 2002/04/18 18:12:46 remm Exp $
- * $Revision: 1.6 $
- * $Date: 2002/04/18 18:12:46 $
+/* * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
1.7 2002/05/28 14:24:31 ekr Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/05/28 14:24:31 $
*
* ====================================================================
*
@@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.6 $ $Date: 2002/04/18 18:12:46 $
+ * @version $Revision: 1.7 $ $Date: 2002/05/28 14:24:31 $
*/
final class CoyoteAdapter
@@ -307,7 +307,9 @@
// Parse cookies
parseCookies(req, request);
-
+
+ // Set the SSL properties
+ res.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,request.getRequest());
}
/**
1.15 +9 -7
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
Index: CoyoteConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CoyoteConnector.java 16 May 2002 18:57:39 -0000 1.14
+++ CoyoteConnector.java 28 May 2002 14:24:31 -0000 1.15
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
1.14 2002/05/16 18:57:39 remm Exp $
- * $Revision: 1.14 $
- * $Date: 2002/05/16 18:57:39 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
1.15 2002/05/28 14:24:31 ekr Exp $
+ * $Revision: 1.15 $
+ * $Date: 2002/05/28 14:24:31 $
*
* ====================================================================
*
@@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.14 $ $Date: 2002/05/16 18:57:39 $
+ * @version $Revision: 1.15 $ $Date: 2002/05/28 14:24:31 $
*/
@@ -979,6 +979,11 @@
}
IntrospectionUtils.setProperty(protocolHandler, "keystore",
ssf.getKeystoreFile());
+ IntrospectionUtils.setProperty(protocolHandler, "randomfile",
+ ssf.getRandomFile());
+ IntrospectionUtils.setProperty(protocolHandler, "rootfile",
+ ssf.getRootFile());
+
IntrospectionUtils.setProperty(protocolHandler, "keypass",
ssf.getKeystorePass());
IntrospectionUtils.setProperty(protocolHandler, "keytype",
@@ -988,8 +993,6 @@
IntrospectionUtils.setProperty(protocolHandler,
"sSLImplementation",
ssf.getSSLImplementation());
- IntrospectionUtils.setProperty(protocolHandler, "socketFactory",
- ssf.getSocketFactoryName());
} else {
IntrospectionUtils.setProperty(protocolHandler, "secure",
"" + false);
@@ -1002,7 +1005,6 @@
(sm.getString
("coyoteConnector.protocolHandlerInitializationFailed", e));
}
-
}
1.23 +12 -6
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
Index: CoyoteRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CoyoteRequest.java 22 May 2002 01:15:18 -0000 1.22
+++ CoyoteRequest.java 28 May 2002 14:24:31 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
1.22 2002/05/22 01:15:18 remm Exp $
- * $Revision: 1.22 $
- * $Date: 2002/05/22 01:15:18 $
+ * $Header:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
1.23 2002/05/28 14:24:31 ekr Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/05/28 14:24:31 $
*
* ====================================================================
*
@@ -116,13 +116,14 @@
import org.apache.catalina.util.StringManager;
import org.apache.catalina.util.StringParser;
+import org.apache.tomcat.util.net.SSLSupport;
/**
* Wrapper object for the Coyote request.
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.22 $ $Date: 2002/05/22 01:15:18 $
+ * @version $Revision: 1.23 $ $Date: 2002/05/28 14:24:31 $
*/
public class CoyoteRequest
@@ -783,7 +784,12 @@
* @param name Name of the request attribute to return
*/
public Object getAttribute(String name) {
- return (attributes.get(name));
+ Object attr=attributes.get(name);
+
+ if(attr!=null)
+ return(attr);
+
+ return coyoteRequest.getAttribute(name);
}
@@ -1141,7 +1147,7 @@
* @param value The associated value
*/
public void setAttribute(String name, Object value) {
-
+
// Name cannot be null
if (name == null)
throw new IllegalArgumentException
1.3 +38 -13
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java
Index: CoyoteServerSocketFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CoyoteServerSocketFactory.java 2 May 2002 02:07:03 -0000 1.2
+++ CoyoteServerSocketFactory.java 28 May 2002 14:24:31 -0000 1.3
@@ -145,6 +145,7 @@
}
public void setKeystoreFile(String keystoreFile) {
+
File file = new File(keystoreFile);
if (!file.isAbsolute())
file = new File(System.getProperty("catalina.base"),
@@ -152,8 +153,45 @@
this.keystoreFile = file.getAbsolutePath();
}
+ /**
+ * Pathname to the random file to be used.
+ */
+ private String randomFile =
+ System.getProperty("user.home") + File.separator + "random.pem";
+
+ public String getRandomFile() {
+ return (this.randomFile);
+ }
+
+ public void setRandomFile(String randomFile) {
+
+ File file = new File(randomFile);
+ if (!file.isAbsolute())
+ file = new File(System.getProperty("catalina.base"),
+ randomFile);
+ this.randomFile = file.getAbsolutePath();
+ }
/**
+ * Pathname to the root list to be used.
+ */
+ private String rootFile =
+ System.getProperty("user.home") + File.separator + "root.pem";
+
+ public String getRootFile() {
+ return (this.rootFile);
+ }
+
+ public void setRootFile(String rootFile) {
+
+ File file = new File(rootFile);
+ if (!file.isAbsolute())
+ file = new File(System.getProperty("catalina.base"),
+ rootFile);
+ this.rootFile = file.getAbsolutePath();
+ }
+
+ /**
* Password for accessing the key store file.
*/
private String keystorePass = "changeit";
@@ -208,19 +246,6 @@
this.sslImplementation = sslImplementation;
}
-
- /**
- * Socket factory classname.
- */
- private String socketFactoryName = null;
-
- public String getSocketFactoryName() {
- return (this.socketFactoryName);
- }
-
- public void setSocketFactoryName(String socketFactoryName) {
- this.socketFactoryName = socketFactoryName;
- }
// --------------------------------------------------------- Public Methods
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
