billbarker 2002/09/22 17:16:35
Modified: catalina/src/share/org/apache/catalina Globals.java
catalina/src/share/org/apache/catalina/authenticator
SSLAuthenticator.java
Log:
Port SSL-auth fix from the 5.0 branch.
Revision Changes Path
1.44 +8 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java
Index: Globals.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/Globals.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- Globals.java 21 Dec 2001 21:15:44 -0000 1.43
+++ Globals.java 23 Sep 2002 00:16:35 -0000 1.44
@@ -83,6 +83,10 @@
public static final String CERTIFICATES_ATTR =
"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
1.12 +7 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java
Index: SSLAuthenticator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/SSLAuthenticator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SSLAuthenticator.java 9 Jun 2002 02:19:41 -0000 1.11
+++ SSLAuthenticator.java 23 Sep 2002 00:16:35 -0000 1.12
@@ -151,6 +151,9 @@
X509Certificate certs[] = (X509Certificate[])
request.getRequest().getAttribute(Globals.CERTIFICATES_ATTR);
if ((certs == null) || (certs.length < 1)) {
+ certs = request.getRequest().getAttribute(Globals.SSL_CERTIFICATE_ATTR);
+ }
+ if ((certs == null) || (certs.length < 1)) {
if (debug >= 1)
log(" No certificates included with this request");
hres.sendError(HttpServletResponse.SC_BAD_REQUEST,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
