billbarker 2004/07/15 22:16:56
Modified: catalina/src/share/org/apache/catalina Globals.java
catalina/src/share/org/apache/catalina/authenticator
SSLAuthenticator.java
catalina/src/share/org/apache/catalina/connector
Constants.java Request.java
Log:
Changing CLIENT-CERT auth to invoke the Coyote Action directly.
Also removing the special Request attribute that used to do this. I could put it
back if anyone thinks that it is a useful extension for web-app programmers.
Revision Changes Path
1.10 +1 -6
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Globals.java 1 Apr 2004 20:18:15 -0000 1.9
+++ Globals.java 16 Jul 2004 05:16:56 -0000 1.10
@@ -43,11 +43,6 @@
"javax.servlet.request.X509Certificate";
/**
- * SSL Certificate Request Attributite.
- */
- public static final String SSL_CERTIFICATE_ATTR =
"org.apache.coyote.request.X509Certificate";
-
- /**
* The request attribute under which we store the name of the cipher suite
* being used on an SSL connection (as an object of type
* java.lang.String).
1.17 +5 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java
Index: SSLAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SSLAuthenticator.java 7 Jul 2004 16:39:46 -0000 1.16
+++ SSLAuthenticator.java 16 Jul 2004 05:16:56 -0000 1.17
@@ -24,6 +24,7 @@
import javax.servlet.http.HttpServletResponse;
+import org.apache.coyote.ActionCode;
import org.apache.catalina.Globals;
import org.apache.catalina.LifecycleException;
import org.apache.catalina.connector.Request;
@@ -130,8 +131,10 @@
X509Certificate certs[] = (X509Certificate[])
request.getRequest().getAttribute(Globals.CERTIFICATES_ATTR);
if ((certs == null) || (certs.length < 1)) {
+ request.getCoyoteRequest().action
+ (ActionCode.ACTION_REQ_SSL_CERTIFICATE, null);
certs = (X509Certificate[])
- request.getRequest().getAttribute(Globals.SSL_CERTIFICATE_ATTR);
+ request.getRequest().getAttribute(Globals.CERTIFICATES_ATTR);
}
if ((certs == null) || (certs.length < 1)) {
if (container.getLogger().isDebugEnabled())
1.5 +0 -5
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Constants.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Constants.java 15 Jul 2004 14:31:47 -0000 1.4
+++ Constants.java 16 Jul 2004 05:16:56 -0000 1.5
@@ -39,11 +39,6 @@
public static final int PROCESSOR_ACTIVE = 1;
/**
- * SSL Certificate Request Attributite.
- */
- public static final String SSL_CERTIFICATE_ATTR =
"org.apache.coyote.request.X509Certificate";
-
- /**
* Security flag.
*/
public static final boolean SECURITY =
1.7 +2 -8
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java
Index: Request.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Request.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Request.java 15 Jul 2004 14:31:47 -0000 1.6
+++ Request.java 16 Jul 2004 05:16:56 -0000 1.7
@@ -878,13 +878,7 @@
attr = coyoteRequest.getAttribute(name);
if(attr != null)
return attr;
- // XXX Should move to Globals
- if(Constants.SSL_CERTIFICATE_ATTR.equals(name)) {
- coyoteRequest.action(ActionCode.ACTION_REQ_SSL_CERTIFICATE, null);
- attr = getAttribute(Globals.CERTIFICATES_ATTR);
- if(attr != null)
- attributes.put(name, attr);
- } else if( isSSLAttribute(name) ) {
+ if( isSSLAttribute(name) ) {
coyoteRequest.action(ActionCode.ACTION_REQ_SSL_ATTRIBUTE,
coyoteRequest);
attr = coyoteRequest.getAttribute(Globals.CERTIFICATES_ATTR);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
