You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@apache.org on 2001/10/11 18:58:22 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator FormAuthenticator.java LocalStrings.properties
craigmcc 01/10/11 09:58:22
Modified: catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java LocalStrings.properties
Log:
If the user incorrectly references the form login page directly, return an
error 403 (bad request) instead of a meaningless 404 (not found) for a
path that ends with "/null".
PR: Bugzilla #4104
Submitted by: Vincente Salvador <vi...@netscape.net>
Revision Changes Path
1.18 +9 -5 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
Index: FormAuthenticator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FormAuthenticator.java 2001/09/04 17:49:17 1.17
+++ FormAuthenticator.java 2001/10/11 16:58:22 1.18
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v 1.17 2001/09/04 17:49:17 craigmcc Exp $
- * $Revision: 1.17 $
- * $Date: 2001/09/04 17:49:17 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v 1.18 2001/10/11 16:58:22 craigmcc Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/10/11 16:58:22 $
*
* ====================================================================
*
@@ -88,7 +88,7 @@
* Authentication, as described in the Servlet API Specification, Version 2.2.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.17 $ $Date: 2001/09/04 17:49:17 $
+ * @version $Revision: 1.18 $ $Date: 2001/10/11 16:58:22 $
*/
public final class FormAuthenticator
@@ -286,7 +286,11 @@
requestURI = savedRequestURL(session);
if (debug >= 1)
log("Redirecting to original '" + requestURI + "'");
- hres.sendRedirect(hres.encodeRedirectURL(requestURI));
+ if (requestURI == null)
+ hres.sendError(HttpServletResponse.SC_BAD_REQUEST,
+ sm.getString("authenticator.formlogin"));
+ else
+ hres.sendRedirect(hres.encodeRedirectURL(requestURI));
return (false);
}
1.4 +1 -0 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/LocalStrings.properties
Index: LocalStrings.properties
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/authenticator/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 2001/07/30 20:04:04 1.3
+++ LocalStrings.properties 2001/10/11 16:58:22 1.4
@@ -1,6 +1,7 @@
authenticator.alreadyStarted=Security Interceptor has already been started
authenticator.certificates=No client certificate chain in this request
authenticator.forbidden=Access to the requested resource has been denied
+authenticator.formlogin=Invalid direct reference to form login page
authenticator.invalid=Invalid client certificate chain in this request
authenticator.keystore=Exception loading key store
authenticator.manager=Exception initializing trust managers