You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/11/27 15:52:27 UTC
svn commit: r1716882 - in /tomcat/trunk/java/org/apache/catalina:
authenticator/FormAuthenticator.java mapper/Mapper.java
servlets/DefaultServlet.java
Author: markt
Date: Fri Nov 27 14:52:27 2015
New Revision: 1716882
URL: http://svn.apache.org/viewvc?rev=1716882&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58660
With mapperContextRootRedirectEnabled ste to false, the redirect needs to be handled elsewhere.
- Ensure the Mapper does not add the '/'
- Handle the redirect in the DefaultServlet
- Add a redirect to FORM auth if auth is occurring at the context root else the login page could be submitted to the wrong web application
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1716882&r1=1716881&r2=1716882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java Fri Nov 27 14:52:27 2015
@@ -219,6 +219,20 @@ public class FormAuthenticator
// No -- Save this request and redirect to the form login page
if (!loginAction) {
+ // If this request was to the root of the context without a trailing
+ // '/', need to redirect to add it else the submit of the login form
+ // may not go to the correct web application
+ if (request.getServletPath().length() == 0 && request.getPathInfo() == null) {
+ StringBuilder location = new StringBuilder(requestURI);
+ location.append('/');
+ if (request.getQueryString() != null) {
+ location.append('?');
+ location.append(request.getQueryString());
+ }
+ response.sendRedirect(response.encodeRedirectURL(location.toString()));
+ return false;
+ }
+
session = request.getSessionInternal(true);
if (log.isDebugEnabled()) {
log.debug("Save request in session '" + session.getIdInternal() + "'");
Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1716882&r1=1716881&r2=1716882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Fri Nov 27 14:52:27 2015
@@ -835,20 +835,13 @@ public final class Mapper {
int pathOffset = path.getOffset();
int pathEnd = path.getEnd();
- int servletPath = pathOffset;
boolean noServletPath = false;
int length = contextVersion.path.length();
- if (length != (pathEnd - pathOffset)) {
- servletPath = pathOffset + length;
- } else {
+ if (length == (pathEnd - pathOffset)) {
noServletPath = true;
- path.append('/');
- pathOffset = path.getOffset();
- pathEnd = path.getEnd();
- servletPath = pathOffset+length;
}
-
+ int servletPath = pathOffset + length;
path.setOffset(servletPath);
// Rule 1 -- Exact Match
@@ -1002,7 +995,13 @@ public final class Mapper {
char[] buf = path.getBuffer();
if (contextVersion.resources != null && buf[pathEnd -1 ] != '/') {
String pathStr = path.toString();
- WebResource file = contextVersion.resources.getResource(pathStr);
+ WebResource file;
+ // Handle context root
+ if (pathStr.length() == 0) {
+ file = contextVersion.resources.getResource("/");
+ } else {
+ file = contextVersion.resources.getResource(pathStr);
+ }
if (file != null && file.isDirectory() &&
mappingData.context.getMapperDirectoryRedirectEnabled()) {
// Note: this mutates the path: do not do any processing
Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1716882&r1=1716881&r2=1716882&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Fri Nov 27 14:52:27 2015
@@ -331,6 +331,10 @@ public class DefaultServlet extends Http
* @param request The servlet request we are processing
*/
protected String getRelativePath(HttpServletRequest request) {
+ return getRelativePath(request, false);
+ }
+
+ protected String getRelativePath(HttpServletRequest request, boolean allowEmptyPath) {
// IMPORTANT: DefaultServlet can be mapped to '/' or '/path/*' but always
// serves resources from the web app root with context rooted paths.
// i.e. it cannot be used to mount the web app root under a sub-path
@@ -356,7 +360,7 @@ public class DefaultServlet extends Http
if (pathInfo != null) {
result.append(pathInfo);
}
- if (result.length() == 0) {
+ if (result.length() == 0 && !allowEmptyPath) {
result.append('/');
}
@@ -686,7 +690,8 @@ public class DefaultServlet extends Http
boolean serveContent = content;
// Identify the requested resource path
- String path = getRelativePath(request);
+ String path = getRelativePath(request, true);
+
if (debug > 0) {
if (serveContent)
log("DefaultServlet.serveResource: Serving resource '" +
@@ -696,6 +701,12 @@ public class DefaultServlet extends Http
path + "' headers only");
}
+ if (path.length() == 0) {
+ // Context root redirect
+ doDirectoryRedirect(request, response);
+ return;
+ }
+
WebResource resource = resources.getResource(path);
if (!resource.exists()) {
@@ -811,13 +822,7 @@ public class DefaultServlet extends Http
if (resource.isDirectory()) {
if (!path.endsWith("/")) {
- StringBuilder location = new StringBuilder(request.getRequestURI());
- location.append('/');
- if (request.getQueryString() != null) {
- location.append('?');
- location.append(request.getQueryString());
- }
- response.sendRedirect(response.encodeRedirectURL(location.toString()));
+ doDirectoryRedirect(request, response);
return;
}
@@ -1026,6 +1031,16 @@ public class DefaultServlet extends Http
}
}
+ private void doDirectoryRedirect(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
+ StringBuilder location = new StringBuilder(request.getRequestURI());
+ location.append('/');
+ if (request.getQueryString() != null) {
+ location.append('?');
+ location.append(request.getQueryString());
+ }
+ response.sendRedirect(response.encodeRedirectURL(location.toString()));
+ }
/**
* Parse the content-range header.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org